From c7e26c27c7e029e6670dfebc8f27d9295e9fdeb7 Mon Sep 17 00:00:00 2001
From: Jeremy Kerr <jk@ozlabs.org>
Date: Mon, 19 Aug 2013 11:58:23 +0800
Subject: lib/waiter: handle -EINTR

Now that we're handing non-fatal signals (i.e., SIGCHLD in the process
lib), we need to gracefully handle -EINTR from poll().

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
---
 lib/waiter/waiter.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'lib')

diff --git a/lib/waiter/waiter.c b/lib/waiter/waiter.c
index e201ad1..d684348 100644
--- a/lib/waiter/waiter.c
+++ b/lib/waiter/waiter.c
@@ -3,6 +3,7 @@
 #include <stdbool.h>
 #include <string.h>
 #include <assert.h>
+#include <errno.h>
 #include <sys/time.h>
 
 #include <talloc/talloc.h>
@@ -222,11 +223,13 @@ int waiter_poll(struct waitset *set)
 		timeout_ms = -1;
 	}
 
-
 	rc = poll(set->pollfds, set->n_io_waiters, timeout_ms);
 
-	if (rc < 0)
+	if (rc < 0) {
+		if (errno == EINTR)
+			rc = 0;
 		goto out;
+	}
 
 	for (i = 0; i < set->n_io_waiters; i++) {
 		struct waiter *waiter = set->io_waiters[i];
-- 
cgit v1.2.1