X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fmanage-consumer.c;h=fa802adc91e33cd7e3ba92edfc1546a5f50b9016;hp=47bfe521cf96056b2ffd7dd111afda69efb0b7e5;hb=ea6bf30f3684cf71633cb9f2c70ea0bc22b664c4;hpb=4ec029ed8d032ac98d8dc158a751841b7c150639

diff --git a/src/bin/lttng-sessiond/manage-consumer.c b/src/bin/lttng-sessiond/manage-consumer.c
index 47bfe521c..fa802adc9 100644
--- a/src/bin/lttng-sessiond/manage-consumer.c
+++ b/src/bin/lttng-sessiond/manage-consumer.c
@@ -134,11 +134,6 @@ void *thread_consumer_management(void *data)
 
 		health_code_update();
 
-		if (!revents) {
-			/* No activity for this FD (poll implementation). */
-			continue;
-		}
-
 		/* Thread quit pipe has been closed. Killing thread. */
 		if (pollfd == quit_pipe_read_fd) {
 			err = 0;
@@ -298,11 +293,6 @@ void *thread_consumer_management(void *data)
 
 			health_code_update();
 
-			if (!revents) {
-				/* No activity for this FD (poll implementation). */
-				continue;
-			}
-
 			/*
 			 * Thread quit pipe has been triggered, flag that we should stop
 			 * but continue the current loop to handle potential data from
@@ -447,13 +437,13 @@ bool launch_consumer_management_thread(struct consumer_data *consumer_data)
 	struct thread_notifiers *notifiers = NULL;
 	struct lttng_thread *thread;
 
-	quit_pipe = lttng_pipe_open(FD_CLOEXEC);
-	if (!quit_pipe) {
-		goto error;
-	}
-
 	notifiers = zmalloc(sizeof(*notifiers));
 	if (!notifiers) {
+		goto error_alloc;
+	}
+
+	quit_pipe = lttng_pipe_open(FD_CLOEXEC);
+	if (!quit_pipe) {
 		goto error;
 	}
 	notifiers->quit_pipe = quit_pipe;
@@ -471,10 +461,11 @@ bool launch_consumer_management_thread(struct consumer_data *consumer_data)
 	wait_until_thread_is_ready(notifiers);
 	lttng_thread_put(thread);
 	if (notifiers->initialization_result) {
-		goto error;
+		return false;
 	}
 	return true;
 error:
 	cleanup_consumer_management_thread(notifiers);
+error_alloc:
 	return false;
 }