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

Problem: tipc_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:22:54 -05:00
parent ca87aaed57
commit 065e81879a
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/tipc_connecter.cpp
View File

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

2
src/tipc_connecter.hpp
View File

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