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

diff --git a/src/bin/lttng-sessiond/session.h b/src/bin/lttng-sessiond/session.h
index 3b3380c3f..b1ca2504e 100644
--- a/src/bin/lttng-sessiond/session.h
+++ b/src/bin/lttng-sessiond/session.h
@@ -19,13 +19,16 @@
 #define _LTT_SESSION_H
 
 #include <limits.h>
+#include <stdbool.h>
 #include <urcu/list.h>
 
 #include <common/hashtable/hashtable.h>
 #include <lttng/rotation.h>
+#include <lttng/location.h>
 
 #include "snapshot.h"
 #include "trace-kernel.h"
+#include "consumer.h"
 
 struct ltt_ust_session;
 
@@ -118,23 +121,34 @@ 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;
 	/*
-	 * 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.
+	 * 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.
 	 */
-	bool rotate_pending;
-	/* Current status of a rotation. */
-	enum lttng_rotation_status rotation_status;
+	uint64_t current_archive_id;
 	/*
-	 * 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.
+	 * 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.
 	 */
-	unsigned int nr_chan_rotate_pending;
+	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
@@ -162,6 +176,31 @@ struct ltt_session {
 	 * 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.
+	 */
+	bool rotation_pending_check_timer_enabled;
+	timer_t rotation_pending_check_timer;
+	/* Timer to periodically rotate a session. */
+	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. */
+	uint64_t rotate_size;
+	/*
+	 * 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 occurred since the last stop to rename the current
+	 * chunk.
+	 */
+	bool rotated_after_last_stop;
+	/*
+	 * Condition and trigger for size-based rotations.
+	 */
+	struct lttng_condition *rotate_condition;
+	struct lttng_trigger *rotate_trigger;
 };
 
 /* Prototypes */
@@ -170,13 +209,27 @@ 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);
 
+enum consumer_dst_type session_get_consumer_destination_type(
+		const struct ltt_session *session);
+const char *session_get_net_consumer_hostname(
+		const struct ltt_session *session);
+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);
 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 */