generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-10-17 03:03:25 +02:00
Code Issues Projects Releases Wiki Activity

Revert "Fix a number of whitespace issues in various parts of the code, add validation to most calls on the test and take a first stab at implementing the reconnection pipe blocking."

Browse Source 
This reverts commit 6f6466f088.
This commit is contained in:
Ian Barber
2012-06-12 14:51:50 +01:00
parent 48d3977632
commit 81b8362a59
8 changed files with 29 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/session_base.cpp
View File

@@ -228,7 +228,7 @@ void zmq::session_base_t::clean_pipes ()
}
void zmq::session_base_t::terminated (pipe_t *pipe_)
{
{
// Drop the reference to the deallocated pipe.
zmq_assert (pipe == pipe_);
pipe = NULL;
@@ -306,15 +306,9 @@ void zmq::session_base_t::process_attach (i_engine *engine_)
zmq_assert (!pipe);
pipe = pipes [0];
// Remember the remote end of the pipe if required
if (options.delay_attach_on_connect == 1)
outpipe = pipes [1];
// Ask socket to plug into the pipe.
send_bind (socket, pipes [1]);
}
else if (outpipe && (options.delay_attach_on_connect == 1))
send_bind (socket, outpipe);
// Plug in the engine.
zmq_assert (!engine);
@@ -411,11 +405,6 @@ void zmq::session_base_t::detached ()
// the socket object to resend all the subscriptions.
if (pipe && (options.type == ZMQ_SUB || options.type == ZMQ_XSUB))
pipe->hiccup ();
// For delayed connect situations, hiccup the socket to have it
// pause usage of this pipe
if (outpipe && options.delay_attach_on_connect == 1)
send_detach(socket, outpipe);
}
void zmq::session_base_t::start_connecting (bool wait_)