devices exit in case of context termination

This commit is contained in:
Martin Sustrik 2010-07-13 07:57:29 +02:00
parent ca057c7db8
commit da49e5a4dd
3 changed files with 61 additions and 11 deletions

View File

@ -30,8 +30,19 @@ int zmq::forwarder (socket_base_t *insocket_, socket_base_t *outsocket_)
errno_assert (rc == 0);
while (true) {
insocket_->recv (&msg, 0);
outsocket_->send (&msg, 0);
rc = insocket_->recv (&msg, 0);
if (rc < 0) {
if (errno == ETERM)
return -1;
errno_assert (false);
}
rc = outsocket_->send (&msg, 0);
if (rc < 0) {
if (errno == ETERM)
return -1;
errno_assert (false);
}
}
return 0;

View File

@ -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;

View File

@ -30,8 +30,19 @@ int zmq::streamer (socket_base_t *insocket_, socket_base_t *outsocket_)
errno_assert (rc == 0);
while (true) {
insocket_->recv (&msg, 0);
outsocket_->send (&msg, 0);
rc = insocket_->recv (&msg, 0);
if (rc < 0) {
if (errno == ETERM)
return -1;
errno_assert (false);
}
rc = outsocket_->send (&msg, 0);
if (rc < 0) {
if (errno == ETERM)
return -1;
errno_assert (false);
}
}
return 0;