X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fagent-thread.cpp;h=e54a7cecf6f450ec1e1594b42e9edb2e01a45b8b;hb=1524f98c04431d04e50796f83a9dd29184b3a8a4;hp=c8fab6164f0c68b05b9545aab7abe25bbb192749;hpb=f149493493fbd8a3efa4748832c03278c96c38ca;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/agent-thread.cpp b/src/bin/lttng-sessiond/agent-thread.cpp
index c8fab6164..e54a7cecf 100644
--- a/src/bin/lttng-sessiond/agent-thread.cpp
+++ b/src/bin/lttng-sessiond/agent-thread.cpp
@@ -355,12 +355,12 @@ void wait_until_thread_is_ready(struct thread_notifiers *notifiers)
  */
 static void *thread_agent_management(void *data)
 {
-	int i, ret, pollfd;
-	uint32_t revents, nb_fd;
+	int i, ret;
+	uint32_t nb_fd;
 	struct lttng_poll_event events;
 	struct lttcomm_sock *reg_sock;
 	struct thread_notifiers *notifiers = (thread_notifiers *) data;
-	const int quit_pipe_read_fd = lttng_pipe_get_readfd(
+	const auto thread_quit_pipe_fd = lttng_pipe_get_readfd(
 			notifiers->quit_pipe);
 
 	DBG("Manage agent application registration.");
@@ -377,8 +377,7 @@ static void *thread_agent_management(void *data)
 		goto error_poll_create;
 	}
 
-	ret = lttng_poll_add(&events, quit_pipe_read_fd,
-			LPOLLIN | LPOLLERR);
+	ret = lttng_poll_add(&events, thread_quit_pipe_fd, LPOLLIN);
 	if (ret < 0) {
 		goto error_tcp_socket;
 	}
@@ -411,8 +410,7 @@ static void *thread_agent_management(void *data)
 	mark_thread_as_ready(notifiers);
 
 	/* Add TCP socket to the poll set. */
-	ret = lttng_poll_add(&events, reg_sock->fd,
-			LPOLLIN | LPOLLERR | LPOLLHUP | LPOLLRDHUP);
+	ret = lttng_poll_add(&events, reg_sock->fd, LPOLLIN | LPOLLRDHUP);
 	if (ret < 0) {
 		goto error;
 	}
@@ -439,11 +437,12 @@ restart:
 
 		for (i = 0; i < nb_fd; i++) {
 			/* 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");
 				goto exit;
 			}
 
@@ -483,8 +482,7 @@ restart:
 				 * read), only add poll error event to only
 				 * detect shutdown.
 				 */
-				ret = lttng_poll_add(&events, new_app_socket_fd,
-						LPOLLERR | LPOLLHUP | LPOLLRDHUP);
+				ret = lttng_poll_add(&events, new_app_socket_fd, LPOLLRDHUP);
 				if (ret < 0) {
 					agent_destroy_app(new_app);
 					continue;