X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fcommon%2Fconsumer.c;h=1de9cbadbd053749baa81d1a800975dd2bb22a8b;hb=bdd88757eedddd53dea46645574f218094573c74;hp=16521a8b863788fd957b756d7c4882f6b3c5abbd;hpb=8fa0b55b4931b9b5294120b20259be73b0b87ad5;p=lttng-tools.git

diff --git a/src/common/consumer.c b/src/common/consumer.c
index 16521a8b8..1de9cbadb 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);
@@ -3030,10 +3028,12 @@ int consumer_data_pending(uint64_t id)
 		ret = relayd_end_data_pending(&relayd->control_sock,
 				relayd->relayd_session_id, &is_data_inflight);
 		pthread_mutex_unlock(&relayd->ctrl_sock_mutex);
-		if (ret < 0 || !is_data_inflight) {
-			/* On error or if NO data inflight, no data is pending. */
+		if (ret < 0) {
 			goto data_not_pending;
 		}
+		if (is_data_inflight) {
+			goto data_pending;
+		}
 	}
 
 	/*