X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=src%2Fcommon%2Ftrace-chunk.c;h=172bd3df88e1d32247a93f06786f8c639de5225b;hb=948411cd7aa5e2327177c2e4ed8be8dd65c8504c;hp=488d7ebc4ffffcf19938cdb5f1da4036311417e6;hpb=84fa4db56e9fbc47bfe8e6cccd9ace585eb9e396;p=lttng-tools.git

diff --git a/src/common/trace-chunk.c b/src/common/trace-chunk.c
index 488d7ebc4..172bd3df8 100644
--- a/src/common/trace-chunk.c
+++ b/src/common/trace-chunk.c
@@ -827,9 +827,18 @@ void lttng_trace_chunk_move_to_completed(struct lttng_trace_chunk *trace_chunk)
 			LTTNG_OPTIONAL_GET(trace_chunk->timestamp_creation);
 	const time_t close_timestamp =
 			LTTNG_OPTIONAL_GET(trace_chunk->timestamp_close);
-	LTTNG_OPTIONAL(struct lttng_directory_handle) archived_chunks_directory;
+	LTTNG_OPTIONAL(struct lttng_directory_handle) archived_chunks_directory = {};
+
+	if (!trace_chunk->mode.is_set ||
+			trace_chunk->mode.value != TRACE_CHUNK_MODE_OWNER ||
+			!trace_chunk->session_output_directory.is_set) {
+		/*
+		 * This command doesn't need to run if the output is remote
+		 * or if the trace chunk is not owned by this process.
+		 */
+		goto end;
+	}
 
-	assert(trace_chunk->mode.is_set);
 	assert(trace_chunk->mode.value == TRACE_CHUNK_MODE_OWNER);
 	assert(!trace_chunk->name_overriden);
 
@@ -949,6 +958,24 @@ end:
 	}
 }
 
+LTTNG_HIDDEN
+enum lttng_trace_chunk_status lttng_trace_chunk_get_close_command(
+		struct lttng_trace_chunk *chunk,
+		enum lttng_trace_chunk_command_type *command_type)
+{
+	enum lttng_trace_chunk_status status = LTTNG_TRACE_CHUNK_STATUS_OK;
+
+	pthread_mutex_lock(&chunk->lock);
+	if (chunk->close_command.is_set) {
+		*command_type = chunk->close_command.value;
+		status = LTTNG_TRACE_CHUNK_STATUS_OK;
+	} else {
+		status = LTTNG_TRACE_CHUNK_STATUS_NONE;
+	}
+	pthread_mutex_unlock(&chunk->lock);
+	return status;
+}
+
 LTTNG_HIDDEN
 enum lttng_trace_chunk_status lttng_trace_chunk_set_close_command(
 		struct lttng_trace_chunk *chunk,
@@ -977,6 +1004,18 @@ end_unlock:
 	return status;
 }
 
+LTTNG_HIDDEN
+const char *lttng_trace_chunk_command_type_get_name(
+		enum lttng_trace_chunk_command_type command)
+{
+	switch (command) {
+	case LTTNG_TRACE_CHUNK_COMMAND_TYPE_MOVE_TO_COMPLETED:
+		return "move to completed trace chunk folder";
+	default:
+		abort();
+	}
+}
+
 LTTNG_HIDDEN
 bool lttng_trace_chunk_get(struct lttng_trace_chunk *chunk)
 {