Imported Upstream version 2.0.9.dfsgupstream/2.0.9.dfsg

1 files changed, 36 insertions, 7 deletions

diff --git a/src/queue.cpp b/src/queue.cpp
index 470ea67..36fab07 100644
--- a/src/queue.cpp
+++ b/src/queue.cpp
@@ -23,6 +23,7 @@
 
 #include "queue.hpp"
 #include "socket_base.hpp"
+#include "likely.hpp"
 #include "err.hpp"
 
 int zmq::queue (class socket_base_t *insocket_,
@@ -49,7 +50,11 @@ int zmq::queue (class socket_base_t *insocket_,
 
         //  Wait while there are either requests or replies to process.
         rc = zmq_poll (&items [0], 2, -1);
-        errno_assert (rc > 0);
+        if (unlikely (rc < 0)) {
+            if (errno == ETERM)
+                return -1;
+            errno_assert (false);
+        }
 
         //  The algorithm below asumes ratio of request and replies processed
         //  under full load to be 1:1. Although processing requests replies
@@ -61,14 +66,26 @@ int zmq::queue (class socket_base_t *insocket_,
             while (true) {
 
                 rc = insocket_->recv (&msg, 0);
-                errno_assert (rc == 0);
+                if (unlikely (rc < 0)) {
+                    if (errno == ETERM)
+                        return -1;
+                    errno_assert (false);
+                }
 
                 moresz = sizeof (more);
                 rc = insocket_->getsockopt (ZMQ_RCVMORE, &more, &moresz);
-                errno_assert (rc == 0);
+                if (unlikely (rc < 0)) {
+                    if (errno == ETERM)
+                        return -1;
+                    errno_assert (false);
+                }
 
                 rc = outsocket_->send (&msg, more ? ZMQ_SNDMORE : 0);
-                errno_assert (rc == 0);
+                if (unlikely (rc < 0)) {
+                    if (errno == ETERM)
+                        return -1;
+                    errno_assert (false);
+                }
 
                 if (!more)
                     break;
@@ -80,14 +97,26 @@ int zmq::queue (class socket_base_t *insocket_,
             while (true) {
 
                 rc = outsocket_->recv (&msg, 0);
-                errno_assert (rc == 0);
+                if (unlikely (rc < 0)) {
+                    if (errno == ETERM)
+                        return -1;
+                    errno_assert (false);
+                }
 
                 moresz = sizeof (more);
                 rc = outsocket_->getsockopt (ZMQ_RCVMORE, &more, &moresz);
-                errno_assert (rc == 0);
+                if (unlikely (rc < 0)) {
+                    if (errno == ETERM)
+                        return -1;
+                    errno_assert (false);
+                }
 
                 rc = insocket_->send (&msg, more ? ZMQ_SNDMORE : 0);
-                errno_assert (rc == 0);
+                if (unlikely (rc < 0)) {
+                    if (errno == ETERM)
+                        return -1;
+                    errno_assert (false);
+                }
 
                 if (!more)
                     break;