From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Wed, 11 Apr 2012 22:15:24 +0000 (-0400)
Subject: Fix: consumer fd recv poll should be sensitive to POLLPRI too
X-Git-Tag: v2.1.0-rc1~149
X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=commitdiff_plain;h=509bb1cf6c7fc3de758b0a58d3610a653235788b

Fix: consumer fd recv poll should be sensitive to POLLPRI too

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
---

diff --git a/src/common/consumer.c b/src/common/consumer.c
index 74a9b0ad2..2604f3d06 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;
 	}
@@ -1018,7 +1018,7 @@ 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)) {
 			DBG("consumer_poll_pipe wake up");
 			tmp2 = read(ctx->consumer_poll_pipe[0], &tmp, 1);
 			if (tmp2 < 0) {