X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fnotification-thread-events.c;h=66223e9d340e89f8c39b8dc3b5b5bfbecbbf096a;hp=e20c476f830342612721dfb0f5d93c9474b80e08;hb=1fa1cfec753071454ca0eeb1adb426d60a606dcc;hpb=7c2551ef99cb5b7a927373a198013601ee43fd9a

diff --git a/src/bin/lttng-sessiond/notification-thread-events.c b/src/bin/lttng-sessiond/notification-thread-events.c
index e20c476f8..66223e9d3 100644
--- a/src/bin/lttng-sessiond/notification-thread-events.c
+++ b/src/bin/lttng-sessiond/notification-thread-events.c
@@ -40,6 +40,7 @@
 #include <unistd.h>
 #include <assert.h>
 #include <inttypes.h>
+#include <fcntl.h>
 
 #define CLIENT_POLL_MASK_IN (LPOLLIN | LPOLLERR | LPOLLHUP | LPOLLRDHUP)
 #define CLIENT_POLL_MASK_IN_OUT (CLIENT_POLL_MASK_IN | LPOLLOUT)
@@ -957,6 +958,7 @@ error:
 	return ret;
 }
 
+static
 int handle_notification_thread_command_unregister_trigger(
 		struct notification_thread_state *state,
 		struct lttng_trigger *trigger,
@@ -1108,12 +1110,12 @@ int handle_notification_thread_command(
 	}
 end:
 	cds_list_del(&cmd->cmd_list_node);
-	futex_nto1_wake(&cmd->reply_futex);
+	lttng_waiter_wake_up(&cmd->reply_waiter);
 	pthread_mutex_unlock(&handle->cmd_queue.lock);
 	return ret;
 error_unlock:
 	/* Wake-up and return a fatal error to the calling thread. */
-	futex_nto1_wake(&cmd->reply_futex);
+	lttng_waiter_wake_up(&cmd->reply_waiter);
 	pthread_mutex_unlock(&handle->cmd_queue.lock);
 	cmd->reply_code = LTTNG_ERR_FATAL;
 error:
@@ -1220,7 +1222,6 @@ int handle_notification_thread_client_connect(
 	DBG("[notification-thread] Added new notification channel client socket (%i) to poll set",
 			client->socket);
 
-	/* Add to ht. */
 	rcu_read_lock();
 	cds_lfht_add(state->client_socket_ht,
 			hash_client_socket(client->socket),