X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fconsumer.c;h=10152864e9940beb0e6b3d4423fdd4a7e6013fcd;hb=2abe796968937298012c0ec668f7fc88305683f2;hp=1bbee02f28c25ba64625cce77071ee8b8cfa0f2b;hpb=1b0bebcb6f1a5230aedfcbab78623bb5eac633d5;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/consumer.c b/src/bin/lttng-sessiond/consumer.c
index 1bbee02f2..10152864e 100644
--- a/src/bin/lttng-sessiond/consumer.c
+++ b/src/bin/lttng-sessiond/consumer.c
@@ -1079,7 +1079,8 @@ int consumer_send_relayd_socket(struct consumer_socket *consumer_sock,
 		struct lttcomm_relayd_sock *rsock, struct consumer_output *consumer,
 		enum lttng_stream_type type, uint64_t session_id,
 		const char *session_name, const char *hostname,
-		int session_live_timer, const uint64_t *current_chunk_id)
+		int session_live_timer, const uint64_t *current_chunk_id,
+		time_t session_creation_time)
 {
 	int ret;
 	struct lttcomm_consumer_msg msg;
@@ -1101,7 +1102,8 @@ int consumer_send_relayd_socket(struct consumer_socket *consumer_sock,
 				&msg.u.relayd_sock.relayd_session_id,
 				session_name, hostname, session_live_timer,
 				consumer->snapshot, session_id,
-				sessiond_uuid, current_chunk_id);
+				sessiond_uuid, current_chunk_id,
+				session_creation_time);
 		if (ret < 0) {
 			/* Close the control socket. */
 			(void) relayd_close(rsock);
@@ -1845,17 +1847,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);
@@ -1877,10 +1896,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);