X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fnotification-thread.cpp;h=7d9f4ed12dd72bae638db763f757ee8ffa7021a0;hb=8a880a84dcb8ee64cbc4a5e04cae6775b4f9babd;hp=74e37902db0056d5599fa57dd4da4a72678451ea;hpb=c9e313bc594f40a86eed237dce222c0fc99c957f;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/notification-thread.cpp b/src/bin/lttng-sessiond/notification-thread.cpp
index 74e37902d..7d9f4ed12 100644
--- a/src/bin/lttng-sessiond/notification-thread.cpp
+++ b/src/bin/lttng-sessiond/notification-thread.cpp
@@ -18,6 +18,7 @@
 #include <common/align.hpp>
 #include <common/time.hpp>
 #include <sys/stat.h>
+#include <sys/eventfd.h>
 #include <time.h>
 #include <signal.h>
 
@@ -59,8 +60,11 @@ void notification_thread_handle_destroy(
 	pthread_mutex_destroy(&handle->cmd_queue.lock);
 	sem_destroy(&handle->ready);
 
-	if (handle->cmd_queue.event_pipe) {
-		lttng_pipe_destroy(handle->cmd_queue.event_pipe);
+	if (handle->cmd_queue.event_fd >= 0) {
+		ret = close(handle->cmd_queue.event_fd);
+		if (ret < 0) {
+			PERROR("Failed to close notification command queue event fd");
+		}
 	}
 	if (handle->channel_monitoring_pipes.ust32_consumer >= 0) {
 		ret = close(handle->channel_monitoring_pipes.ust32_consumer);
@@ -92,23 +96,22 @@ struct notification_thread_handle *notification_thread_handle_create(
 {
 	int ret;
 	struct notification_thread_handle *handle;
-	struct lttng_pipe *event_pipe = NULL;
+	int event_fd = -1;
 
-	handle = (notification_thread_handle *) zmalloc(sizeof(*handle));
+	handle = zmalloc<notification_thread_handle>();
 	if (!handle) {
 		goto end;
 	}
 
 	sem_init(&handle->ready, 0, 0);
 
-	event_pipe = lttng_pipe_open(FD_CLOEXEC);
-	if (!event_pipe) {
-		ERR("event_pipe creation");
+	event_fd =  eventfd(0, EFD_CLOEXEC | EFD_SEMAPHORE);
+	if (event_fd < 0) {
+		PERROR("event_fd creation");
 		goto error;
 	}
 
-	handle->cmd_queue.event_pipe = event_pipe;
-	event_pipe = NULL;
+	handle->cmd_queue.event_fd = event_fd;
 
 	CDS_INIT_LIST_HEAD(&handle->cmd_queue.list);
 	ret = pthread_mutex_init(&handle->cmd_queue.lock, NULL);
@@ -150,7 +153,6 @@ struct notification_thread_handle *notification_thread_handle_create(
 end:
 	return handle;
 error:
-	lttng_pipe_destroy(event_pipe);
 	notification_thread_handle_destroy(handle);
 	return NULL;
 }
@@ -162,7 +164,7 @@ char *get_notification_channel_sock_path(void)
 	bool is_root = !getuid();
 	char *sock_path;
 
-	sock_path = (char *) zmalloc(LTTNG_PATH_MAX);
+	sock_path = calloc<char>(LTTNG_PATH_MAX);
 	if (!sock_path) {
 		goto error;
 	}
@@ -296,7 +298,7 @@ int init_poll_set(struct lttng_poll_event *poll_set,
 		ERR("Failed to add notification channel socket to pollset");
 		goto error;
 	}
-	ret = lttng_poll_add(poll_set, lttng_pipe_get_readfd(handle->cmd_queue.event_pipe),
+	ret = lttng_poll_add(poll_set, handle->cmd_queue.event_fd,
 			LPOLLIN | LPOLLERR);
 	if (ret < 0) {
 		ERR("Failed to add notification command queue event fd to pollset");
@@ -711,7 +713,7 @@ void *thread_notification(void *data)
 					ERR("Unexpected poll events %u for notification socket %i", revents, fd);
 					goto error;
 				}
-			} else if (fd == lttng_pipe_get_readfd(handle->cmd_queue.event_pipe)) {
+			} else if (fd == handle->cmd_queue.event_fd) {
 				ret = handle_notification_thread_command(handle,
 						&state);
 				if (ret < 0) {