X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fnotification-thread-commands.c;h=cca667476b2efffd32ac520ba1e764198a538328;hb=cafc2c60ea4893d837fe0e9cb0bbe92c02b8cc46;hp=5483a317f60c28bedd8a5ecf96ac87768d9ed52d;hpb=ab0ee2ca29394fa28284b94cc3c598960660404f;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/notification-thread-commands.c b/src/bin/lttng-sessiond/notification-thread-commands.c
index 5483a317f..cca667476 100644
--- a/src/bin/lttng-sessiond/notification-thread-commands.c
+++ b/src/bin/lttng-sessiond/notification-thread-commands.c
@@ -20,7 +20,6 @@
 #include "notification-thread.h"
 #include "notification-thread-commands.h"
 #include <common/error.h>
-#include <common/futex.h>
 #include <unistd.h>
 #include <stdint.h>
 #include <inttypes.h>
@@ -30,6 +29,7 @@ void init_notification_thread_command(struct notification_thread_command *cmd)
 {
 	memset(cmd, 0, sizeof(*cmd));
 	CDS_INIT_LIST_HEAD(&cmd->cmd_list_node);
+	lttng_waiter_init(&cmd->reply_waiter);
 }
 
 static
@@ -39,14 +39,12 @@ int run_command_wait(struct notification_thread_handle *handle,
 	int ret;
 	uint64_t notification_counter = 1;
 
-	futex_nto1_prepare(&cmd->reply_futex);
-
 	pthread_mutex_lock(&handle->cmd_queue.lock);
 	/* Add to queue. */
 	cds_list_add_tail(&cmd->cmd_list_node,
 			&handle->cmd_queue.list);
 	/* Wake-up thread. */
-	ret = write(handle->cmd_queue.event_fd,
+	ret = write(lttng_pipe_get_writefd(handle->cmd_queue.event_pipe),
 			&notification_counter, sizeof(notification_counter));
 	if (ret < 0) {
 		PERROR("write to notification thread's queue event fd");
@@ -59,7 +57,7 @@ int run_command_wait(struct notification_thread_handle *handle,
 	}
 	pthread_mutex_unlock(&handle->cmd_queue.lock);
 
-	futex_nto1_wait(&cmd->reply_futex);
+	lttng_waiter_wait(&cmd->reply_waiter);
 	return 0;
 error_unlock_queue:
 	pthread_mutex_unlock(&handle->cmd_queue.lock);