X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-relayd%2Flive.c;h=756efbedef8434c7126148a7fbdb09e28c57e1e5;hp=fd570e0fc4bd801ebe065e5fd32b2f1c7780323f;hb=fd20dac985126e84929d657f5a1042222c7d5017;hpb=dbe23f452a025e8f42bdbb41e30a4a6257aa821c

diff --git a/src/bin/lttng-relayd/live.c b/src/bin/lttng-relayd/live.c
index fd570e0fc..756efbede 100644
--- a/src/bin/lttng-relayd/live.c
+++ b/src/bin/lttng-relayd/live.c
@@ -488,6 +488,11 @@ restart:
 			revents = LTTNG_POLL_GETEV(&events, i);
 			pollfd = LTTNG_POLL_GETFD(&events, i);
 
+			if (!revents) {
+				/* No activity for this FD (poll implementation). */
+				continue;
+			}
+
 			/* Thread quit pipe has been closed. Killing thread. */
 			ret = check_thread_quit_pipe(pollfd, revents);
 			if (ret) {
@@ -1922,6 +1927,11 @@ restart:
 
 			health_code_update();
 
+			if (!revents) {
+				/* No activity for this FD (poll implementation). */
+				continue;
+			}
+
 			/* Thread quit pipe has been closed. Killing thread. */
 			ret = check_thread_quit_pipe(pollfd, revents);
 			if (ret) {