X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=src%2Fcommon%2Ftrace-chunk.c;h=bed6b73afb5d7cd79b3fab13552cb5d75a7df808;hb=159138d3dbee3c158b16f9c350a39659ed696745;hp=affe3ac2050186043d5abd0590173e2f3296bd11;hpb=95245d44f4c3d2f062d3c348710b605002168446;p=lttng-tools.git

diff --git a/src/common/trace-chunk.c b/src/common/trace-chunk.c
index affe3ac20..bed6b73af 100644
--- a/src/common/trace-chunk.c
+++ b/src/common/trace-chunk.c
@@ -84,8 +84,14 @@ struct lttng_trace_chunk {
 	char *name;
 	/* 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;
 	LTTNG_OPTIONAL(struct lttng_directory_handle) session_output_directory;
 	LTTNG_OPTIONAL(struct lttng_directory_handle) chunk_directory;
@@ -432,11 +438,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);
@@ -840,7 +855,7 @@ enum lttng_trace_chunk_status lttng_trace_chunk_open_file(
 			chunk->credentials.value.use_current_user ?
 					NULL : &chunk->credentials.value.user);
 	if (ret < 0) {
-		ERR("Failed to open file relative to trace chunk file_path = \"%s\", flags = %d, mode = %d",
+		PERROR("Failed to open file relative to trace chunk file_path = \"%s\", flags = %d, mode = %d",
 				file_path, flags, (int) mode);
 		status = LTTNG_TRACE_CHUNK_STATUS_ERROR;
 		goto end;
@@ -975,6 +990,7 @@ void lttng_trace_chunk_move_to_completed(struct lttng_trace_chunk *trace_chunk)
 				creation_timestamp, NULL);
 		if (!directory_to_rename) {
 			ERR("Failed to generate initial trace chunk name while renaming trace chunk");
+			goto end;
 		}
 		free_directory_to_rename = true;
 	}
@@ -1268,7 +1284,7 @@ lttng_trace_chunk_registry_publish_chunk(
 				 *
 				 * Re-attempt to publish.
 				 */
-				ERR("Attemp to publish a trace chunk to the chunk registry raced with a trace chunk deletion");
+				ERR("Attempt to publish a trace chunk to the chunk registry raced with a trace chunk deletion");
 				continue;
 			}
 		}