Skip to content

Commit

Permalink
Fix socket_t::recv() hang scenario where initial call to process_comm…
Browse files Browse the repository at this point in the history
…ands() eats signal

Added block boolean var to second process_commands() invocation for blocking sockets
instead of always using true.  This prevents the process_commands() call from hanging
when a message is received with an empty queue after the call to xrecv() but
prior to the initial call to process_commands() invoked when ++ticks == inbound_poll_rate.

Signed-off-by: Marc Rossi <mrossi19@gmail.com>
  • Loading branch information
mrossi19 authored and sustrik committed Nov 12, 2010
1 parent eb83678 commit f7123de
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
1 change: 1 addition & 0 deletions AUTHORS
Expand Up @@ -20,6 +20,7 @@ Ivo Danihelka <ivo@danihelka.net>
Joe Thornber <joe.thornber@gmail.com>
Jon Dyte <jon@totient.co.uk>
Kamil Shakirov <kamils80@gmail.com>
Marc Rossi <mrossi19@gmail.com>
Martin Hurton <hurtonm@gmail.com>
Martin Lucina <mato@kotelna.sk>
Martin Sustrik <sustrik@250bpm.com>
Expand Down
4 changes: 3 additions & 1 deletion src/socket_base.cpp
Expand Up @@ -437,15 +437,17 @@ int zmq::socket_base_t::recv (::zmq_msg_t *msg_, int flags_)

// In blocking scenario, commands are processed over and over again until
// we are able to fetch a message.
bool block = (ticks != 0);
while (rc != 0) {
if (errno != EAGAIN)
return -1;
if (unlikely (!app_thread->process_commands (true, false))) {
if (unlikely (!app_thread->process_commands (block, false))) {
errno = ETERM;
return -1;
}
rc = xrecv (msg_, flags_);
ticks = 0;
block = true;
}

rcvmore = msg_->flags & ZMQ_MSG_MORE;
Expand Down

0 comments on commit f7123de

Please sign in to comment.