X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;ds=sidebyside;f=src%2Fcommon%2Fconsumer.c;h=59b0a1edeb867188ccafb6253bbb086749eb775f;hb=b5412c5f7b0b6853e7a0abdcf699fb7ca2b79ae5;hp=27dfe32b8592487e6c5e881604a650085240f536;hpb=e71ee39ac3355d38761d40ee377fe9a14c7c13a0;p=lttng-tools.git

diff --git a/src/common/consumer.c b/src/common/consumer.c
index 27dfe32b8..59b0a1ede 100644
--- a/src/common/consumer.c
+++ b/src/common/consumer.c
@@ -755,7 +755,7 @@ static int write_relayd_stream_header(struct lttng_consumer_stream *stream,
 		 * this next value, 1 should always be substracted in order to compare
 		 * the last seen sequence number on the relayd side to the last sent.
 		 */
-		data_hdr.net_seq_num = htobe64(stream->next_net_seq_num++);
+		data_hdr.net_seq_num = htobe64(stream->next_net_seq_num);
 		/* Other fields are zeroed previously */
 
 		ret = relayd_send_data_hdr(&relayd->data_sock, &data_hdr,
@@ -764,6 +764,8 @@ static int write_relayd_stream_header(struct lttng_consumer_stream *stream,
 			goto error;
 		}
 
+		++stream->next_net_seq_num;
+
 		/* Set to go on data socket */
 		outfd = relayd->data_sock.fd;
 	}
@@ -2155,7 +2157,7 @@ restart:
 					if (stream == NULL) {
 						/* Check for deleted streams. */
 						validate_endpoint_status_metadata_stream(&events);
-						continue;
+						goto restart;
 					}
 
 					DBG("Adding metadata stream %d to poll set",
@@ -2349,7 +2351,7 @@ void *consumer_thread_data_poll(void *data)
 		 * array update over low-priority reads.
 		 */
 		if (pollfd[nb_fd].revents & (POLLIN | POLLPRI)) {
-			size_t pipe_readlen;
+			ssize_t pipe_readlen;
 
 			DBG("consumer_data_pipe wake up");
 			/* Consume 1 byte of pipe data */