X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fsession.h;h=b1ca2504e6d86b722fef2bc0c4c3b7ae048e7872;hp=abbf9ece04a1a1b438287fda61f2f73f39a65f91;hb=a9577b7628a85b064c3f249c3504bad989848b49;hpb=5d65beabea67cce0c6586f702d0962ffacedc59a

diff --git a/src/bin/lttng-sessiond/session.h b/src/bin/lttng-sessiond/session.h
index abbf9ece0..b1ca2504e 100644
--- a/src/bin/lttng-sessiond/session.h
+++ b/src/bin/lttng-sessiond/session.h
@@ -123,7 +123,7 @@ struct ltt_session {
 	struct lttng_ht_node_u64 node;
 	/*
 	 * The current archive id corresponds to the number of session rotations
-	 * that have occured for this session. The archive id
+	 * 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.
@@ -136,24 +136,19 @@ struct ltt_session {
 	 */
 	uint64_t current_archive_id;
 	/*
-	 * Rotation is pending between the time it starts until the consumer has
-	 * finished extracting the data. If the session uses a relay, data related
-	 * to a rotation can still be in flight after that, see
-	 * rotate_pending_relay.
-	 */
-	bool rotate_pending;
-	/*
-	 * True until the relay has finished the rotation of all the streams.
+	 * 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 rotate_pending_relay;
+	bool rotation_pending_local;
+	bool rotation_pending_relay;
 	/* Current state of a rotation. */
 	enum lttng_rotation_state rotation_state;
-	/*
-	 * Number of channels waiting for a rotation.
-	 * When this number reaches 0, we can handle the rename of the chunk
-	 * folder and inform the client that the rotate is finished.
-	 */
-	unsigned int nr_chan_rotate_pending;
 	struct {
 		/*
 		 * When the rotation is in progress, the temporary path name is
@@ -182,14 +177,14 @@ struct ltt_session {
 	 */
 	time_t current_chunk_start_ts;
 	/*
-	 * Timer to check periodically if a relay has completed the last
-	 * rotation.
+	 * Timer to check periodically if a relay and/or consumer has completed
+	 * the last rotation.
 	 */
-	bool rotate_relay_pending_timer_enabled;
-	timer_t rotate_relay_pending_timer;
+	bool rotation_pending_check_timer_enabled;
+	timer_t rotation_pending_check_timer;
 	/* Timer to periodically rotate a session. */
-	bool rotate_timer_enabled;
-	timer_t rotate_timer;
+	bool rotation_schedule_timer_enabled;
+	timer_t rotation_schedule_timer;
 	/* Value for periodic rotations, 0 if disabled. */
 	uint64_t rotate_timer_period;
 	/* Value for size-based rotations, 0 if disabled. */
@@ -197,7 +192,7 @@ struct ltt_session {
 	/*
 	 * Keep a state if this session was rotated after the last stop command.
 	 * We only allow one rotation after a stop. At destroy, we also need to
-	 * know if a rotation occured since the last stop to rename the current
+	 * know if a rotation occurred since the last stop to rename the current
 	 * chunk.
 	 */
 	bool rotated_after_last_stop;
@@ -234,4 +229,7 @@ struct ltt_session_list *session_get_list(void);
 
 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);
+
 #endif /* _LTT_SESSION_H */