X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fsession.h;h=6a0da6c164f95a48b15a2e0250611d77a0dcf2ec;hp=99b8c47112bd3f6d1032d7bdcf8e4439b07801ba;hb=f4cc5e83435948e64f5c7bce395ca19703da02a3;hpb=92816cc33a1add3c8276839bd6335e17423577dd

diff --git a/src/bin/lttng-sessiond/session.h b/src/bin/lttng-sessiond/session.h
index 99b8c4711..6a0da6c16 100644
--- a/src/bin/lttng-sessiond/session.h
+++ b/src/bin/lttng-sessiond/session.h
@@ -47,6 +47,11 @@ struct ltt_session_list {
 	 * iterate or/and do any actions on that list.
 	 */
 	pthread_mutex_t lock;
+	/*
+	 * This condition variable is signaled on every removal from
+	 * the session list.
+	 */
+	pthread_cond_t removal_cond;
 
 	/*
 	 * Session unique ID generator. The session list lock MUST be
@@ -67,6 +72,7 @@ struct ltt_session {
 	char hostname[HOST_NAME_MAX]; /* Local hostname. */
 	struct ltt_kernel_session *kernel_session;
 	struct ltt_ust_session *ust_session;
+	struct urcu_ref ref;
 	/*
 	 * Protect any read/write on this session data structure. This lock must be
 	 * acquired *before* using any public functions declared below. Use
@@ -75,6 +81,10 @@ struct ltt_session {
 	pthread_mutex_t lock;
 	struct cds_list_head list;
 	uint64_t id;		/* session unique identifier */
+	/* Indicates if the session has been added to the session list and ht.*/
+	bool published;
+	/* Indicates if a destroy command has been applied to this session. */
+	bool destroyed;
 	/* UID/GID of the user owning the session */
 	uid_t uid;
 	gid_t gid;
@@ -123,7 +133,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.
@@ -192,7 +202,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;
@@ -205,7 +215,6 @@ struct ltt_session {
 
 /* Prototypes */
 int session_create(char *name, uid_t uid, gid_t gid);
-int session_destroy(struct ltt_session *session);
 
 void session_lock(struct ltt_session *session);
 void session_lock_list(void);
@@ -213,6 +222,11 @@ int session_trylock_list(void);
 void session_unlock(struct ltt_session *session);
 void session_unlock_list(void);
 
+void session_destroy(struct ltt_session *session);
+
+bool session_get(struct ltt_session *session);
+void session_put(struct ltt_session *session);
+
 enum consumer_dst_type session_get_consumer_destination_type(
 		const struct ltt_session *session);
 const char *session_get_net_consumer_hostname(
@@ -225,8 +239,13 @@ struct lttng_trace_archive_location *session_get_trace_archive_location(
 
 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);
+void session_list_wait_empty(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 */