3party/libzmq
0
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-03-17 16:43:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #51 from hintjens/master

Browse Source 
Backported fixes for LIBZMQ-447
This commit is contained in:
Pieter Hintjens 2012-10-29 22:29:33 -07:00
commit 08b0af5075
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/socket_base.cpp
View File

@ -677,11 +677,6 @@ int zmq::socket_base_t::recv (msg_t *msg_, int flags_)
return -1; return -1;
} }
// Get the message.
int rc = xrecv (msg_, flags_);
if (unlikely (rc != 0 && errno != EAGAIN))
return -1;
// Once every inbound_poll_rate messages check for signals and process // Once every inbound_poll_rate messages check for signals and process
// incoming commands. This happens only if we are not polling altogether // incoming commands. This happens only if we are not polling altogether
// because there are messages available all the time. If poll occurs, // because there are messages available all the time. If poll occurs,
@ -696,6 +691,11 @@ int zmq::socket_base_t::recv (msg_t *msg_, int flags_)
ticks = 0; ticks = 0;
} }
// Get the message.
int rc = xrecv (msg_, flags_);
if (unlikely (rc != 0 && errno != EAGAIN))
return -1;
// If we have the message, return immediately. // If we have the message, return immediately.
if (rc == 0) { if (rc == 0) {
extract_flags (msg_); extract_flags (msg_);