X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fnotification-thread-commands.h;h=5c6441542ac091a742197b337807429386ecf4cf;hp=fc7e90bcb95ecf319c89e6bd8979602eddaac0ef;hb=dd73d57bb95fae31161ca0781108d166082a06f5;hpb=ab0ee2ca29394fa28284b94cc3c598960660404f

diff --git a/src/bin/lttng-sessiond/notification-thread-commands.h b/src/bin/lttng-sessiond/notification-thread-commands.h
index fc7e90bcb..5c6441542 100644
--- a/src/bin/lttng-sessiond/notification-thread-commands.h
+++ b/src/bin/lttng-sessiond/notification-thread-commands.h
@@ -22,6 +22,9 @@
 #include <lttng/lttng-error.h>
 #include <urcu/rculfhash.h>
 #include "notification-thread.h"
+#include "notification-thread-internal.h"
+#include "notification-thread-events.h"
+#include <common/waiter.h>
 
 struct notification_thread_data;
 struct lttng_trigger;
@@ -34,21 +37,6 @@ enum notification_thread_command_type {
 	NOTIFICATION_COMMAND_TYPE_QUIT,
 };
 
-struct channel_key {
-	uint64_t key;
-	enum lttng_domain_type domain;
-};
-
-struct channel_info {
-	struct channel_key key;
-	char *session_name;
-	uid_t uid;
-	gid_t gid;
-	char *channel_name;
-	uint64_t capacity;
-	struct cds_lfht_node channels_ht_node;
-};
-
 struct notification_thread_command {
 	struct cds_list_head cmd_list_node;
 
@@ -57,7 +45,19 @@ struct notification_thread_command {
 		/* Register/Unregister trigger. */
 		struct lttng_trigger *trigger;
 		/* Add channel. */
-		struct channel_info add_channel;
+		struct {
+			struct {
+				const char *name;
+				uid_t uid;
+				gid_t gid;
+			} session;
+			struct {
+				const char *name;
+				enum lttng_domain_type domain;
+				uint64_t key;
+				uint64_t capacity;
+			} channel;
+		} add_channel;
 		/* Remove channel. */
 		struct {
 			uint64_t key;
@@ -65,8 +65,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;
 };