X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Ftrace-chunk.c;h=ec52e5d2b3e30598216e26bf1f8eea6fd7a2ae9a;hp=32792926928d6abb6ebed749460e3a970307c2f3;hb=ad8bec244fdbb0e7705fd1865ae71f36f06d2b94;hpb=d7a20fcf33143103aa58cf1b48f4507af2d09e70

diff --git a/src/common/trace-chunk.c b/src/common/trace-chunk.c
index 327929269..ec52e5d2b 100644
--- a/src/common/trace-chunk.c
+++ b/src/common/trace-chunk.c
@@ -97,8 +97,14 @@ struct lttng_trace_chunk {
 	char *path;
 	/* An unset id means the chunk is anonymous. */
 	LTTNG_OPTIONAL(uint64_t) id;
+
+	/*
+	 * The creation and close timestamps are NOT monotonic.
+	 * They must not be used in context were monotonicity is required.
+	 */
 	LTTNG_OPTIONAL(time_t) timestamp_creation;
 	LTTNG_OPTIONAL(time_t) timestamp_close;
+
 	LTTNG_OPTIONAL(struct chunk_credentials) credentials;
 	struct lttng_directory_handle *session_output_directory;
 	struct lttng_directory_handle *chunk_directory;
@@ -599,11 +605,20 @@ enum lttng_trace_chunk_status lttng_trace_chunk_set_close_timestamp(
 		status = LTTNG_TRACE_CHUNK_STATUS_INVALID_OPERATION;
 		goto end;
 	}
+
+	/*
+	 * Note: we do not enforce that the closing timestamp be greater or
+	 * equal to the begin timestamp. These timestamps are used for
+	 * generating the chunk name and should only be used in context where
+	 * the monotonicity of time is not important. The source of those
+	 * timestamps is NOT monotonic and represent the system calendar time,
+	 * also know as the wall time.
+	 */
 	if (chunk->timestamp_creation.value > close_ts) {
-		ERR("Failed to set trace chunk close timestamp: close timestamp is before creation timestamp");
-		status = LTTNG_TRACE_CHUNK_STATUS_INVALID_ARGUMENT;
-		goto end;
+		WARN("Set trace chunk close timestamp: close timestamp is before creation timestamp, begin : %ld, close : %ld",
+				chunk->timestamp_creation.value, close_ts);
 	}
+
 	LTTNG_OPTIONAL_SET(&chunk->timestamp_close, close_ts);
 	if (!chunk->name_overridden) {
 		free(chunk->name);
@@ -1813,6 +1828,32 @@ const char *lttng_trace_chunk_command_type_get_name(
 	}
 }
 
+LTTNG_HIDDEN
+bool lttng_trace_chunk_ids_equal(const struct lttng_trace_chunk *chunk_a,
+		const struct lttng_trace_chunk *chunk_b)
+{
+	bool equal = false;
+
+	if (!chunk_a || !chunk_b) {
+		goto end;
+	}
+
+	if (chunk_a->id.is_set ^ chunk_a->id.is_set) {
+		/* One id is set and not the other, thus they are not equal. */
+		goto end;
+	}
+
+	if (!chunk_a->id.is_set) {
+		/* Both ids are unset. */
+		equal = true;
+	} else {
+		equal = chunk_a->id.value == chunk_b->id.value;
+	}
+
+end:
+	return equal;
+}
+
 LTTNG_HIDDEN
 bool lttng_trace_chunk_get(struct lttng_trace_chunk *chunk)
 {