Imported Upstream version 2.78.4upstream

1 files changed, 10 insertions, 4 deletions

diff --git a/glib/gwakeup.c b/glib/gwakeup.c
index 24d85b669..6ce401e52 100644
--- a/glib/gwakeup.c
+++ b/glib/gwakeup.c
@@ -160,7 +160,7 @@ g_wakeup_new (void)
   /* for any failure, try a pipe instead */
 #endif
 
-  if (!g_unix_open_pipe (wakeup->fds, FD_CLOEXEC, &error))
+  if (!g_unix_open_pipe (wakeup->fds, O_CLOEXEC | O_NONBLOCK, &error))
     g_error ("Creating pipes for GWakeup: %s", error->message);
 
   if (!g_unix_set_fd_nonblocking (wakeup->fds[0], TRUE, &error) ||
@@ -207,19 +207,25 @@ g_wakeup_get_pollfd (GWakeup *wakeup,
 void
 g_wakeup_acknowledge (GWakeup *wakeup)
 {
-  /* read until it is empty */
+  int res;
 
   if (wakeup->fds[1] == -1)
     {
       uint64_t value;
 
-      while (read (wakeup->fds[0], &value, sizeof (value)) == sizeof (value));
+      /* eventfd() read resets counter */
+      do
+        res = read (wakeup->fds[0], &value, sizeof (value));
+      while (G_UNLIKELY (res == -1 && errno == EINTR));
     }
   else
     {
       uint8_t value;
 
-      while (read (wakeup->fds[0], &value, sizeof (value)) == sizeof (value));
+      /* read until it is empty */
+      do
+        res = read (wakeup->fds[0], &value, sizeof (value));
+      while (res == sizeof (value) || G_UNLIKELY (res == -1 && errno == EINTR));
     }
 }