X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fagent-thread.c;h=3a46c0fb914058d834b3693e1bf078416b515781;hb=fc58be13f62e691645dd75d56ce26d2e121b13e0;hp=d1bb122c171d9158b343f504497e5fba2fe64382;hpb=6a4e403927ffef4cae8726064dcf53c463eb128c;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/agent-thread.c b/src/bin/lttng-sessiond/agent-thread.c
index d1bb122c1..3a46c0fb9 100644
--- a/src/bin/lttng-sessiond/agent-thread.c
+++ b/src/bin/lttng-sessiond/agent-thread.c
@@ -15,7 +15,6 @@
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#define _GNU_SOURCE
 #define _LGPL_SOURCE
 #include <assert.h>
 
@@ -89,8 +88,8 @@ static struct lttcomm_sock *init_tcp_socket(void)
 	 */
 	ret = uri_parse(default_reg_uri, &uri);
 	assert(ret);
-	assert(agent_tcp_port);
-	uri->port = agent_tcp_port;
+	assert(config.agent_tcp_port);
+	uri->port = config.agent_tcp_port;
 
 	sock = lttcomm_alloc_sock_from_uri(uri);
 	uri_free(uri);
@@ -117,7 +116,7 @@ static struct lttcomm_sock *init_tcp_socket(void)
 	}
 
 	DBG("[agent-thread] Listening on TCP port %u and socket %d",
-			agent_tcp_port, sock->fd);
+			config.agent_tcp_port, sock->fd);
 
 	return sock;
 
@@ -135,7 +134,7 @@ static void destroy_tcp_socket(struct lttcomm_sock *sock)
 {
 	assert(sock);
 
-	DBG3("[agent-thread] Destroy TCP socket on port %u", agent_tcp_port);
+	DBG3("[agent-thread] Destroy TCP socket on port %u", config.agent_tcp_port);
 
 	/* This will return gracefully if fd is invalid. */
 	sock->ops->close(sock);
@@ -253,7 +252,7 @@ void *agent_thread_manage_registration(void *data)
 		goto error_tcp_socket;
 	}
 
-	/* Add create valid TCP socket to poll set. */
+	/* Add TCP socket to poll set. */
 	ret = lttng_poll_add(&events, reg_sock->fd,
 			LPOLLIN | LPOLLERR | LPOLLHUP | LPOLLRDHUP);
 	if (ret < 0) {
@@ -296,35 +295,22 @@ restart:
 				goto exit;
 			}
 
-			/*
-			 * Check first if this is a POLLERR since POLLIN is also included
-			 * in an error value thus checking first.
-			 */
-			if (revents & (LPOLLERR | LPOLLHUP | LPOLLRDHUP)) {
-				/* Removing from the poll set */
-				ret = lttng_poll_del(&events, pollfd);
-				if (ret < 0) {
-					goto error;
-				}
-
-				agent_destroy_app_by_sock(pollfd);
-			} else if (revents & (LPOLLIN)) {
+			if (revents & LPOLLIN) {
 				int new_fd;
 				struct agent_app *app = NULL;
 
-				/* Pollin event of agent app socket should NEVER happen. */
 				assert(pollfd == reg_sock->fd);
-
 				new_fd = handle_registration(reg_sock, &app);
 				if (new_fd < 0) {
-					WARN("[agent-thread] agent registration failed. Ignoring.");
-					/* Somehow the communication failed. Just continue. */
 					continue;
 				}
 				/* Should not have a NULL app on success. */
 				assert(app);
 
-				/* Only add poll error event to only detect shutdown. */
+				/*
+				 * Since this is a command socket (write then read),
+				 * only add poll error event to only detect shutdown.
+				 */
 				ret = lttng_poll_add(&events, new_fd,
 						LPOLLERR | LPOLLHUP | LPOLLRDHUP);
 				if (ret < 0) {
@@ -336,10 +322,26 @@ restart:
 				update_agent_app(app);
 
 				/* On failure, the poll will detect it and clean it up. */
-				(void) agent_send_registration_done(app);
+				ret = agent_send_registration_done(app);
+				if (ret < 0) {
+					/* Removing from the poll set */
+					ret = lttng_poll_del(&events, new_fd);
+					if (ret < 0) {
+						goto error;
+					}
+					agent_destroy_app_by_sock(new_fd);
+					continue;
+				}
+			} else if (revents & (LPOLLERR | LPOLLHUP | LPOLLRDHUP)) {
+				/* Removing from the poll set */
+				ret = lttng_poll_del(&events, pollfd);
+				if (ret < 0) {
+					goto error;
+				}
+				agent_destroy_app_by_sock(pollfd);
 			} else {
-				ERR("Unknown poll events %u for sock %d", revents, pollfd);
-				continue;
+				ERR("Unexpected poll events %u for sock %d", revents, pollfd);
+				goto error;
 			}
 		}
 	}