diff options
author | Martin Sustrik <sustrik@250bpm.com> | 2011-04-21 22:27:48 +0200 |
---|---|---|
committer | Martin Sustrik <sustrik@250bpm.com> | 2011-04-21 22:27:48 +0200 |
commit | e0246e32d79d71f8e73207b43aed8b23648e4fc7 (patch) | |
tree | 9952ee6fd39f4e27bbe932f6b6f30f0073009369 /src/pair.cpp | |
parent | 581697695aac72894f2d3fefac904b9d50b3ba67 (diff) |
Message-related functionality factored out into msg_t class.
This patch addresses serveral issues:
1. It gathers message related functionality scattered over whole
codebase into a single class.
2. It makes zmq_msg_t an opaque datatype. Internals of the class
don't pollute zmq.h header file.
3. zmq_msg_t size decreases from 48 to 32 bytes. That saves ~33%
of memory in scenarios with large amount of small messages.
Signed-off-by: Martin Sustrik <sustrik@250bpm.com>
Diffstat (limited to 'src/pair.cpp')
-rw-r--r-- | src/pair.cpp | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/src/pair.cpp b/src/pair.cpp index 1acc60f..d877b54 100644 --- a/src/pair.cpp +++ b/src/pair.cpp @@ -18,11 +18,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "../include/zmq.h" - #include "pair.hpp" #include "err.hpp" #include "pipe.hpp" +#include "msg.hpp" zmq::pair_t::pair_t (class ctx_t *parent_, uint32_t tid_) : socket_base_t (parent_, tid_), @@ -116,7 +115,7 @@ void zmq::pair_t::activated (class writer_t *pipe_) outpipe_alive = true; } -int zmq::pair_t::xsend (zmq_msg_t *msg_, int flags_) +int zmq::pair_t::xsend (msg_t *msg_, int flags_) { if (outpipe == NULL || !outpipe_alive) { errno = EAGAIN; @@ -133,16 +132,17 @@ int zmq::pair_t::xsend (zmq_msg_t *msg_, int flags_) outpipe->flush (); // Detach the original message from the data buffer. - int rc = zmq_msg_init (msg_); - zmq_assert (rc == 0); + int rc = msg_->init (); + errno_assert (rc == 0); return 0; } -int zmq::pair_t::xrecv (zmq_msg_t *msg_, int flags_) +int zmq::pair_t::xrecv (msg_t *msg_, int flags_) { // Deallocate old content of the message. - zmq_msg_close (msg_); + int rc = msg_->close (); + errno_assert (rc == 0); if (!inpipe_alive || !inpipe || !inpipe->read (msg_)) { @@ -150,7 +150,8 @@ int zmq::pair_t::xrecv (zmq_msg_t *msg_, int flags_) inpipe_alive = false; // Initialise the output parameter to be a 0-byte message. - zmq_msg_init (msg_); + rc = msg_->init (); + errno_assert (rc == 0); errno = EAGAIN; return -1; } @@ -171,10 +172,12 @@ bool zmq::pair_t::xhas_out () if (!outpipe || !outpipe_alive) return false; - zmq_msg_t msg; - zmq_msg_init (&msg); + msg_t msg; + int rc = msg.init (); + errno_assert (rc == 0); outpipe_alive = outpipe->check_write (&msg); - zmq_msg_close (&msg); + rc = msg.close (); + errno_assert (rc == 0); return outpipe_alive; } |