From 7572fee979a1cc2a874dd5621c89a0e849b65816 Mon Sep 17 00:00:00 2001 From: Fabien Ninoles Date: Mon, 20 Jun 2011 08:14:21 +0200 Subject: Optimise block/non-block switching in mailbox_t For the platforms that don't support MSG_DONTWAIT the reader socket in mailbox_t was kept in non-blocking state and flipped to blocking state and back when blocking read was requested. Now, the state is preserved between calls and flipped only if different type of operation (block vs. non-block) is requested. Signed-off-by: Fabien Ninoles Signed-off-by: Martin Sustrik --- src/mailbox.hpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'src/mailbox.hpp') diff --git a/src/mailbox.hpp b/src/mailbox.hpp index 1b54aac..eb02e39 100644 --- a/src/mailbox.hpp +++ b/src/mailbox.hpp @@ -45,10 +45,6 @@ namespace zmq private: - // Write & read end of the socketpair. - fd_t w; - fd_t r; - // Platform-dependent function to create a socketpair. static int make_socketpair (fd_t *r_, fd_t *w_); @@ -57,6 +53,14 @@ namespace zmq // blocking recvs. int recv_timeout (command_t *cmd_, int timeout_); + // Write & read end of the socketpair. + fd_t w; + fd_t r; + + // Used on platforms where there's no MSG_DONTWAIT functionality. + // True if the read socket is set to the blocking state. + bool blocking; + // Disable copying of mailbox_t object. mailbox_t (const mailbox_t&); const mailbox_t &operator = (const mailbox_t&); -- cgit v1.2.3