Clean-up: sessiond: rename public accessors

[lttng-tools.git] / src / bin / lttng-sessiond / notification-thread-internal.hpp

diff --git a/src/bin/lttng-sessiond/notification-thread-internal.hpp b/src/bin/lttng-sessiond/notification-thread-internal.hpp
index 0c992073e31debd2b4e0db8b54995d0da3d87bdd..1cab09d9707347530d34c1b5bbb5e87f46aec1b4 100644 (file)
--- a/src/bin/lttng-sessiond/notification-thread-internal.hpp
+++ b/src/bin/lttng-sessiond/notification-thread-internal.hpp
@@ -28,8 +28,21 @@ struct channel_key {
        enum lttng_domain_type domain;
 };
 
+struct session_state_sample {
+       uint64_t consumed_data_size;
+       struct {
+               /* Whether a rotation is ongoing for this session. */
+               bool ongoing;
+               /* Identifier of the currently ongoing rotation. */
+               uint64_t id;
+               /* Location of last completed rotation. */
+               struct lttng_trace_archive_location *location;
+       } rotation;
+};
+
 struct session_info {
        struct lttng_ref ref;
+       uint64_t id;
        char *name;
        uid_t uid;
        gid_t gid;
@@ -47,13 +60,8 @@ struct session_info {
         * destruction.
         */
        struct cds_lfht *sessions_ht;
-       uint64_t consumed_data_size;
-       struct {
-               /* Whether a rotation is ongoing for this session. */
-               bool ongoing;
-               /* Identifier of the currently ongoing rotation. */
-               uint64_t id;
-       } rotation;
+       /* Session's state as of the latest update. */
+       struct session_state_sample last_state_sample;
        /* call_rcu delayed reclaim. */
        struct rcu_head rcu_node;
 };