generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-02-01 06:52:48 +01:00
Code Issues Projects Releases Wiki Activity

synchronisation problem fixed in ctx_t

Browse Source
This commit is contained in:
Martin Sustrik 2010-09-19 21:40:26 +02:00
parent 471013a59f
commit 938689a491
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ctx.cpp
View File

@ -108,8 +108,10 @@ int zmq::ctx_t::terminate ()
{ {
// First send stop command to sockets so that any // First send stop command to sockets so that any
// blocking calls are interrupted. // blocking calls are interrupted.
slot_sync.lock ();
for (sockets_t::size_type i = 0; i != sockets.size (); i++) for (sockets_t::size_type i = 0; i != sockets.size (); i++)
sockets [i]->stop (); sockets [i]->stop ();
slot_sync.unlock ();
// Close the logging infrastructure. // Close the logging infrastructure.
log_sync.lock (); log_sync.lock ();

5
src/zmq_init.cpp
View File

@ -139,7 +139,10 @@ void zmq::zmq_init_t::finalise_initialisation ()
if (sent && received) { if (sent && received) {
// If we know what session we belong to, it's easy, just send the // If we know what session we belong to, it's easy, just send the
// engine to that session and destroy the init object. // engine to that session and destroy the init object. Note that we
// know about the session only if this object is owned by it. Thus,
// lifetime of this object in contained in the lifetime of the session
// so the pointer cannot become invalid without notice.
if (session) { if (session) {
engine->unplug (); engine->unplug ();
send_attach (session, engine, peer_identity, true); send_attach (session, engine, peer_identity, true);