Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
L
libzmq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
libzmq
Commits
ca87aaed
Commit
ca87aaed
authored
Jan 31, 2019
by
Simon Giesecke
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Problem: ipc_connector_t::_timer_started is unspecifically named
Solution: rename to _reconnect_timer_started
parent
c94ad648
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
7 deletions
+7
-7
ipc_connecter.cpp
src/ipc_connecter.cpp
+6
-6
ipc_connecter.hpp
src/ipc_connecter.hpp
+1
-1
No files found.
src/ipc_connecter.cpp
View file @
ca87aaed
...
...
@@ -62,7 +62,7 @@ zmq::ipc_connecter_t::ipc_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
)
{
...
...
@@ -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_assert
(
!
_timer_started
);
zmq_assert
(
!
_
reconnect_
timer_started
);
zmq_assert
(
!
_handle_valid
);
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_
)
{
if
(
_timer_started
)
{
if
(
_
reconnect_
timer_started
)
{
cancel_timer
(
reconnect_timer_id
);
_timer_started
=
false
;
_
reconnect_
timer_started
=
false
;
}
if
(
_handle_valid
)
{
...
...
@@ -142,7 +142,7 @@ void zmq::ipc_connecter_t::out_event ()
void
zmq
::
ipc_connecter_t
::
timer_event
(
int
id_
)
{
zmq_assert
(
id_
==
reconnect_timer_id
);
_timer_started
=
false
;
_
reconnect_
timer_started
=
false
;
start_connecting
();
}
...
...
@@ -180,7 +180,7 @@ void zmq::ipc_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
;
}
}
...
...
src/ipc_connecter.hpp
View file @
ca87aaed
...
...
@@ -112,7 +112,7 @@ class ipc_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
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment