generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-10-27 19:10:22 +01:00
Code Issues Projects Releases Wiki Activity

Fix race condition and support multiple socket connects before bind.

Browse Source
This commit is contained in:
Richard Newton
2013-09-12 18:09:37 +01:00
parent 6fefa4166a
commit 7c3496a76a
9 changed files with 232 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/object.cpp
View File

@@ -127,6 +127,10 @@ void zmq::object_t::process_command (command_t &cmd_)
process_reaped ();
break;
case command_t::inproc_connected:
process_seqnum ();
break;
case command_t::done:
default:
zmq_assert (false);
@@ -153,9 +157,9 @@ void zmq::object_t::pend_connection (const char *addr_, const pending_connection
ctx->pend_connection (addr_, pending_connection_);
}
zmq::pending_connection_t zmq::object_t::next_pending_connection (const char *addr_)
void zmq::object_t::connect_pending (const char *addr_, zmq::socket_base_t *bind_socket_)
{
return ctx->next_pending_connection(addr_);
return ctx->connect_pending(addr_, bind_socket_);
}
void zmq::object_t::destroy_socket (socket_base_t *socket_)
@@ -312,6 +316,14 @@ void zmq::object_t::send_reaped ()
send_command (cmd);
}
void zmq::object_t::send_inproc_connected (zmq::socket_base_t *socket_)
{
command_t cmd;
cmd.destination = socket_;
cmd.type = command_t::inproc_connected;
send_command (cmd);
}
void zmq::object_t::send_done ()
{
command_t cmd;