unix: Make a loop iteration if polling is interrupted by a signal

joyent · Dec 30, 2012 · 37ec473 · 37ec473
1 parent 546387f
commit 37ec473
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 28 deletions.
diff --git a/src/unix/kqueue.c b/src/unix/kqueue.c
@@ -150,14 +150,7 @@ void uv__io_poll(uv_loop_t* loop, int timeout) {
       if (errno != EINTR)
         abort();
 
-      if (timeout == 0)
-        return;
-
-      if (timeout == -1)
-        continue;
-
-      /* Interrupted by a signal. Update timeout and poll again. */
-      goto update_timeout;
+      return;
     }
 
     nevents = 0;
@@ -241,7 +234,6 @@ void uv__io_poll(uv_loop_t* loop, int timeout) {
     if (timeout == -1)
       continue;
 
-update_timeout:
     assert(timeout > 0);
 
     diff = uv_hrtime() / 1000000;

diff --git a/src/unix/linux/linux-core.c b/src/unix/linux/linux-core.c
@@ -191,14 +191,7 @@ void uv__io_poll(uv_loop_t* loop, int timeout) {
       if (errno != EINTR)
         abort();
 
-      if (timeout == -1)
-        continue;
-
-      if (timeout == 0)
-        return;
-
-      /* Interrupted by a signal. Update timeout and poll again. */
-      goto update_timeout;
+      return;
     }
 
     nevents = 0;
@@ -240,7 +233,6 @@ void uv__io_poll(uv_loop_t* loop, int timeout) {
     if (timeout == -1)
       continue;
 
-update_timeout:
     assert(timeout > 0);
 
     diff = uv_hrtime() / 1000000;

diff --git a/src/unix/sunos.c b/src/unix/sunos.c
@@ -150,15 +150,8 @@ void uv__io_poll(uv_loop_t* loop, int timeout) {
         abort();
     }
 
-    if (events[0].portev_source == 0) {
-      if (timeout == 0)
-        return;
-
-      if (timeout == -1)
-        continue;
-
-      goto update_timeout;
-    }
+    if (events[0].portev_source == 0)
+      return;
 
     if (nfds == 0) {
       assert(timeout != -1);
@@ -208,7 +201,6 @@ void uv__io_poll(uv_loop_t* loop, int timeout) {
     if (timeout == -1)
       continue;
 
-update_timeout:
     assert(timeout > 0);
 
     diff = uv_hrtime() / 1000000;