generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-03-05 03:37:36 +01:00
Code Issues Projects Releases Wiki Activity

Bind pending connections on terminate outside lock.

Browse Source
This commit is contained in:
Richard Newton 2014-02-12 23:45:39 +00:00
parent 668c42fc26
commit 12442a3d65
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/ctx.cpp
View File

@ -95,6 +95,14 @@ zmq::ctx_t::~ctx_t ()
int zmq::ctx_t::terminate ()
{
// Connect up any pending inproc connections, otherwise we will hang
pending_connections_t copy = pending_connections;
for (pending_connections_t::iterator p = copy.begin (); p != copy.end (); ++p) {
zmq::socket_base_t *s = create_socket (ZMQ_PAIR);
s->bind (p->first.c_str ());
s->close ();
}
slot_sync.lock ();
if (!starting) {
@ -108,13 +116,6 @@ int zmq::ctx_t::terminate ()
term_mailbox.forked();
}
#endif
// Connect up any pending inproc connections, otherwise we will hang
pending_connections_t copy = pending_connections;
for (pending_connections_t::iterator p = copy.begin (); p != copy.end (); ++p) {
zmq::socket_base_t *s = create_socket (ZMQ_PAIR);
s->bind (p->first.c_str ());
s->close ();
}
// Check whether termination was already underway, but interrupted and now
// restarted.