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

Problem: ipc_connector_t::_handle_valid is redundant

Browse Source 
Solution: replace by checks against valid value of _handle
This commit is contained in:
Simon Giesecke
2019-01-31 08:35:49 -05:00
parent 065e81879a
commit a13eb1a9d8
2 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/ipc_connecter.cpp
View File

@@ -60,7 +60,7 @@ zmq::ipc_connecter_t::ipc_connecter_t (class io_thread_t *io_thread_,
io_object_t (io_thread_),
_addr (addr_),
_s (retired_fd),
_handle_valid (false),
_handle (static_cast<handle_t> (NULL)),
_delayed_start (delayed_start_),
_reconnect_timer_started (false),
_session (session_),
@@ -75,7 +75,7 @@ zmq::ipc_connecter_t::ipc_connecter_t (class io_thread_t *io_thread_,
zmq::ipc_connecter_t::~ipc_connecter_t ()
{
zmq_assert (!_reconnect_timer_started);
zmq_assert (!_handle_valid);
zmq_assert (_handle == static_cast<handle_t> (NULL));
zmq_assert (_s == retired_fd);
}
@@ -94,9 +94,9 @@ void zmq::ipc_connecter_t::process_term (int linger_)
_reconnect_timer_started = false;
}
if (_handle_valid) {
if (_handle) {
rm_fd (_handle);
_handle_valid = false;
_handle = static_cast<handle_t> (NULL);
}
if (_s != retired_fd)
@@ -117,7 +117,7 @@ void zmq::ipc_connecter_t::out_event ()
{
fd_t fd = connect ();
rm_fd (_handle);
_handle_valid = false;
_handle = static_cast<handle_t> (NULL);
// Handle the error condition by attempt to reconnect.
if (fd == retired_fd) {
@@ -154,14 +154,12 @@ void zmq::ipc_connecter_t::start_connecting ()
// Connect may succeed in synchronous manner.
if (rc == 0) {
_handle = add_fd (_s);
_handle_valid = true;
out_event ();
}
// Connection establishment may be delayed. Poll for its completion.
else if (rc == -1 && errno == EINPROGRESS) {
_handle = add_fd (_s);
_handle_valid = true;
set_pollout (_handle);
_socket->event_connect_delayed (_endpoint, zmq_errno ());
}