diff options
author | Martin Sustrik <sustrik@250bpm.com> | 2010-07-13 07:57:29 +0200 |
---|---|---|
committer | Martin Sustrik <sustrik@250bpm.com> | 2010-07-13 07:57:29 +0200 |
commit | da49e5a4dd4602bf893193a5e6e64af54695b51c (patch) | |
tree | 974d719e06e142c8dd9ea0b97fa1b510abc9b57f /src/queue.cpp | |
parent | ca057c7db8dcb2384e2498c938f3d83f64b78a7d (diff) |
devices exit in case of context termination
Diffstat (limited to 'src/queue.cpp')
-rw-r--r-- | src/queue.cpp | 42 |
1 files changed, 35 insertions, 7 deletions
diff --git a/src/queue.cpp b/src/queue.cpp index 470ea67..311a8c1 100644 --- a/src/queue.cpp +++ b/src/queue.cpp @@ -49,7 +49,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 (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 +65,26 @@ int zmq::queue (class socket_base_t *insocket_, while (true) { rc = insocket_->recv (&msg, 0); - errno_assert (rc == 0); + if (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 (rc < 0) { + if (errno == ETERM) + return -1; + errno_assert (false); + } rc = outsocket_->send (&msg, more ? ZMQ_SNDMORE : 0); - errno_assert (rc == 0); + if (rc < 0) { + if (errno == ETERM) + return -1; + errno_assert (false); + } if (!more) break; @@ -80,14 +96,26 @@ int zmq::queue (class socket_base_t *insocket_, while (true) { rc = outsocket_->recv (&msg, 0); - errno_assert (rc == 0); + if (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 (rc < 0) { + if (errno == ETERM) + return -1; + errno_assert (false); + } rc = insocket_->send (&msg, more ? ZMQ_SNDMORE : 0); - errno_assert (rc == 0); + if (rc < 0) { + if (errno == ETERM) + return -1; + errno_assert (false); + } if (!more) break; |