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

Problem: ipc_connector_t::_timer_started is unspecifically named

Browse Source 
Solution: rename to _reconnect_timer_started
This commit is contained in:
Simon Giesecke 2019-01-31 08:21:41 -05:00
parent c94ad64876
commit ca87aaed57
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/ipc_connecter.cpp
View File

@ -62,7 +62,7 @@ zmq::ipc_connecter_t::ipc_connecter_t (class io_thread_t *io_thread_,
_s (retired_fd), _s (retired_fd),
_handle_valid (false), _handle_valid (false),
_delayed_start (delayed_start_), _delayed_start (delayed_start_),
_timer_started (false), _reconnect_timer_started (false),
_session (session_), _session (session_),
_current_reconnect_ivl (options.reconnect_ivl) _current_reconnect_ivl (options.reconnect_ivl)
{ {
@ -74,7 +74,7 @@ zmq::ipc_connecter_t::ipc_connecter_t (class io_thread_t *io_thread_,
zmq::ipc_connecter_t::~ipc_connecter_t () zmq::ipc_connecter_t::~ipc_connecter_t ()
{ {
zmq_assert (!_timer_started); zmq_assert (!_reconnect_timer_started);
zmq_assert (!_handle_valid); zmq_assert (!_handle_valid);
zmq_assert (_s == retired_fd); zmq_assert (_s == retired_fd);
} }
@ -89,9 +89,9 @@ void zmq::ipc_connecter_t::process_plug ()
void zmq::ipc_connecter_t::process_term (int linger_) void zmq::ipc_connecter_t::process_term (int linger_)
{ {
if (_timer_started) { if (_reconnect_timer_started) {
cancel_timer (reconnect_timer_id); cancel_timer (reconnect_timer_id);
_timer_started = false; _reconnect_timer_started = false;
} }
if (_handle_valid) { if (_handle_valid) {
@ -142,7 +142,7 @@ void zmq::ipc_connecter_t::out_event ()
void zmq::ipc_connecter_t::timer_event (int id_) void zmq::ipc_connecter_t::timer_event (int id_)
{ {
zmq_assert (id_ == reconnect_timer_id); zmq_assert (id_ == reconnect_timer_id);
_timer_started = false; _reconnect_timer_started = false;
start_connecting (); start_connecting ();
} }
@ -180,7 +180,7 @@ void zmq::ipc_connecter_t::add_reconnect_timer ()
int rc_ivl = get_new_reconnect_ivl (); int rc_ivl = get_new_reconnect_ivl ();
add_timer (rc_ivl, reconnect_timer_id); add_timer (rc_ivl, reconnect_timer_id);
_socket->event_connect_retried (_endpoint, rc_ivl); _socket->event_connect_retried (_endpoint, rc_ivl);
_timer_started = true; _reconnect_timer_started = true;
} }
} }

2
src/ipc_connecter.hpp
View File

@ -112,7 +112,7 @@ class ipc_connecter_t : public own_t, public io_object_t
const bool _delayed_start; const bool _delayed_start;
// True iff a timer has been started. // True iff a timer has been started.
bool _timer_started; bool _reconnect_timer_started;
// Reference to the session we belong to. // Reference to the session we belong to.
zmq::session_base_t *_session; zmq::session_base_t *_session;