X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fconsumer.c;h=1af69ef93015c7e397c8028781dc3c97895c1790;hb=23f5f35da2bfb8e5162419bf84627714f920da2c;hp=0df073523e5361e09050c7b8dcd8f47bfdd09e2a;hpb=0d9c5d7750202aa5f46cd7c6f642fb31fe1556c4;p=lttng-tools.git

diff --git a/src/common/consumer.c b/src/common/consumer.c
index 0df073523..1af69ef93 100644
--- a/src/common/consumer.c
+++ b/src/common/consumer.c
@@ -2102,12 +2102,12 @@ void *consumer_thread_metadata_poll(void *data)
 
 	while (1) {
 		/* Only the metadata pipe is set */
-		if (events.nb_fd == 0 && consumer_quit == 1) {
+		if (LTTNG_POLL_GETNB(&events) == 0 && consumer_quit == 1) {
 			goto end;
 		}
 
 restart:
-		DBG("Metadata poll wait with %d fd(s)", events.nb_fd);
+		DBG("Metadata poll wait with %d fd(s)", LTTNG_POLL_GETNB(&events));
 		ret = lttng_poll_wait(&events, -1);
 		DBG("Metadata event catched in thread");
 		if (ret < 0) {
@@ -2364,6 +2364,11 @@ void *consumer_thread_data_poll(void *data)
 				pipe_readlen = read(ctx->consumer_data_pipe[0], &new_stream,
 						sizeof(new_stream));
 			} while (pipe_readlen == -1 && errno == EINTR);
+			if (pipe_readlen < 0) {
+				PERROR("read consumer data pipe");
+				/* Continue so we can at least handle the current stream(s). */
+				continue;
+			}
 
 			/*
 			 * If the stream is NULL, just ignore it. It's also possible that
@@ -3006,7 +3011,8 @@ int consumer_data_pending(uint64_t id)
 		if (relayd) {
 			pthread_mutex_lock(&relayd->ctrl_sock_mutex);
 			if (stream->metadata_flag) {
-				ret = relayd_quiescent_control(&relayd->control_sock);
+				ret = relayd_quiescent_control(&relayd->control_sock,
+						stream->relayd_stream_id);
 			} else {
 				ret = relayd_data_pending(&relayd->control_sock,
 						stream->relayd_stream_id, stream->next_net_seq_num);
@@ -3028,10 +3034,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;
+		}
 	}
 
 	/*