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

diff --git a/src/bin/lttng-sessiond/session.h b/src/bin/lttng-sessiond/session.h
index b8c789081..abbf9ece0 100644
--- a/src/bin/lttng-sessiond/session.h
+++ b/src/bin/lttng-sessiond/session.h
@@ -24,6 +24,7 @@
 
 #include <common/hashtable/hashtable.h>
 #include <lttng/rotation.h>
+#include <lttng/location.h>
 
 #include "snapshot.h"
 #include "trace-kernel.h"
@@ -120,8 +121,20 @@ struct ltt_session {
 	 * Node in ltt_sessions_ht_by_id.
 	 */
 	struct lttng_ht_node_u64 node;
-	/* Number of session rotation for this session. */
-	uint64_t rotate_count;
+	/*
+	 * The current archive id corresponds to the number of session rotations
+	 * that have occured 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 pending between the time it starts until the consumer has
 	 * finished extracting the data. If the session uses a relay, data related
@@ -177,8 +190,9 @@ struct ltt_session {
 	/* Timer to periodically rotate a session. */
 	bool rotate_timer_enabled;
 	timer_t rotate_timer;
+	/* Value for periodic rotations, 0 if disabled. */
 	uint64_t rotate_timer_period;
-	/* Value for size-based rotation, 0 if disabled. */
+	/* Value for size-based rotations, 0 if disabled. */
 	uint64_t rotate_size;
 	/*
 	 * Keep a state if this session was rotated after the last stop command.
@@ -200,6 +214,7 @@ int session_destroy(struct ltt_session *session);
 
 void session_lock(struct ltt_session *session);
 void session_lock_list(void);
+int session_trylock_list(void);
 void session_unlock(struct ltt_session *session);
 void session_unlock_list(void);
 
@@ -210,6 +225,8 @@ const char *session_get_net_consumer_hostname(
 void session_get_net_consumer_ports(
 		const struct ltt_session *session,
 		uint16_t *control_port, uint16_t *data_port);
+struct lttng_trace_archive_location *session_get_trace_archive_location(
+		struct ltt_session *session);
 
 struct ltt_session *session_find_by_name(const char *name);
 struct ltt_session *session_find_by_id(uint64_t id);