summaryrefslogtreecommitdiff
path: root/src/ctx.cpp
diff options
context:
space:
mode:
authorMartin Sustrik <sustrik@250bpm.com>2011-04-21 22:27:48 +0200
committerMartin Sustrik <sustrik@250bpm.com>2011-04-21 22:27:48 +0200
commite0246e32d79d71f8e73207b43aed8b23648e4fc7 (patch)
tree9952ee6fd39f4e27bbe932f6b6f30f0073009369 /src/ctx.cpp
parent581697695aac72894f2d3fefac904b9d50b3ba67 (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/ctx.cpp')
-rw-r--r--src/ctx.cpp14
1 files changed, 8 insertions, 6 deletions
diff --git a/src/ctx.cpp b/src/ctx.cpp
index 2758729..fb5420d 100644
--- a/src/ctx.cpp
+++ b/src/ctx.cpp
@@ -26,8 +26,9 @@
#include "io_thread.hpp"
#include "platform.hpp"
#include "reaper.hpp"
-#include "err.hpp"
#include "pipe.hpp"
+#include "err.hpp"
+#include "msg.hpp"
#if defined ZMQ_HAVE_WINDOWS
#include "windows.h"
@@ -304,10 +305,10 @@ zmq::endpoint_t zmq::ctx_t::find_endpoint (const char *addr_)
void zmq::ctx_t::log (const char *format_, va_list args_)
{
// Create the log message.
- zmq_msg_t msg;
- int rc = zmq_msg_init_size (&msg, strlen (format_) + 1);
- zmq_assert (rc == 0);
- memcpy (zmq_msg_data (&msg), format_, zmq_msg_size (&msg));
+ msg_t msg;
+ int rc = msg.init_size (strlen (format_) + 1);
+ errno_assert (rc == 0);
+ memcpy (msg.data (), format_, msg.size ());
// At this point we migrate the log socket to the current thread.
// We rely on mutex for executing the memory barrier.
@@ -316,7 +317,8 @@ void zmq::ctx_t::log (const char *format_, va_list args_)
log_socket->send (&msg, 0);
log_sync.unlock ();
- zmq_msg_close (&msg);
+ rc = msg.close ();
+ errno_assert (rc == 0);
}