/*
* Copyright (C) 2011 - David Goulet <david.goulet@polymtl.ca>
*
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation; only version 2 of the License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2 only,
+ * as published by the Free Software Foundation.
*
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
- * Place - Suite 330, Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#define _GNU_SOURCE
#include <string.h>
#include <unistd.h>
-#include <common/lttngerr.h>
#include <common/common.h>
+#include <common/consumer.h>
#include <common/defaults.h>
#include <common/sessiond-comm/sessiond-comm.h>
-#include <common/consumer.h>
#include "ust-consumer.h"
struct ust_app_channel *uchan,
uid_t uid, gid_t gid)
{
- int ret, fd;
+ int ret;
struct lttcomm_consumer_msg lum;
struct ltt_ust_stream *stream, *tmp;
DBG("Sending channel %d to consumer", lum.u.channel.channel_key);
ret = lttcomm_send_unix_sock(sock, &lum, sizeof(lum));
if (ret < 0) {
- perror("send consumer channel");
+ PERROR("send consumer channel");
goto error;
}
- fd = uchan->obj->shm_fd;
- ret = lttcomm_send_fds_unix_sock(sock, &fd, 1);
+
+ DBG("Sending channel shm path: %s\n", uchan->obj->shm_path);
+ ret = lttcomm_send_string(sock,
+ uchan->obj->shm_path,
+ strlen(uchan->obj->shm_path));
if (ret < 0) {
- perror("send consumer channel ancillary data");
+ PERROR("send consumer channel shm path");
goto error;
}
cds_list_for_each_entry_safe(stream, tmp, &uchan->streams.head, list) {
- int fds[2];
if (!stream->obj->shm_fd) {
continue;
DBG("Sending stream %d to consumer", lum.u.stream.stream_key);
ret = lttcomm_send_unix_sock(sock, &lum, sizeof(lum));
if (ret < 0) {
- perror("send consumer stream");
+ PERROR("send consumer stream");
+ goto error;
+ }
+
+ DBG("Sending stream shm path: %s\n", stream->obj->shm_path);
+ ret = lttcomm_send_string(sock,
+ stream->obj->shm_path,
+ strlen(stream->obj->shm_path));
+ if (ret < 0) {
+ PERROR("send consumer stream shm path");
goto error;
}
- fds[0] = stream->obj->shm_fd;
- fds[1] = stream->obj->wait_fd;
- ret = lttcomm_send_fds_unix_sock(sock, fds, 2);
+ DBG("Sending stream wait pipe path: %s\n", stream->obj->wait_pipe_path);
+ ret = lttcomm_send_string(sock,
+ stream->obj->wait_pipe_path,
+ strlen(stream->obj->wait_pipe_path));
+
if (ret < 0) {
- perror("send consumer stream ancillary data");
+ PERROR("send consumer stream wait pipe path");
goto error;
}
}
}
if (usess->metadata->obj->shm_fd != 0) {
- int fd;
- int fds[2];
-
/* Send metadata channel fd */
lum.cmd_type = LTTNG_CONSUMER_ADD_CHANNEL;
lum.u.channel.channel_key = usess->metadata->obj->shm_fd;
DBG("Sending metadata channel %d to consumer", lum.u.channel.channel_key);
ret = lttcomm_send_unix_sock(sock, &lum, sizeof(lum));
if (ret < 0) {
- perror("send consumer channel");
+ PERROR("send consumer channel");
goto error;
}
- fd = usess->metadata->obj->shm_fd;
- ret = lttcomm_send_fds_unix_sock(sock, &fd, 1);
+
+ DBG("Sending metadata channel shm path: %s\n", usess->metadata->obj->shm_path);
+ ret = lttcomm_send_string(sock,
+ usess->metadata->obj->shm_path,
+ strlen(usess->metadata->obj->shm_path));
if (ret < 0) {
- perror("send consumer metadata channel");
+ PERROR("send consumer metadata channel");
goto error;
}
DBG("Sending metadata stream %d to consumer", lum.u.stream.stream_key);
ret = lttcomm_send_unix_sock(sock, &lum, sizeof(lum));
if (ret < 0) {
- perror("send consumer metadata stream");
+ PERROR("send consumer metadata stream");
goto error;
}
- fds[0] = usess->metadata->stream_obj->shm_fd;
- fds[1] = usess->metadata->stream_obj->wait_fd;
- ret = lttcomm_send_fds_unix_sock(sock, fds, 2);
+
+ DBG("Sending metadata stream shm path: %s\n",
+ usess->metadata->stream_obj->shm_path);
+ ret = lttcomm_send_string(sock,
+ usess->metadata->stream_obj->shm_path,
+ strlen(usess->metadata->stream_obj->shm_path));
+
if (ret < 0) {
- perror("send consumer stream");
+ PERROR("send consumer shm stream");
goto error;
}
+
+ DBG("Sending metadata stream wait pipe path: %s\n",
+ usess->metadata->stream_obj->wait_pipe_path);
+ ret = lttcomm_send_string(sock,
+ usess->metadata->stream_obj->wait_pipe_path,
+ strlen(usess->metadata->stream_obj->wait_pipe_path));
+
+ if (ret < 0) {
+ PERROR("send consumer shm stream");
+ goto error;
+ }
+
}
/* Send each channel fd streams of session */
rcu_read_lock();
cds_lfht_for_each_entry(usess->channels->ht, &iter.iter, ua_chan,
node.node) {
+ /*
+ * Indicate that the channel was not created on the tracer side so skip
+ * sending unexisting streams.
+ */
+ if (ua_chan->obj == NULL) {
+ continue;
+ }
+
ret = send_channel_streams(sock, ua_chan, usess->uid, usess->gid);
if (ret < 0) {
rcu_read_unlock();
projects / lttng-tools.git / blobdiff