X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=src%2Fcommon%2Fcompat%2Fcompat-poll.c;h=7d4d0e1334ef1dc2abba28f9e694d2ce8052d1ea;hb=dd0ab7509addfa62db59e255ea8fdd884505367d;hp=e4f1a3fed47c296c99feb980aa35d8615dcf667f;hpb=890d8fe47755c3bad936389cf48ffa141cff41c9;p=lttng-tools.git

diff --git a/src/common/compat/compat-poll.c b/src/common/compat/compat-poll.c
index e4f1a3fed..7d4d0e133 100644
--- a/src/common/compat/compat-poll.c
+++ b/src/common/compat/compat-poll.c
@@ -111,8 +111,9 @@ int compat_poll_create(struct lttng_poll_event *events, int size)
 	}
 
 	if (!poll_max_size) {
-		ERR("poll_max_size not initialized yet");
-		goto error;
+		if (lttng_poll_set_max_size()) {
+			goto error;
+		}
 	}
 
 	/* Don't bust the limit here */
@@ -268,7 +269,9 @@ int compat_poll_wait(struct lttng_poll_event *events, int timeout)
 		}
 	}
 
-	ret = poll(events->wait.events, events->wait.nb_fd, timeout);
+	do {
+		ret = poll(events->wait.events, events->wait.nb_fd, timeout);
+	} while (ret == -1 && errno == EINTR);
 	if (ret < 0) {
 		/* At this point, every error is fatal */
 		PERROR("poll wait");