Clean-up: replace uses of `int enabled` with boolean flags

[lttng-tools.git] / src / bin / lttng-sessiond / session.hpp

diff --git a/src/bin/lttng-sessiond/session.hpp b/src/bin/lttng-sessiond/session.hpp
index 85450b66a73e19facbd965e6d9b6e1c849497f31..0c4f71d47b84bfb264120073e6be66427363a013 100644 (file)
--- a/src/bin/lttng-sessiond/session.hpp
+++ b/src/bin/lttng-sessiond/session.hpp
@@ -14,6 +14,8 @@
 
 #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>
@@ -22,12 +24,20 @@
 #include "trace-kernel.hpp"
 #include "consumer.hpp"
 
+#define ASSERT_SESSION_LIST_LOCKED() LTTNG_ASSERT(session_trylock_list())
+
 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 {
+namespace details {
+void locked_session_release(ltt_session *session);
+} /* namespace details */
+} /* namespace sessiond */
+} /* namespace lttng */
 
 /*
  * Tracing session list
@@ -65,6 +75,12 @@ struct ltt_session_list {
  * session for both LTTng and UST.
  */
 struct ltt_session {
+       using id_t = uint64_t;
+       using locked_ptr = std::unique_ptr<ltt_session,
+                       lttng::details::create_unique_class<ltt_session,
+                                       lttng::sessiond::details::locked_session_release>::deleter>;
+       using sptr = std::shared_ptr<ltt_session>;
+
        char name[NAME_MAX];
        bool has_auto_generated_name;
        bool name_contains_creation_time;
@@ -82,7 +98,8 @@ struct ltt_session {
         */
        pthread_mutex_t lock;
        struct cds_list_head list;
-       uint64_t id;            /* session unique identifier */
+       /* session unique identifier */
+       id_t id;
        /* 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. */
@@ -108,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;
@@ -181,9 +195,8 @@ struct ltt_session {
         */
        bool rotated;
        /*
-        * Condition and trigger for size-based rotations.
+        * Trigger for size-based rotations.
         */
-       struct lttng_condition *rotate_condition;
        struct lttng_trigger *rotate_trigger;
        LTTNG_OPTIONAL(uint64_t) most_recent_chunk_id;
        struct lttng_trace_chunk *current_trace_chunk;
@@ -213,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,
@@ -239,10 +252,10 @@ struct lttng_trace_archive_location *session_get_trace_archive_location(
                const 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 *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);
 
@@ -293,4 +306,26 @@ bool session_output_supports_trace_chunks(const struct ltt_session *session);
  */
 bool sample_session_id_by_name(const char *name, uint64_t *id);
 
+namespace lttng {
+namespace sessiond {
+
+/*
+ * Session list lock must be acquired by the caller.
+ * The caller must not keep the ownership of the returned locked session
+ * for longer than strictly necessary. If your intention is to acquire
+ * a reference to an ltt_session, see `find_session_by_id()`.
+ */
+ltt_session::locked_ptr find_locked_session_by_id(ltt_session::id_t id);
+
+/*
+ * Session list lock must be acquired by the caller.
+ * The caller must not keep the ownership of the returned locked session
+ * for longer than strictly necessary. If your intention is to acquire
+ * a reference to an ltt_session, see `find_session_by_id()`.
+ */
+ltt_session::sptr find_session_by_id(ltt_session::id_t id);
+
+} /* namespace sessiond */
+} /* namespace lttng */
+
 #endif /* _LTT_SESSION_H */