X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fcompat%2Fcompat-poll.c;h=4ea23c17318e1439f36a94b134194d13b070e4de;hb=9f32e9bf43a6438c55f35d3c5ed1c378d0c715c4;hp=0220b27854ab776294404c6c80e9a5608bfdeb54;hpb=22a7367148c238daf481e8e6756cdb76a73fd3a0;p=lttng-tools.git

diff --git a/src/common/compat/compat-poll.c b/src/common/compat/compat-poll.c
index 0220b2785..4ea23c173 100644
--- a/src/common/compat/compat-poll.c
+++ b/src/common/compat/compat-poll.c
@@ -291,7 +291,8 @@ error:
 /*
  * Wait on poll() with timeout. Blocking call.
  */
-int compat_poll_wait(struct lttng_poll_event *events, int timeout)
+int compat_poll_wait(struct lttng_poll_event *events, int timeout,
+		bool interruptible)
 {
 	int ret, active_fd_count;
 	int idle_pfd_index = 0;
@@ -320,10 +321,11 @@ int compat_poll_wait(struct lttng_poll_event *events, int timeout)
 
 	do {
 		ret = poll(events->wait.events, events->wait.nb_fd, timeout);
-	} while (ret == -1 && errno == EINTR);
+	} while (!interruptible && ret == -1 && errno == EINTR);
 	if (ret < 0) {
-		/* At this point, every error is fatal */
-		PERROR("poll wait");
+		if (errno != EINTR) {
+			PERROR("poll wait");
+		}
 		goto error;
 	}
 
@@ -350,7 +352,7 @@ int compat_poll_wait(struct lttng_poll_event *events, int timeout)
 		struct pollfd *idle_pfd = &events->wait.events[idle_pfd_index];
 		struct pollfd *current_pfd = &events->wait.events[i];
 
-		if (ipfd->revents != 0) {
+		if (idle_pfd->revents != 0) {
 			swap_pfd = *current_pfd;
 			*current_pfd = *idle_pfd;
 			*idle_pfd = swap_pfd;