X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fsession.h;h=1cea52a61fc64a75169041aa7bbddee7b8180082;hp=19dabb727179bb23a64e2b5cf3a1bba8a5f4ffc3;hb=d295668767ac8234e83984e1812d342d03293d88;hpb=fb9a95c4d6242bd8336b638c90a7d8f846125659

diff --git a/src/bin/lttng-sessiond/session.h b/src/bin/lttng-sessiond/session.h
index 19dabb727..1cea52a61 100644
--- a/src/bin/lttng-sessiond/session.h
+++ b/src/bin/lttng-sessiond/session.h
@@ -146,61 +146,6 @@ struct ltt_session {
 	 * Node in ltt_sessions_ht_by_id.
 	 */
 	struct lttng_ht_node_u64 node;
-	/*
-	 * The current archive id corresponds to the number of session rotations
-	 * that have occurred for this session. The archive id
-	 * is used to tag the "generation" of a stream. This tag allows the
-	 * consumer and relay daemons to track when a given stream was created
-	 * during the lifetime of a session.
-	 *
-	 * For instance, if a stream is created after a session rotation was
-	 * launched, the consumer and relay daemons must not check its position
-	 * to determine if that specific session rotation was completed. It is
-	 * implicitly "completed" since the stream appeared _after_ the session
-	 * rotation was initiated.
-	 */
-	uint64_t current_archive_id;
-	/*
-	 * Rotation is considered pending between the time it is launched up
-	 * until the moment when the data has been writen at the destination
-	 * and the trace archive has been renamed.
-	 *
-	 * When tracing locally, only 'rotation_pending_local' is used since
-	 * no remote checks are needed. However, when tracing to a relay daemon,
-	 * a second check is needed to ensure that the data has been
-	 * commited at the remote destination.
-	 */
-	bool rotation_pending_local;
-	bool rotation_pending_relay;
-	/* Current state of a rotation. */
-	enum lttng_rotation_state rotation_state;
-	struct {
-		/*
-		 * When the rotation is in progress, the temporary path name is
-		 * stored here. When the rotation is complete, the final path name
-		 * is here and can be queried with the rotate_pending call.
-		 */
-		char current_rotate_path[LTTNG_PATH_MAX];
-		/*
-		 * The path where the consumer is currently writing after the first
-		 * session rotation.
-		 */
-		char active_tracing_path[LTTNG_PATH_MAX];
-	} rotation_chunk;
-	/*
-	 * The timestamp of the beginning of the previous chunk. For the
-	 * first chunk, this is the "lttng start" timestamp. For the
-	 * subsequent ones, this copies the current_chunk_start_ts value when
-	 * a new rotation starts. This value is used to set the name of a
-	 * complete chunk directory, ex: "last_chunk_start_ts-now()".
-	 */
-	time_t last_chunk_start_ts;
-	/*
-	 * This is the timestamp when a new chunk starts. When a new rotation
-	 * starts, we copy this value to last_chunk_start_ts and replace it
-	 * with the current timestamp.
-	 */
-	time_t current_chunk_start_ts;
 	/*
 	 * Timer to check periodically if a relay and/or consumer has completed
 	 * the last rotation.
@@ -226,8 +171,13 @@ struct ltt_session {
 	 */
 	struct lttng_condition *rotate_condition;
 	struct lttng_trigger *rotate_trigger;
-	LTTNG_OPTIONAL(uint64_t) last_trace_chunk_id;
+	LTTNG_OPTIONAL(uint64_t) most_recent_chunk_id;
 	struct lttng_trace_chunk *current_trace_chunk;
+	struct lttng_trace_chunk *chunk_being_archived;
+	/* Current state of a rotation. */
+	enum lttng_rotation_state rotation_state;
+	char *last_archived_chunk_name;
+	LTTNG_OPTIONAL(uint64_t) last_archived_chunk_id;
 };
 
 /* Prototypes */
@@ -265,10 +215,29 @@ int session_access_ok(struct ltt_session *session, uid_t uid, gid_t gid);
 int session_reset_rotation_state(struct ltt_session *session,
 		enum lttng_rotation_state result);
 
-enum lttng_error_code session_switch_trace_chunk(struct ltt_session *session,
+/* Create a new trace chunk object from the session's configuration. */
+struct lttng_trace_chunk *session_create_new_trace_chunk(
+		struct ltt_session *session,
 		const char *session_base_path_override,
 		const char *chunk_name_override);
+
+/*
+ * Set `new_trace_chunk` as the session's current trace chunk. A reference
+ * to `new_trace_chunk` is acquired by the session. The chunk is created
+ * on remote peers (consumer and relay daemons).
+ *
+ * A reference to the session's current trace chunk is returned through
+ * `current_session_trace_chunk` on success.
+ */
 int session_set_trace_chunk(struct ltt_session *session,
-		struct lttng_trace_chunk *current_trace_chunk);
+		struct lttng_trace_chunk *new_trace_chunk,
+		struct lttng_trace_chunk **current_session_trace_chunk);
+
+/*
+ * Close a chunk on the remote peers of a session. Has no effect on the
+ * ltt_session itself.
+ */
+int session_close_trace_chunk(const struct ltt_session *session,
+		struct lttng_trace_chunk *trace_chunk);
 
 #endif /* _LTT_SESSION_H */