X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fnotification-thread-events.c;h=0bb75b6d81607954093695ab894b58326a70f0bb;hb=47a32869a6b2f7014887d523943046c9c64e6458;hp=8bc020f960f24f691c6e0a44e51aaac6239084c7;hpb=4fb43b68c1822cc7619907070489d3d678c41e7a;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/notification-thread-events.c b/src/bin/lttng-sessiond/notification-thread-events.c
index 8bc020f96..0bb75b6d8 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),
@@ -1508,7 +1509,7 @@ int client_dispatch_message(struct notification_client *client,
 		handshake_client =
 				(struct lttng_notification_channel_command_handshake *)
 					client->communication.inbound.buffer.data;
-				client->major = handshake_client->major;
+		client->major = handshake_client->major;
 		client->minor = handshake_client->minor;
 		if (!client->communication.inbound.creds_received) {
 			ERR("[notification-thread] No credentials received from client");
@@ -1949,9 +1950,7 @@ int handle_notification_thread_channel_sample(
 	 * The monitoring pipe only holds messages smaller than PIPE_BUF,
 	 * ensuring that read/write of sampling messages are atomic.
 	 */
-	do {
-		ret = read(pipe, &sample_msg, sizeof(sample_msg));
-	} while (ret == -1 && errno == EINTR);
+	ret = lttng_read(pipe, &sample_msg, sizeof(sample_msg));
 	if (ret != sizeof(sample_msg)) {
 		ERR("[notification-thread] Failed to read from monitoring pipe (fd = %i)",
 				pipe);