X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-relayd%2Flive.c;h=0cf2665161251a71ce1351e76c5f997598c5251d;hp=a1fbbbe566fde08576e78d7ebefeb07503ad9d7e;hb=0c82ac624169ec9ec062f395e55abfe992d0fd91;hpb=d812ecb94c72ebe8fd5640de53a628cfa9f5b3e8

diff --git a/src/bin/lttng-relayd/live.c b/src/bin/lttng-relayd/live.c
index a1fbbbe56..0cf266516 100644
--- a/src/bin/lttng-relayd/live.c
+++ b/src/bin/lttng-relayd/live.c
@@ -17,7 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#define _GNU_SOURCE
 #define _LGPL_SOURCE
 #include <getopt.h>
 #include <grp.h>
@@ -40,7 +39,6 @@
 #include <urcu/rculist.h>
 #include <unistd.h>
 #include <fcntl.h>
-#include <config.h>
 
 #include <lttng/lttng.h>
 #include <common/common.h>
@@ -542,10 +540,7 @@ restart:
 				goto exit;
 			}
 
-			if (revents & (LPOLLERR | LPOLLHUP | LPOLLRDHUP)) {
-				ERR("socket poll error");
-				goto error;
-			} else if (revents & LPOLLIN) {
+			if (revents & LPOLLIN) {
 				/*
 				 * A new connection is requested, therefore a
 				 * viewer connection is allocated in this
@@ -588,6 +583,12 @@ restart:
 				 * exchange in cds_wfcq_enqueue.
 				 */
 				futex_nto1_wake(&viewer_conn_queue.futex);
+			} else if (revents & (LPOLLERR | LPOLLHUP | LPOLLRDHUP)) {
+				ERR("socket poll error");
+				goto error;
+			} else {
+				ERR("Unexpected poll events %u for sock %d", revents, pollfd);
+				goto error;
 			}
 		}
 	}
@@ -1908,10 +1909,7 @@ restart:
 
 			/* Inspect the relay conn pipe for new connection. */
 			if (pollfd == live_conn_pipe[0]) {
-				if (revents & (LPOLLERR | LPOLLHUP | LPOLLRDHUP)) {
-					ERR("Relay live pipe error");
-					goto error;
-				} else if (revents & LPOLLIN) {
+				if (revents & LPOLLIN) {
 					struct relay_connection *conn;
 
 					ret = lttng_read(live_conn_pipe[0],
@@ -1923,6 +1921,12 @@ restart:
 							LPOLLIN | LPOLLRDHUP);
 					connection_ht_add(viewer_connections_ht, conn);
 					DBG("Connection socket %d added to poll", conn->sock->fd);
+				} else if (revents & (LPOLLERR | LPOLLHUP | LPOLLRDHUP)) {
+					ERR("Relay live pipe error");
+					goto error;
+				} else {
+					ERR("Unexpected poll events %u for sock %d", revents, pollfd);
+					goto error;
 				}
 			} else {
 				/* Connection activity. */
@@ -1933,11 +1937,7 @@ restart:
 					continue;
 				}
 
-				if (revents & (LPOLLERR | LPOLLHUP | LPOLLRDHUP)) {
-					cleanup_connection_pollfd(&events, pollfd);
-					/* Put "create" ownership reference. */
-					connection_put(conn);
-				} else if (revents & LPOLLIN) {
+				if (revents & LPOLLIN) {
 					ret = conn->sock->ops->recvmsg(conn->sock, &recv_hdr,
 							sizeof(recv_hdr), 0);
 					if (ret <= 0) {
@@ -1956,6 +1956,14 @@ restart:
 							DBG("Viewer connection closed with %d", pollfd);
 						}
 					}
+				} else if (revents & (LPOLLERR | LPOLLHUP | LPOLLRDHUP)) {
+					cleanup_connection_pollfd(&events, pollfd);
+					/* Put "create" ownership reference. */
+					connection_put(conn);
+				} else {
+					ERR("Unexpected poll events %u for sock %d", revents, pollfd);
+					connection_put(conn);
+					goto error;
 				}
 				/* Put local "get_by_sock" reference. */
 				connection_put(conn);