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

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

diff --git a/src/bin/lttng-sessiond/notification-thread-commands.h b/src/bin/lttng-sessiond/notification-thread-commands.h
index fc7e90bcb95ecf319c89e6bd8979602eddaac0ef..0aceb177563ec29eb4deef7510f15008593c5f79 100644 (file)
--- a/src/bin/lttng-sessiond/notification-thread-commands.h
+++ b/src/bin/lttng-sessiond/notification-thread-commands.h
@@ -22,6 +22,7 @@
 #include <lttng/lttng-error.h>
 #include <urcu/rculfhash.h>
 #include "notification-thread.h"
+#include <common/waiter.h>
 
 struct notification_thread_data;
 struct lttng_trigger;
@@ -47,6 +48,8 @@ struct channel_info {
        char *channel_name;
        uint64_t capacity;
        struct cds_lfht_node channels_ht_node;
+       /* call_rcu delayed reclaim. */
+       struct rcu_head rcu_node;
 };
 
 struct notification_thread_command {
@@ -65,8 +68,8 @@ struct notification_thread_command {
                } remove_channel;
        } parameters;
 
-       /* Futex on which to wait for command reply (optional). */
-       int32_t reply_futex;
+       /* lttng_waiter on which to wait for command reply (optional). */
+       struct lttng_waiter reply_waiter;
        enum lttng_error_code reply_code;
 };