Deadlock on zmq_close

82012667 · Martin Sustrik · 9f495942 · 82012667
Commit 82012667 authored Dec 07, 2009 by Martin Sustrik
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 3 deletions

fd_signaler.cpp src/fd_signaler.cpp +6 -3

No files found.
--- a/src/fd_signaler.cpp
+++ b/src/fd_signaler.cpp
@@ -78,10 +78,13 @@ uint64_t zmq::fd_signaler_t::poll ()
    ssize_t sz;
    while (true) {
        sz = read (fd, &signals, sizeof (uint64_t));
-        if (sz == 0 || (errno != EAGAIN && errno != EINTR))
+        if (sz == -1) {
-            break;
+            if (errno == EAGAIN || errno == EINTR)
+                continue;
+            zmq_assert (false);
+        }
+        break;
    }
-    errno_assert (sz != -1);
    //  Set to non-blocking mode.
    rc = fcntl (fd, F_SETFL, flags | O_NONBLOCK);