generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2024-12-12 18:40:27 +01:00
Code Issues Projects Releases Wiki Activity

spaces deleted

Browse Source
This commit is contained in:
Sergey KHripchenko 2012-04-21 18:36:20 +04:00
parent 06b2eae87d
commit 74ae19ac1f
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/pipe.cpp
View File

@ -359,7 +359,7 @@ void zmq::pipe_t::terminate (bool delay_)
// active state. // active state.
else if (state == delimited) { else if (state == delimited) {
send_pipe_term (peer); send_pipe_term (peer);
state = terminated; state = terminated;
} }
// There are no other states. // There are no other states.

7
src/session_base.cpp
View File

@ -357,6 +357,7 @@ void zmq::session_base_t::proceed_with_term ()
void zmq::session_base_t::timer_event (int id_) void zmq::session_base_t::timer_event (int id_)
{ {
// Linger period expired. We can proceed with termination even though // Linger period expired. We can proceed with termination even though
// there are still pending messages to be sent. // there are still pending messages to be sent.
zmq_assert (id_ == linger_timer_id); zmq_assert (id_ == linger_timer_id);
@ -376,13 +377,13 @@ void zmq::session_base_t::detached ()
} }
// Reconnect. // Reconnect.
if (options.reconnect_ivl != -1) if (options.reconnect_ivl != -1)
start_connecting (true); start_connecting (true);
// For subscriber sockets we hiccup the inbound pipe, which will cause // For subscriber sockets we hiccup the inbound pipe, which will cause
// the socket object to resend all the subscriptions. // the socket object to resend all the subscriptions.
if (pipe && (options.type == ZMQ_SUB || options.type == ZMQ_XSUB)) if (pipe && (options.type == ZMQ_SUB || options.type == ZMQ_XSUB))
pipe->hiccup (); pipe->hiccup ();
} }
void zmq::session_base_t::start_connecting (bool wait_) void zmq::session_base_t::start_connecting (bool wait_)