X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fconsumer.c;h=155f2b053aca8dfdfc3653c4c9bfdd7eb8f71ada;hp=8ff002cea1598013d9c460c11e07ba0d3e32c598;hb=bbc4768c20f1c552222e1746f9475d145d7bf04e;hpb=1e791a74976525f287944e5dbb65208a3b9edf42

diff --git a/src/bin/lttng-sessiond/consumer.c b/src/bin/lttng-sessiond/consumer.c
index 8ff002cea..155f2b053 100644
--- a/src/bin/lttng-sessiond/consumer.c
+++ b/src/bin/lttng-sessiond/consumer.c
@@ -883,7 +883,8 @@ void consumer_init_ask_channel_comm_msg(struct lttcomm_consumer_msg *msg,
 		int64_t blocking_timeout,
 		const char *root_shm_path,
 		const char *shm_path,
-		struct lttng_trace_chunk *trace_chunk)
+		struct lttng_trace_chunk *trace_chunk,
+		const struct lttng_credentials *buffer_credentials)
 {
 	assert(msg);
 
@@ -899,20 +900,13 @@ void consumer_init_ask_channel_comm_msg(struct lttcomm_consumer_msg *msg,
         if (trace_chunk) {
 		uint64_t chunk_id;
 		enum lttng_trace_chunk_status chunk_status;
-		struct lttng_credentials chunk_credentials;
 
 		chunk_status = lttng_trace_chunk_get_id(trace_chunk, &chunk_id);
 		assert(chunk_status == LTTNG_TRACE_CHUNK_STATUS_OK);
 		LTTNG_OPTIONAL_SET(&msg->u.ask_channel.chunk_id, chunk_id);
-
-		chunk_status = lttng_trace_chunk_get_credentials(trace_chunk,
-				&chunk_credentials);
-		assert(chunk_status == LTTNG_TRACE_CHUNK_STATUS_OK);
-		msg->u.ask_channel.buffer_credentials.uid =
-				chunk_credentials.uid;
-		msg->u.ask_channel.buffer_credentials.gid =
-				chunk_credentials.gid;
         }
+	msg->u.ask_channel.buffer_credentials.uid = buffer_credentials->uid;
+	msg->u.ask_channel.buffer_credentials.gid = buffer_credentials->gid;
 
 	msg->cmd_type = LTTNG_CONSUMER_ASK_CHANNEL_CREATION;
 	msg->u.ask_channel.subbuf_size = subbuf_size;
@@ -1772,7 +1766,6 @@ int consumer_create_trace_chunk(struct consumer_socket *socket,
 		goto error;
 	}
 	msg.u.create_trace_chunk.chunk_id = chunk_id;
-	/* Only used for logging purposes. */
 
 	if (chunk_has_local_output) {
 		chunk_status = lttng_trace_chunk_get_chunk_directory_handle(
@@ -1793,20 +1786,23 @@ int consumer_create_trace_chunk(struct consumer_socket *socket,
 		chunk_dirfd = lttng_directory_handle_get_dirfd(
 				chunk_directory_handle);
 		assert(chunk_dirfd >= 0);
-	}
 
-	chunk_status = lttng_trace_chunk_get_credentials(chunk,
-			&chunk_credentials);
-	if (chunk_status != LTTNG_TRACE_CHUNK_STATUS_OK) {
-		/*
-		 * Not associating credentials to a sessiond chunk is a fatal
-		 * internal error.
-		 */
-		ret = -LTTNG_ERR_FATAL;
-		goto error;
+		chunk_status = lttng_trace_chunk_get_credentials(
+				chunk, &chunk_credentials);
+		if (chunk_status != LTTNG_TRACE_CHUNK_STATUS_OK) {
+			/*
+			 * Not associating credentials to a sessiond chunk is a
+			 * fatal internal error.
+			 */
+			ret = -LTTNG_ERR_FATAL;
+			goto error;
+		}
+		msg.u.create_trace_chunk.credentials.value.uid =
+				chunk_credentials.uid;
+		msg.u.create_trace_chunk.credentials.value.gid =
+				chunk_credentials.gid;
+		msg.u.create_trace_chunk.credentials.is_set = 1;
 	}
-	msg.u.create_trace_chunk.credentials.uid = chunk_credentials.uid;
-	msg.u.create_trace_chunk.credentials.gid = chunk_credentials.gid;
 
 	DBG("Sending consumer create trace chunk command: relayd_id = %" PRId64
 			", session_id = %" PRIu64 ", chunk_id = %" PRIu64
@@ -1849,17 +1845,34 @@ int consumer_close_trace_chunk(struct consumer_socket *socket,
 	int ret;
 	enum lttng_trace_chunk_status chunk_status;
 	struct lttcomm_consumer_msg msg = {
-		.cmd_type = LTTNG_CONSUMER_CLOSE_TRACE_CHUNK,
-		.u.close_trace_chunk.session_id = session_id,
+			.cmd_type = LTTNG_CONSUMER_CLOSE_TRACE_CHUNK,
+			.u.close_trace_chunk.session_id = session_id,
 	};
 	uint64_t chunk_id;
 	time_t close_timestamp;
+	enum lttng_trace_chunk_command_type close_command;
+	const char *close_command_name = "none";
 
 	assert(socket);
 
 	if (relayd_id != -1ULL) {
-		LTTNG_OPTIONAL_SET(&msg.u.close_trace_chunk.relayd_id,
-				relayd_id);
+		LTTNG_OPTIONAL_SET(
+				&msg.u.close_trace_chunk.relayd_id, relayd_id);
+	}
+
+	chunk_status = lttng_trace_chunk_get_close_command(
+			chunk, &close_command);
+	switch (chunk_status) {
+	case LTTNG_TRACE_CHUNK_STATUS_OK:
+		LTTNG_OPTIONAL_SET(&msg.u.close_trace_chunk.close_command,
+				(uint32_t) close_command);
+		break;
+	case LTTNG_TRACE_CHUNK_STATUS_NONE:
+		break;
+	default:
+		ERR("Failed to get trace chunk close command");
+		ret = -1;
+		goto error;
 	}
 
 	chunk_status = lttng_trace_chunk_get_id(chunk, &chunk_id);
@@ -1881,10 +1894,14 @@ int consumer_close_trace_chunk(struct consumer_socket *socket,
 	assert(chunk_status == LTTNG_TRACE_CHUNK_STATUS_OK);
 	msg.u.close_trace_chunk.close_timestamp = (uint64_t) close_timestamp;
 
+	if (msg.u.close_trace_chunk.close_command.is_set) {
+		close_command_name = lttng_trace_chunk_command_type_get_name(
+				close_command);
+	}
 	DBG("Sending consumer close trace chunk command: relayd_id = %" PRId64
-			", session_id = %" PRIu64
-			", chunk_id = %" PRIu64,
-			relayd_id, session_id, chunk_id);
+			", session_id = %" PRIu64 ", chunk_id = %" PRIu64
+			", close command = \"%s\"",
+			relayd_id, session_id, chunk_id, close_command_name);
 
 	health_code_update();
 	ret = consumer_send_msg(socket, &msg);