X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fcmd.c;h=1b73978f27f0e81d671987f05ae851e70e5acf47;hb=fb180e6e4855acd6eff826ac6253b58d5d3e6da4;hp=4447747de752608f08aa02719af5254ab3f2a26c;hpb=070b6a86970c981e8f79cbd3dc199008b25cc0dc;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/cmd.c b/src/bin/lttng-sessiond/cmd.c
index 4447747de..1b73978f2 100644
--- a/src/bin/lttng-sessiond/cmd.c
+++ b/src/bin/lttng-sessiond/cmd.c
@@ -4476,6 +4476,8 @@ enum lttng_error_code snapshot_record(struct ltt_session *session,
 				session->kernel_session->consumer;
 		snapshot_kernel_consumer_output =
 				consumer_copy_output(snapshot_output->consumer);
+		strcpy(snapshot_kernel_consumer_output->chunk_path,
+			snapshot_chunk_name);
 		ret = consumer_copy_sockets(snapshot_kernel_consumer_output,
 				original_kernel_consumer_output);
 		if (ret < 0) {
@@ -4496,6 +4498,8 @@ enum lttng_error_code snapshot_record(struct ltt_session *session,
 		original_ust_consumer_output = session->ust_session->consumer;
 		snapshot_ust_consumer_output =
 				consumer_copy_output(snapshot_output->consumer);
+		strcpy(snapshot_ust_consumer_output->chunk_path,
+			snapshot_chunk_name);
 		ret = consumer_copy_sockets(snapshot_ust_consumer_output,
 				original_ust_consumer_output);
 		if (ret < 0) {
@@ -4562,7 +4566,7 @@ enum lttng_error_code snapshot_record(struct ltt_session *session,
 	}
 
 	if (session_close_trace_chunk(
-			    session, session->current_trace_chunk, NULL)) {
+			    session, session->current_trace_chunk, NULL, NULL)) {
 		/*
 		 * Don't goto end; make sure the chunk is closed for the session
 		 * to allow future snapshots.
@@ -4851,7 +4855,8 @@ int cmd_rotate_session(struct ltt_session *session,
 			quiet_rotation ?
 					NULL :
 					&((enum lttng_trace_chunk_command_type){
-							LTTNG_TRACE_CHUNK_COMMAND_TYPE_MOVE_TO_COMPLETED}));
+							LTTNG_TRACE_CHUNK_COMMAND_TYPE_MOVE_TO_COMPLETED}),
+			session->last_chunk_path);
 	if (ret) {
 		cmd_ret = LTTNG_ERR_CLOSE_TRACE_CHUNK_FAIL_CONSUMER;
 		goto error;
@@ -4972,6 +4977,16 @@ int cmd_rotate_get_info(struct ltt_session *session,
 					sizeof(info_return->location.local.absolute_path);
 			info_return->location_type =
 					(int8_t) LTTNG_TRACE_ARCHIVE_LOCATION_TYPE_LOCAL;
+			fmt_ret = asprintf(&chunk_path,
+					"%s/" DEFAULT_ARCHIVED_TRACE_CHUNKS_DIRECTORY "/%s",
+					session_get_base_path(session),
+					session->last_archived_chunk_name);
+			if (fmt_ret == -1) {
+				PERROR("Failed to format the path of the last archived trace chunk");
+				info_return->status = LTTNG_ROTATION_STATUS_ERROR;
+				cmd_ret = LTTNG_ERR_UNK;
+				goto end;
+			}
 			break;
 		case CONSUMER_DST_NET:
 			current_tracing_path_reply =
@@ -4997,20 +5012,17 @@ int cmd_rotate_get_info(struct ltt_session *session,
 					&info_return->location.relay.ports.data);
 			info_return->location_type =
 					(int8_t) LTTNG_TRACE_ARCHIVE_LOCATION_TYPE_RELAY;
+			chunk_path = strdup(session->last_chunk_path);
+			if (!chunk_path) {
+				ERR("Failed to allocate the path of the last archived trace chunk");
+				info_return->status = LTTNG_ROTATION_STATUS_ERROR;
+				cmd_ret = LTTNG_ERR_UNK;
+				goto end;
+			}
 			break;
 		default:
 			abort();
 		}
-		fmt_ret = asprintf(&chunk_path,
-				"%s/" DEFAULT_ARCHIVED_TRACE_CHUNKS_DIRECTORY "/%s",
-				session_get_base_path(session),
-				session->last_archived_chunk_name);
-		if (fmt_ret == -1) {
-			PERROR("Failed to format the path of the last archived trace chunk");
-			info_return->status = LTTNG_ROTATION_STATUS_ERROR;
-			cmd_ret = LTTNG_ERR_UNK;
-			goto end;
-		}
 
 		fmt_ret = lttng_strncpy(current_tracing_path_reply,
 				chunk_path, current_tracing_path_reply_len);