X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=src%2Fcommon%2Fconsumer.c;h=024ee17853c03c053dfa0ae4382a7e3763346b1f;hb=3fa5d621da48eaeedaa1bc49fcf093d1c9b0d196;hp=74a9b0ad2095216f8d11b6836a91305dba795300;hpb=3654a23ff4d32ecb2b70142dcfd0328df2fe73fb;p=lttng-tools.git

diff --git a/src/common/consumer.c b/src/common/consumer.c
index 74a9b0ad2..024ee1785 100644
--- a/src/common/consumer.c
+++ b/src/common/consumer.c
@@ -538,7 +538,7 @@ int consumer_update_poll_array(
 	 * increment i so nb_fd is the number of real FD.
 	 */
 	(*pollfd)[i].fd = ctx->consumer_poll_pipe[0];
-	(*pollfd)[i].events = POLLIN;
+	(*pollfd)[i].events = POLLIN | POLLPRI;
 	return i;
 }
 
@@ -562,7 +562,7 @@ restart:
 		perror("Poll error");
 		goto exit;
 	}
-	if (consumer_sockpoll[0].revents & POLLIN) {
+	if (consumer_sockpoll[0].revents & (POLLIN | POLLPRI)) {
 		DBG("consumer_should_quit wake up");
 		goto exit;
 	}
@@ -636,6 +636,9 @@ void lttng_consumer_cleanup(void)
 	}
 
 	rcu_read_unlock();
+
+	lttng_ht_destroy(consumer_data.stream_ht);
+	lttng_ht_destroy(consumer_data.channel_ht);
 }
 
 /*
@@ -736,6 +739,20 @@ struct lttng_consumer_local_data *lttng_consumer_create(
 		goto error_poll_pipe;
 	}
 
+	/* set read end of the pipe to non-blocking */
+	ret = fcntl(ctx->consumer_poll_pipe[0], F_SETFL, O_NONBLOCK);
+	if (ret < 0) {
+		perror("fcntl O_NONBLOCK");
+		goto error_poll_fcntl;
+	}
+
+	/* set write end of the pipe to non-blocking */
+	ret = fcntl(ctx->consumer_poll_pipe[1], F_SETFL, O_NONBLOCK);
+	if (ret < 0) {
+		perror("fcntl O_NONBLOCK");
+		goto error_poll_fcntl;
+	}
+
 	ret = pipe(ctx->consumer_should_quit);
 	if (ret < 0) {
 		perror("Error creating recv pipe");
@@ -760,6 +777,7 @@ error_thread_pipe:
 			PERROR("close");
 		}
 	}
+error_poll_fcntl:
 error_quit_pipe:
 	for (i = 0; i < 2; i++) {
 		int err;
@@ -933,8 +951,6 @@ void *lttng_consumer_thread_poll_fds(void *data)
 	struct lttng_consumer_stream **local_stream = NULL;
 	/* local view of consumer_data.fds_count */
 	int nb_fd = 0;
-	char tmp;
-	int tmp2;
 	struct lttng_consumer_local_data *ctx = data;
 
 	rcu_register_thread();
@@ -1018,12 +1034,15 @@ void *lttng_consumer_thread_poll_fds(void *data)
 		 * array. We want to prioritize array update over
 		 * low-priority reads.
 		 */
-		if (pollfd[nb_fd].revents & POLLIN) {
+		if (pollfd[nb_fd].revents & (POLLIN | POLLPRI)) {
+			size_t pipe_readlen;
+			char tmp;
+
 			DBG("consumer_poll_pipe wake up");
-			tmp2 = read(ctx->consumer_poll_pipe[0], &tmp, 1);
-			if (tmp2 < 0) {
-				perror("read consumer poll");
-			}
+			/* Consume 1 byte of pipe data */
+			do {
+				pipe_readlen = read(ctx->consumer_poll_pipe[0], &tmp, 1);
+			} while (pipe_readlen == -1 && errno == EINTR);
 			continue;
 		}
 
@@ -1202,8 +1221,12 @@ void *lttng_consumer_thread_receive_fds(void *data)
 			DBG("Received STOP command");
 			goto end;
 		}
-		if (ret < 0) {
-			ERR("Communication interrupted on command socket");
+		if (ret <= 0) {
+			/*
+			 * This could simply be a session daemon quitting. Don't output
+			 * ERR() here.
+			 */
+			DBG("Communication interrupted on command socket");
 			goto end;
 		}
 		if (consumer_quit) {
@@ -1228,11 +1251,20 @@ end:
 	 */
 	consumer_poll_timeout = LTTNG_CONSUMER_POLL_TIMEOUT;
 
-	/* wake up the polling thread */
-	ret = write(ctx->consumer_poll_pipe[1], "4", 1);
-	if (ret < 0) {
-		perror("poll pipe write");
-	}
+	/*
+	 * Wake-up the other end by writing a null byte in the pipe
+	 * (non-blocking). Important note: Because writing into the
+	 * pipe is non-blocking (and therefore we allow dropping wakeup
+	 * data, as long as there is wakeup data present in the pipe
+	 * buffer to wake up the other end), the other end should
+	 * perform the following sequence for waiting:
+	 * 1) empty the pipe (reads).
+	 * 2) perform update operation.
+	 * 3) wait on the pipe (poll).
+	 */
+	do {
+		ret = write(ctx->consumer_poll_pipe[1], "", 1);
+	} while (ret == -1UL && errno == EINTR);
 	rcu_unregister_thread();
 	return NULL;
 }