X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fust-consumer.c;h=2eb8cda253a096c89f03d0e7cfd6bd869ed675f2;hb=4ce514c43483ba24fd935024da5b7aca681a7e52;hp=72b68bb7f7bed39d03ed5860381ef70d94df5ad8;hpb=2bba9e532ca1910822005ff7f67400a2e871467c;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/ust-consumer.c b/src/bin/lttng-sessiond/ust-consumer.c
index 72b68bb7f..2eb8cda25 100644
--- a/src/bin/lttng-sessiond/ust-consumer.c
+++ b/src/bin/lttng-sessiond/ust-consumer.c
@@ -118,10 +118,12 @@ static int ask_channel_creation(struct ust_app_session *ua_sess,
 	DBG2("Asking UST consumer for channel");
 
 	/* Get and create full trace path of session. */
-	pathname = setup_trace_path(consumer, ua_sess);
-	if (!pathname) {
-		ret = -1;
-		goto error;
+	if (ua_sess->output_traces) {
+		pathname = setup_trace_path(consumer, ua_sess);
+		if (!pathname) {
+			ret = -1;
+			goto error;
+		}
 	}
 
 	/* Depending on the buffer type, a different channel key is used. */
@@ -158,11 +160,13 @@ static int ask_channel_creation(struct ust_app_session *ua_sess,
 			chan_id,
 			ua_chan->tracefile_size,
 			ua_chan->tracefile_count,
-			ua_sess->output_traces);
+			ua_sess->id,
+			ua_sess->output_traces,
+			ua_sess->uid);
 
 	health_code_update();
 
-	ret = lttcomm_send_unix_sock(socket->fd, &msg, sizeof(msg));
+	ret = lttcomm_send_unix_sock(*socket->fd, &msg, sizeof(msg));
 	if (ret < 0) {
 		goto error;
 	}
@@ -175,7 +179,9 @@ static int ask_channel_creation(struct ust_app_session *ua_sess,
 	/* Communication protocol error. */
 	assert(key == ua_chan->key);
 	/* We need at least one where 1 stream for 1 cpu. */
-	assert(ua_chan->expected_stream_count > 0);
+	if (ua_sess->output_traces) {
+		assert(ua_chan->expected_stream_count > 0);
+	}
 
 	DBG2("UST ask channel %" PRIu64 " successfully done with %u stream(s)", key,
 			ua_chan->expected_stream_count);
@@ -201,7 +207,7 @@ int ust_consumer_ask_channel(struct ust_app_session *ua_sess,
 	assert(ua_chan);
 	assert(consumer);
 	assert(socket);
-	assert(socket->fd >= 0);
+	assert(socket->fd);
 	assert(registry);
 
 	if (!consumer->enabled) {
@@ -236,7 +242,7 @@ int ust_consumer_get_channel(struct consumer_socket *socket,
 
 	assert(ua_chan);
 	assert(socket);
-	assert(socket->fd >= 0);
+	assert(socket->fd);
 
 	msg.cmd_type = LTTNG_CONSUMER_GET_CHANNEL;
 	msg.u.get_channel.key = ua_chan->key;
@@ -251,11 +257,11 @@ int ust_consumer_get_channel(struct consumer_socket *socket,
 	}
 
 	/* First, get the channel from consumer. */
-	ret = ustctl_recv_channel_from_consumer(socket->fd, &ua_chan->obj);
+	ret = ustctl_recv_channel_from_consumer(*socket->fd, &ua_chan->obj);
 	if (ret < 0) {
 		if (ret != -EPIPE) {
 			ERR("Error recv channel from consumer %d with ret %d",
-					socket->fd, ret);
+					*socket->fd, ret);
 		} else {
 			DBG3("UST app recv channel from consumer. Consumer is dead.");
 		}
@@ -274,7 +280,7 @@ int ust_consumer_get_channel(struct consumer_socket *socket,
 		}
 
 		/* Stream object is populated by this call if successful. */
-		ret = ustctl_recv_stream_from_consumer(socket->fd, &stream->obj);
+		ret = ustctl_recv_stream_from_consumer(*socket->fd, &stream->obj);
 		if (ret < 0) {
 			free(stream);
 			if (ret == -LTTNG_UST_ERR_NOENT) {
@@ -284,7 +290,7 @@ int ust_consumer_get_channel(struct consumer_socket *socket,
 			}
 			if (ret != -EPIPE) {
 				ERR("Recv stream from consumer %d with ret %d",
-						socket->fd, ret);
+						*socket->fd, ret);
 			} else {
 				DBG3("UST app recv stream from consumer. Consumer is dead.");
 			}
@@ -331,7 +337,7 @@ int ust_consumer_destroy_channel(struct consumer_socket *socket,
 
 	assert(ua_chan);
 	assert(socket);
-	assert(socket->fd >= 0);
+	assert(socket->fd);
 
 	msg.cmd_type = LTTNG_CONSUMER_DESTROY_CHANNEL;
 	msg.u.destroy_channel.key = ua_chan->key;
@@ -439,14 +445,14 @@ int ust_consumer_metadata_request(struct consumer_socket *socket)
 	health_code_update();
 
 	/* Wait for a metadata request */
-	ret = lttcomm_recv_unix_sock(socket->fd, &request, sizeof(request));
+	ret = lttcomm_recv_unix_sock(*socket->fd, &request, sizeof(request));
 	if (ret <= 0) {
 		ERR("Consumer closed the metadata socket");
 		ret = -1;
 		goto end;
 	}
 
-	DBG("Metadata request received for session %u, key %" PRIu64,
+	DBG("Metadata request received for session %" PRIu64 ", key %" PRIu64,
 			request.session_id, request.key);
 
 	reg_uid = buffer_reg_uid_find(request.session_id,
@@ -455,10 +461,10 @@ int ust_consumer_metadata_request(struct consumer_socket *socket)
 		ust_reg = reg_uid->registry->reg.ust;
 	} else {
 		struct buffer_reg_pid *reg_pid =
-			buffer_reg_pid_find(request.session_id);
+			buffer_reg_pid_find(request.session_id_per_pid);
 		if (!reg_pid) {
-			DBG("PID registry not found for session id %u",
-					request.session_id);
+			DBG("PID registry not found for session id %" PRIu64,
+					request.session_id_per_pid);
 
 			msg.cmd_type = LTTNG_ERR_UND;
 			(void) consumer_send_msg(socket, &msg);