diff options
author | Jon Dyte <jon@totient.co.uk> | 2010-08-27 06:59:55 +0200 |
---|---|---|
committer | Martin Sustrik <sustrik@250bpm.com> | 2010-08-27 06:59:55 +0200 |
commit | 3cb84b5ceac0f8652a99ec61152a865292e02cf1 (patch) | |
tree | 827a3fb6756b321039a66dbe1ccb0a262434e36d /src/streamer.cpp | |
parent | 43f2c6ff5b15d6feae2bd608e50503f7d4c62682 (diff) |
forwarder and streamer devices handle multi-part messages correctly
Diffstat (limited to 'src/streamer.cpp')
-rw-r--r-- | src/streamer.cpp | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/src/streamer.cpp b/src/streamer.cpp index 9799007..7c03365 100644 --- a/src/streamer.cpp +++ b/src/streamer.cpp @@ -21,6 +21,7 @@ #include "streamer.hpp" #include "socket_base.hpp" +#include "likely.hpp" #include "err.hpp" int zmq::streamer (socket_base_t *insocket_, socket_base_t *outsocket_) @@ -29,16 +30,26 @@ int zmq::streamer (socket_base_t *insocket_, socket_base_t *outsocket_) int rc = zmq_msg_init (&msg); errno_assert (rc == 0); + int64_t more; + size_t more_sz = sizeof (more); + while (true) { rc = insocket_->recv (&msg, 0); - if (rc < 0) { + if (unlikely (rc < 0)) { + if (errno == ETERM) + return -1; + errno_assert (false); + } + + rc = insocket_->getsockopt (ZMQ_RCVMORE, &more, &more_sz); + if (unlikely (rc < 0)) { if (errno == ETERM) return -1; errno_assert (false); } - rc = outsocket_->send (&msg, 0); - if (rc < 0) { + rc = outsocket_->send (&msg, more ? ZMQ_SNDMORE : 0); + if (unlikely (rc < 0)) { if (errno == ETERM) return -1; errno_assert (false); |