X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fnotify-apps.cpp;h=1b83491d14b920686898a77a0f249bda42223520;hb=8a00688e1d58cc5a2e77eba206ff23bd6105130c;hp=1fff92d071ba01f1f70aac518493194c791485e0;hpb=6b979fc6dd8c03ed8332bdef2915b9d6d3ecfd6a;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/notify-apps.cpp b/src/bin/lttng-sessiond/notify-apps.cpp
index 1fff92d07..1b83491d1 100644
--- a/src/bin/lttng-sessiond/notify-apps.cpp
+++ b/src/bin/lttng-sessiond/notify-apps.cpp
@@ -30,12 +30,12 @@ struct thread_notifiers {
  */
 static void *thread_application_notification(void *data)
 {
-	int i, ret, pollfd, err = -1;
+	int i, ret, err = -1;
 	ssize_t size_ret;
-	uint32_t revents, nb_fd;
+	uint32_t nb_fd;
 	struct lttng_poll_event events;
 	struct thread_notifiers *notifiers = (thread_notifiers *) data;
-	const int quit_pipe_read_fd = lttng_pipe_get_readfd(notifiers->quit_pipe);
+	const auto thread_quit_pipe_fd = lttng_pipe_get_readfd(notifiers->quit_pipe);
 
 	DBG("[ust-thread] Manage application notify command");
 
@@ -63,7 +63,7 @@ static void *thread_application_notification(void *data)
 		goto error;
 	}
 
-	ret = lttng_poll_add(&events, quit_pipe_read_fd,
+	ret = lttng_poll_add(&events, thread_quit_pipe_fd,
 			LPOLLIN | LPOLLERR);
 	if (ret < 0) {
 		goto error;
@@ -97,14 +97,17 @@ restart:
 			health_code_update();
 
 			/* Fetch once the poll data */
-			revents = LTTNG_POLL_GETEV(&events, i);
-			pollfd = LTTNG_POLL_GETFD(&events, i);
+			const auto revents = LTTNG_POLL_GETEV(&events, i);
+			const auto pollfd = LTTNG_POLL_GETFD(&events, i);
 
-			/* Thread quit pipe has been closed. Killing thread. */
-			if (pollfd == quit_pipe_read_fd) {
+			/* Activity on thread quit pipe, exiting. */
+			if (pollfd == thread_quit_pipe_fd) {
+				DBG("Activity on thread quit pipe");
 				err = 0;
 				goto exit;
-			} else if (pollfd == notifiers->apps_cmd_notify_pipe_read_fd) {
+			}
+
+			if (pollfd == notifiers->apps_cmd_notify_pipe_read_fd) {
 				/* Inspect the apps cmd pipe */
 				int sock;