X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fconsumer.c;h=0df073523e5361e09050c7b8dcd8f47bfdd09e2a;hp=16521a8b863788fd957b756d7c4882f6b3c5abbd;hb=0d9c5d7750202aa5f46cd7c6f642fb31fe1556c4;hpb=9ddba5259d1cb5f9f5ef03ea1e3276082c7e6b80

diff --git a/src/common/consumer.c b/src/common/consumer.c
index 16521a8b8..0df073523 100644
--- a/src/common/consumer.c
+++ b/src/common/consumer.c
@@ -2101,17 +2101,13 @@ void *consumer_thread_metadata_poll(void *data)
 	DBG("Metadata main loop started");
 
 	while (1) {
-		lttng_poll_reset(&events);
-
-		nb_fd = LTTNG_POLL_GETNB(&events);
-
 		/* Only the metadata pipe is set */
-		if (nb_fd == 0 && consumer_quit == 1) {
+		if (events.nb_fd == 0 && consumer_quit == 1) {
 			goto end;
 		}
 
 restart:
-		DBG("Metadata poll wait with %d fd(s)", nb_fd);
+		DBG("Metadata poll wait with %d fd(s)", events.nb_fd);
 		ret = lttng_poll_wait(&events, -1);
 		DBG("Metadata event catched in thread");
 		if (ret < 0) {
@@ -2122,6 +2118,8 @@ restart:
 			goto error;
 		}
 
+		nb_fd = ret;
+
 		/* From here, the event is a metadata wait fd */
 		for (i = 0; i < nb_fd; i++) {
 			revents = LTTNG_POLL_GETEV(&events, i);