X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-relayd%2Flive.c;h=bfa7b85259ad7d3d2a75fdba5dfb416feccfe13c;hb=0b242f6253f75bd4a2d138fba3c34a22653ab3bd;hp=19322f4a07bd718feba6d95167715da2d3612e62;hpb=3fd2739803ea7273c6483060ac042942af06b1d4;p=lttng-tools.git

diff --git a/src/bin/lttng-relayd/live.c b/src/bin/lttng-relayd/live.c
index 19322f4a0..bfa7b8525 100644
--- a/src/bin/lttng-relayd/live.c
+++ b/src/bin/lttng-relayd/live.c
@@ -60,12 +60,6 @@
 
 static struct lttng_uri *live_uri;
 
-/*
- * Quit pipe for all threads. This permits a single cancellation point
- * for all threads when receiving an event on the pipe.
- */
-static int live_thread_quit_pipe[2] = { -1, -1 };
-
 /*
  * This pipe is used to inform the worker thread that a command is queued and
  * ready to be processed.
@@ -126,7 +120,7 @@ void stop_threads(void)
 
 	/* Stopping all threads */
 	DBG("Terminating all live threads");
-	ret = notify_thread_pipe(live_thread_quit_pipe[1]);
+	ret = notify_thread_pipe(thread_quit_pipe[1]);
 	if (ret < 0) {
 		ERR("write error on thread quit pipe");
 	}
@@ -155,7 +149,7 @@ int create_thread_poll_set(struct lttng_poll_event *events, int size)
 	}
 
 	/* Add quit pipe */
-	ret = lttng_poll_add(events, live_thread_quit_pipe[0], LPOLLIN);
+	ret = lttng_poll_add(events, thread_quit_pipe[0], LPOLLIN | LPOLLERR);
 	if (ret < 0) {
 		goto error;
 	}
@@ -174,7 +168,7 @@ error:
 static
 int check_thread_quit_pipe(int fd, uint32_t events)
 {
-	if (fd == live_thread_quit_pipe[0] && (events & LPOLLIN)) {
+	if (fd == thread_quit_pipe[0] && (events & LPOLLIN)) {
 		return 1;
 	}
 
@@ -245,9 +239,7 @@ void *thread_listener(void *data)
 		goto error_sock_control;
 	}
 
-	/*
-	 * Pass 3 as size here for the thread quit pipe, control and data socket.
-	 */
+	/* Pass 2 as size here for the thread quit pipe and control sockets. */
 	ret = create_thread_poll_set(&events, 2);
 	if (ret < 0) {
 		goto error_create_poll;
@@ -2046,7 +2038,7 @@ error:
  * main
  */
 int live_start_threads(struct lttng_uri *uri,
-		struct relay_local_data *relay_ctx, int quit_pipe[2])
+		struct relay_local_data *relay_ctx)
 {
 	int ret = 0;
 	void *status;
@@ -2055,9 +2047,6 @@ int live_start_threads(struct lttng_uri *uri,
 	assert(uri);
 	live_uri = uri;
 
-	live_thread_quit_pipe[0] = quit_pipe[0];
-	live_thread_quit_pipe[1] = quit_pipe[1];
-
 	/* Check if daemon is UID = 0 */
 	is_root = !getuid();