3party/libzmq
0
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-03-09 15:26:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove assertions from devices

Browse Source 
Signed-off-by: Mikko Koppanen <mkoppanen@php.net>
This commit is contained in:
Mikko Koppanen 2010-12-15 14:41:18 +01:00 committed by Martin Sustrik
parent f749f2d21c
commit a46980babe
4 changed files with 26 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
devices/zmq_forwarder/zmq_forwarder.cpp
View File

@ -113,7 +113,11 @@ int main (int argc, char *argv [])
n++;
}
zmq::device (ZMQ_FORWARDER, in_socket, out_socket);
try {
zmq::device (ZMQ_FORWARDER, in_socket, out_socket);
} catch (zmq::error_t& e) {
fprintf(stderr, "device exit: %s\n", e.what());
}
return 0;
}

6
devices/zmq_queue/zmq_queue.cpp
View File

@ -112,7 +112,11 @@ int main (int argc, char *argv [])
n++;
}
zmq::device (ZMQ_QUEUE, in_socket, out_socket);
try {
zmq::device (ZMQ_QUEUE, in_socket, out_socket);
} catch (zmq::error_t& e) {
fprintf(stderr, "device exit: %s\n", e.what());
}
return 0;
}

6
devices/zmq_streamer/zmq_streamer.cpp
View File

@ -112,7 +112,11 @@ int main (int argc, char *argv [])
n++;
}
zmq::device (ZMQ_FORWARDER, in_socket, out_socket);
try {
zmq::device (ZMQ_STREAMER, in_socket, out_socket);
} catch (zmq::error_t& e) {
fprintf(stderr, "device exit: %s\n", e.what());
}
return 0;
}

33
src/device.cpp
View File

@ -31,7 +31,10 @@ int zmq::device (class socket_base_t *insocket_,
{
zmq_msg_t msg;
int rc = zmq_msg_init (&msg);
zmq_assert (rc == 0);
if (rc != 0) {
return -1;
}
int64_t more;
size_t moresz;
@ -51,9 +54,7 @@ int zmq::device (class socket_base_t *insocket_,
// Wait while there are either requests or replies to process.
rc = zmq_poll (&items [0], 2, -1);
if (unlikely (rc < 0)) {
if (errno == ETERM)
return -1;
errno_assert (false);
return -1;
}
// The algorithm below asumes ratio of request and replies processed
@ -67,24 +68,18 @@ int zmq::device (class socket_base_t *insocket_,
rc = insocket_->recv (&msg, 0);
if (unlikely (rc < 0)) {
if (errno == ETERM)
return -1;
errno_assert (false);
return -1;
}
moresz = sizeof (more);
rc = insocket_->getsockopt (ZMQ_RCVMORE, &more, &moresz);
if (unlikely (rc < 0)) {
if (errno == ETERM)
return -1;
errno_assert (false);
return -1;
}
rc = outsocket_->send (&msg, more ? ZMQ_SNDMORE : 0);
if (unlikely (rc < 0)) {
if (errno == ETERM)
return -1;
errno_assert (false);
return -1;
}
if (!more)
@ -98,24 +93,18 @@ int zmq::device (class socket_base_t *insocket_,
rc = outsocket_->recv (&msg, 0);
if (unlikely (rc < 0)) {
if (errno == ETERM)
return -1;
errno_assert (false);
return -1;
}
moresz = sizeof (more);
rc = outsocket_->getsockopt (ZMQ_RCVMORE, &more, &moresz);
if (unlikely (rc < 0)) {
if (errno == ETERM)
return -1;
errno_assert (false);
return -1;
}
rc = insocket_->send (&msg, more ? ZMQ_SNDMORE : 0);
if (unlikely (rc < 0)) {
if (errno == ETERM)
return -1;
errno_assert (false);
return -1;
}
if (!more)