X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fust-consumer.c;h=d6fe58cd971aa9f1f770f99860a65129c329ac76;hb=567eb353c7f88e2fdaa106eb7e0a38dbb8717792;hp=ca96ff727bbd6705b84cc6f88c2e3826929bda9f;hpb=dec56f6cc894de41b312354d360b6a4c09fc199d;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/ust-consumer.c b/src/bin/lttng-sessiond/ust-consumer.c
index ca96ff727..d6fe58cd9 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. */
@@ -157,7 +159,10 @@ static int ask_channel_creation(struct ust_app_session *ua_sess,
 			registry->uuid,
 			chan_id,
 			ua_chan->tracefile_size,
-			ua_chan->tracefile_count);
+			ua_chan->tracefile_count,
+			ua_sess->id,
+			ua_sess->output_traces,
+			ua_sess->uid);
 
 	health_code_update();
 
@@ -174,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);
@@ -203,6 +210,12 @@ int ust_consumer_ask_channel(struct ust_app_session *ua_sess,
 	assert(socket->fd >= 0);
 	assert(registry);
 
+	if (!consumer->enabled) {
+		ret = -LTTNG_ERR_NO_CONSUMER;
+		DBG3("Consumer is disabled");
+		goto error;
+	}
+
 	pthread_mutex_lock(socket->lock);
 
 	ret = ask_channel_creation(ua_sess, ua_chan, consumer, socket, registry);
@@ -439,7 +452,7 @@ int ust_consumer_metadata_request(struct consumer_socket *socket)
 		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,
@@ -448,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);