generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-01-19 08:46:44 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2710 from sigiesec/remove-select-rm_fd-code-duplication

Browse Source 
Problem: code duplication within zmq::select_t::rm_fd
This commit is contained in:
Luca Boccassi 2017-08-21 17:05:39 +01:00 committed by GitHub
commit 1881735f7d
2 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/select.cpp
View File

@ -90,6 +90,20 @@ zmq::select_t::handle_t zmq::select_t::add_fd (fd_t fd_, i_poll_events *events_)
return fd_; return fd_;
} }
zmq::select_t::fd_entries_t::iterator
zmq::select_t::find_fd_entry_by_handle (fd_entries_t &fd_entries,
handle_t handle_)
{
fd_entries_t::iterator fd_entry_it;
for (fd_entry_it = fd_entries.begin (); fd_entry_it != fd_entries.end ();
++fd_entry_it)
if (fd_entry_it->fd == handle_)
break;
zmq_assert (fd_entry_it != fd_entries.end ());
return fd_entry_it;
}
void zmq::select_t::rm_fd (handle_t handle_) void zmq::select_t::rm_fd (handle_t handle_)
{ {
#if defined ZMQ_HAVE_WINDOWS #if defined ZMQ_HAVE_WINDOWS
@ -99,40 +113,23 @@ void zmq::select_t::rm_fd (handle_t handle_)
family_entries_t::iterator family_entry_it = family_entries.find (family); family_entries_t::iterator family_entry_it = family_entries.find (family);
family_entry_t& family_entry = family_entry_it->second; family_entry_t& family_entry = family_entry_it->second;
fd_entries_t::iterator fd_entry_it =
find_fd_entry_by_handle (family_entry.fd_entries, handle_);
if (family_entry_it != current_family_entry_it) { if (family_entry_it != current_family_entry_it) {
// Family is not currently being iterated and can be safely // Family is not currently being iterated and can be safely
// modified in-place. So later it can be skipped without // modified in-place. So later it can be skipped without
// re-verifying its content. // re-verifying its content.
fd_entries_t::iterator fd_entry_it;
for (fd_entry_it = family_entry.fd_entries.begin ();
fd_entry_it != family_entry.fd_entries.end (); ++fd_entry_it)
if (fd_entry_it->fd == handle_)
break;
zmq_assert (fd_entry_it != family_entry.fd_entries.end ());
family_entry.fd_entries.erase (fd_entry_it); family_entry.fd_entries.erase (fd_entry_it);
family_entry.fds_set.remove_fd (handle_);
} else { } else {
// Otherwise mark removed entries as retired. It will be cleaned up // Otherwise mark removed entries as retired. It will be cleaned up
// at the end of the iteration. See zmq::select_t::loop // at the end of the iteration. See zmq::select_t::loop
fd_entries_t::iterator fd_entry_it;
for (fd_entry_it = family_entry.fd_entries.begin ();
fd_entry_it != family_entry.fd_entries.end (); ++fd_entry_it)
if (fd_entry_it->fd == handle_)
break;
zmq_assert (fd_entry_it != family_entry.fd_entries.end ());
fd_entry_it->fd = retired_fd; fd_entry_it->fd = retired_fd;
family_entry.fds_set.remove_fd (handle_);
family_entry.retired = true; family_entry.retired = true;
} }
family_entry.fds_set.remove_fd (handle_);
#else #else
fd_entries_t::iterator fd_entry_it; fd_entries_t::iterator fd_entry_it =
for (fd_entry_it = fd_entries.begin (); find_fd_entry_by_handle (fd_entries, handle_);
fd_entry_it != fd_entries.end (); ++fd_entry_it)
if (fd_entry_it->fd == handle_)
break;
zmq_assert (fd_entry_it != fd_entries.end ());
fd_entry_it->fd = retired_fd; fd_entry_it->fd = retired_fd;
fds_set.remove_fd (handle_); fds_set.remove_fd (handle_);

3
src/select.hpp
View File

@ -151,6 +151,9 @@ namespace zmq
// Checks if an fd_entry_t is retired. // Checks if an fd_entry_t is retired.
static bool is_retired_fd (const fd_entry_t &entry); static bool is_retired_fd (const fd_entry_t &entry);
static fd_entries_t::iterator
find_fd_entry_by_handle (fd_entries_t &fd_entries, handle_t handle_);
// If true, thread is shutting down. // If true, thread is shutting down.
bool stopping; bool stopping;