X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fsession.hpp;h=0c4f71d47b84bfb264120073e6be66427363a013;hb=66cefebdc240cbae0bc79594305f509b0779fa98;hp=17f3ca13970ae53f0e84001f7565fc92df8cbc89;hpb=e99e366487cb113a1041e4217ba181feb52d05c9;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/session.hpp b/src/bin/lttng-sessiond/session.hpp
index 17f3ca139..0c4f71d47 100644
--- a/src/bin/lttng-sessiond/session.hpp
+++ b/src/bin/lttng-sessiond/session.hpp
@@ -15,6 +15,7 @@
 #include <common/hashtable/hashtable.hpp>
 #include <common/dynamic-array.hpp>
 #include <common/make-unique-wrapper.hpp>
+#include <common/pthread-lock.hpp>
 #include <lttng/rotation.h>
 #include <lttng/location.h>
 #include <lttng/lttng-error.h>
@@ -27,10 +28,8 @@
 
 struct ltt_ust_session;
 
-typedef void (*ltt_session_destroy_notifier)(const struct ltt_session *session,
-		void *user_data);
-typedef void (*ltt_session_clear_notifier)(const struct ltt_session *session,
-		void *user_data);
+using ltt_session_destroy_notifier = void (*)(const struct ltt_session *, void *);
+using ltt_session_clear_notifier = void (*)(const struct ltt_session *, void *);
 
 namespace lttng {
 namespace sessiond {
@@ -126,12 +125,9 @@ struct ltt_session {
 	 */
 	bool has_user_specified_directory;
 	/* Did at least ONE start command has been triggered?. */
-	unsigned int has_been_started:1;
-	/*
-	 * Is the session active? Start trace command sets this to 1 and the stop
-	 * command reset it to 0.
-	 */
-	unsigned int active:1;
+	bool has_been_started;
+	/* Is the session active? */
+	bool active;
 
 	/* Snapshot representation in a session. */
 	struct snapshot snapshot;
@@ -230,9 +226,9 @@ void session_unlock(struct ltt_session *session);
  * In other words, it prevents tracer configurations from changing while they
  * are being transmitted to the various applications.
  */
-void session_lock_list(void);
-int session_trylock_list(void);
-void session_unlock_list(void);
+void session_lock_list();
+int session_trylock_list();
+void session_unlock_list();
 
 void session_destroy(struct ltt_session *session);
 int session_add_destroy_notifier(struct ltt_session *session,
@@ -258,8 +254,8 @@ 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(ltt_session::id_t id);
 
-struct ltt_session_list *session_get_list(void);
-void session_list_wait_empty(void);
+struct ltt_session_list *session_get_list();
+void session_list_wait_empty();
 
 bool session_access_ok(struct ltt_session *session, uid_t uid);