Fix: notification thread: RCU-safe reclaim of hash table nodes

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

diff --git a/src/bin/lttng-sessiond/notification-thread-internal.h b/src/bin/lttng-sessiond/notification-thread-internal.h
index 0bd575c233be3250cf27f94bce467372134c4b1f..e217995f56635c13efffb70f3f5b8eea9f7ecd18 100644 (file)
--- a/src/bin/lttng-sessiond/notification-thread-internal.h
+++ b/src/bin/lttng-sessiond/notification-thread-internal.h
@@ -41,6 +41,11 @@ struct session_info {
        struct lttng_session_trigger_list *trigger_list;
        /* Node in the notification thread state's sessions_ht. */
        struct cds_lfht_node sessions_ht_node;
+       /*
+        * Weak reference to the thread state's sessions_ht. Used for removal on
+        * destruction.
+        */
+       struct cds_lfht *sessions_ht;
        uint64_t consumed_data_size;
        struct {
                /* Whether a rotation is ongoing for this session. */
@@ -48,6 +53,8 @@ struct session_info {
                /* Identifier of the currently ongoing rotation. */
                uint64_t id;
        } rotation;
+       /* call_rcu delayed reclaim. */
+       struct rcu_head rcu_node;
 };
 
 struct channel_info {
@@ -63,6 +70,8 @@ struct channel_info {
        struct cds_lfht_node channels_ht_node;
        /* Node in the session_info's channels_ht. */
        struct cds_lfht_node session_info_channels_ht_node;
+       /* call_rcu delayed reclaim. */
+       struct rcu_head rcu_node;
 };
 
 #endif /* NOTIFICATION_THREAD_INTERNAL_H */