3party/libzmq
0
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-01-15 10:18:01 +08:00
Code Issues Projects Releases Wiki Activity

Problem: code duplication

Browse Source 
Solution: unified Windows & non-Windows code further
This commit is contained in:
sigiesec 2017-10-26 11:05:39 +02:00
parent e7817ad38d
commit f9d7eea6f9
2 changed files with 171 additions and 175 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

103
src/select.cpp
View File

@ -54,7 +54,6 @@ zmq::select_t::select_t (const zmq::ctx_t &ctx_) :
current_family_entry_it (family_entries.end ()), current_family_entry_it (family_entries.end ()),
#else #else
maxfd (retired_fd), maxfd (retired_fd),
retired (false),
#endif #endif
stopping (false) stopping (false)
{ {
@ -79,12 +78,11 @@ zmq::select_t::handle_t zmq::select_t::add_fd (fd_t fd_, i_poll_events *events_)
u_short family = get_fd_family (fd_); u_short family = get_fd_family (fd_);
wsa_assert (family != AF_UNSPEC); wsa_assert (family != AF_UNSPEC);
family_entry_t &family_entry = family_entries [family]; family_entry_t &family_entry = family_entries [family];
#endif
family_entry.fd_entries.push_back (fd_entry); family_entry.fd_entries.push_back (fd_entry);
FD_SET (fd_, &family_entry.fds_set.error); FD_SET (fd_, &family_entry.fds_set.error);
#else
fd_entries.push_back (fd_entry);
FD_SET (fd_, &fds_set.error);
#if !defined ZMQ_HAVE_WINDOWS
if (fd_ > maxfd) if (fd_ > maxfd)
maxfd = fd_; maxfd = fd_;
#endif #endif
@ -147,6 +145,7 @@ void zmq::select_t::trigger_events (const fd_entries_t &fd_entries_,
} }
} }
#if defined ZMQ_HAVE_WINDOWS
bool zmq::select_t::try_remove_fd_entry ( bool zmq::select_t::try_remove_fd_entry (
family_entries_t::iterator family_entry_it, zmq::fd_t &handle_) family_entries_t::iterator family_entry_it, zmq::fd_t &handle_)
{ {
@ -170,6 +169,7 @@ bool zmq::select_t::try_remove_fd_entry (
family_entry.fds_set.remove_fd (handle_); family_entry.fds_set.remove_fd (handle_);
return true; return true;
} }
#endif
void zmq::select_t::rm_fd (handle_t handle_) void zmq::select_t::rm_fd (handle_t handle_)
{ {
@ -195,21 +195,21 @@ void zmq::select_t::rm_fd (handle_t handle_)
} }
#else #else
fd_entries_t::iterator fd_entry_it = fd_entries_t::iterator fd_entry_it =
find_fd_entry_by_handle (fd_entries, handle_); find_fd_entry_by_handle (family_entry.fd_entries, handle_);
assert (fd_entry_it != fd_entries.end ()); assert (fd_entry_it != fd_entries.end ());
fd_entry_it->fd = retired_fd; fd_entry_it->fd = retired_fd;
fds_set.remove_fd (handle_); family_entry.fds_set.remove_fd (handle_);
if (handle_ == maxfd) { if (handle_ == maxfd) {
maxfd = retired_fd; maxfd = retired_fd;
for (fd_entry_it = fd_entries.begin (); for (fd_entry_it = family_entry.fd_entries.begin ();
fd_entry_it != fd_entries.end (); ++fd_entry_it) fd_entry_it != family_entry.fd_entries.end (); ++fd_entry_it)
if (fd_entry_it->fd > maxfd) if (fd_entry_it->fd > maxfd)
maxfd = fd_entry_it->fd; maxfd = fd_entry_it->fd;
} }
retired = true; family_entry.retired = true;
#endif #endif
adjust_load (-1); adjust_load (-1);
} }
@ -219,10 +219,9 @@ void zmq::select_t::set_pollin (handle_t handle_)
#if defined ZMQ_HAVE_WINDOWS #if defined ZMQ_HAVE_WINDOWS
u_short family = get_fd_family (handle_); u_short family = get_fd_family (handle_);
wsa_assert (family != AF_UNSPEC); wsa_assert (family != AF_UNSPEC);
FD_SET (handle_, &family_entries [family].fds_set.read); family_entry_t &family_entry = family_entries [family];
#else
FD_SET (handle_, &fds_set.read);
#endif #endif
FD_SET (handle_, &family_entry.fds_set.read);
} }
void zmq::select_t::reset_pollin (handle_t handle_) void zmq::select_t::reset_pollin (handle_t handle_)
@ -230,10 +229,9 @@ void zmq::select_t::reset_pollin (handle_t handle_)
#if defined ZMQ_HAVE_WINDOWS #if defined ZMQ_HAVE_WINDOWS
u_short family = get_fd_family (handle_); u_short family = get_fd_family (handle_);
wsa_assert (family != AF_UNSPEC); wsa_assert (family != AF_UNSPEC);
FD_CLR (handle_, &family_entries [family].fds_set.read); family_entry_t &family_entry = family_entries [family];
#else
FD_CLR (handle_, &fds_set.read);
#endif #endif
FD_CLR (handle_, &family_entry.fds_set.read);
} }
void zmq::select_t::set_pollout (handle_t handle_) void zmq::select_t::set_pollout (handle_t handle_)
@ -241,10 +239,9 @@ void zmq::select_t::set_pollout (handle_t handle_)
#if defined ZMQ_HAVE_WINDOWS #if defined ZMQ_HAVE_WINDOWS
u_short family = get_fd_family (handle_); u_short family = get_fd_family (handle_);
wsa_assert (family != AF_UNSPEC); wsa_assert (family != AF_UNSPEC);
FD_SET (handle_, &family_entries [family].fds_set.write); family_entry_t &family_entry = family_entries [family];
#else
FD_SET (handle_, &fds_set.write);
#endif #endif
FD_SET (handle_, &family_entry.fds_set.write);
} }
void zmq::select_t::reset_pollout (handle_t handle_) void zmq::select_t::reset_pollout (handle_t handle_)
@ -252,10 +249,9 @@ void zmq::select_t::reset_pollout (handle_t handle_)
#if defined ZMQ_HAVE_WINDOWS #if defined ZMQ_HAVE_WINDOWS
u_short family = get_fd_family (handle_); u_short family = get_fd_family (handle_);
wsa_assert (family != AF_UNSPEC); wsa_assert (family != AF_UNSPEC);
FD_CLR (handle_, &family_entries [family].fds_set.write); family_entry_t &family_entry = family_entries [family];
#else
FD_CLR (handle_, &fds_set.write);
#endif #endif
FD_CLR (handle_, &family_entry.fds_set.write);
} }
void zmq::select_t::start () void zmq::select_t::start ()
@ -364,54 +360,53 @@ void zmq::select_t::loop ()
++current_family_entry_it) { ++current_family_entry_it) {
family_entry_t &family_entry = current_family_entry_it->second; family_entry_t &family_entry = current_family_entry_it->second;
// select will fail when run with empty sets.
fd_entries_t &fd_entries = family_entry.fd_entries;
if (fd_entries.empty())
continue;
fds_set_t local_fds_set = family_entry.fds_set;
if (use_wsa_events) { if (use_wsa_events) {
// There is no reason to wait again after WSAWaitForMultipleEvents. // There is no reason to wait again after WSAWaitForMultipleEvents.
// Simply collect what is ready. // Simply collect what is ready.
struct timeval tv_nodelay = {0, 0}; struct timeval tv_nodelay = {0, 0};
rc = select (0, &local_fds_set.read, &local_fds_set.write, select_family_entry (family_entry, 0, true, tv_nodelay);
&local_fds_set.error, &tv_nodelay); } else {
} else select_family_entry (family_entry, 0, timeout > 0, tv);
rc = select (0, &local_fds_set.read, &local_fds_set.write,
&local_fds_set.error, timeout > 0 ? &tv : NULL);
wsa_assert (rc != SOCKET_ERROR);
trigger_events (fd_entries, local_fds_set, rc);
if (family_entry.retired) {
family_entry.retired = false;
family_entry.fd_entries.erase (
std::remove_if (fd_entries.begin (), fd_entries.end (),
is_retired_fd),
family_entry.fd_entries.end ());
} }
} }
#else #else
fds_set_t local_fds_set = fds_set; select_family_entry (family_entry, maxfd, timeout > 0, tv);
rc = select (maxfd + 1, &local_fds_set.read, &local_fds_set.write, #endif
&local_fds_set.error, timeout ? &tv : NULL); }
}
void zmq::select_t::select_family_entry (family_entry_t &family_entry_,
const int max_fd_,
const bool use_timeout_,
struct timeval &tv_)
{
// select will fail when run with empty sets.
fd_entries_t &fd_entries = family_entry_.fd_entries;
if (fd_entries.empty ())
return;
fds_set_t local_fds_set = family_entry_.fds_set;
int rc = select (max_fd_, &local_fds_set.read, &local_fds_set.write,
&local_fds_set.error, use_timeout_ ? &tv_ : NULL);
#if defined ZMQ_HAVE_WINDOWS
wsa_assert (rc != SOCKET_ERROR);
#else
if (rc == -1) { if (rc == -1) {
errno_assert (errno == EINTR); errno_assert (errno == EINTR);
continue; return;
} }
#endif
trigger_events (fd_entries, local_fds_set, rc); trigger_events (fd_entries, local_fds_set, rc);
if (retired) { if (family_entry_.retired) {
retired = false; family_entry_.retired = false;
fd_entries.erase (std::remove_if (fd_entries.begin (), family_entry_.fd_entries.erase (std::remove_if (fd_entries.begin (),
fd_entries.end (), is_retired_fd), fd_entries.end (),
fd_entries.end ()); is_retired_fd),
} family_entry_.fd_entries.end ());
#endif
} }
} }

59
src/select.hpp
View File

@ -53,16 +53,14 @@
namespace zmq namespace zmq
{ {
struct i_poll_events;
struct i_poll_events; // Implements socket polling mechanism using POSIX.1-2001 select()
// function.
// Implements socket polling mechanism using POSIX.1-2001 select() class select_t : public poller_base_t
// function. {
class select_t : public poller_base_t
{
public: public:
typedef fd_t handle_t; typedef fd_t handle_t;
select_t (const ctx_t &ctx_); select_t (const ctx_t &ctx_);
@ -81,7 +79,6 @@ namespace zmq
static int max_fds (); static int max_fds ();
private: private:
// Main worker thread routine. // Main worker thread routine.
static void worker_routine (void *arg_); static void worker_routine (void *arg_);
@ -95,10 +92,10 @@ namespace zmq
struct fds_set_t struct fds_set_t
{ {
fds_set_t (); fds_set_t ();
fds_set_t (const fds_set_t& other_); fds_set_t (const fds_set_t &other_);
fds_set_t& operator=(const fds_set_t& other_); fds_set_t &operator= (const fds_set_t &other_);
// Convenience method to descriptor from all sets. // Convenience method to descriptor from all sets.
void remove_fd (const fd_t& fd_); void remove_fd (const fd_t &fd_);
fd_set read; fd_set read;
fd_set write; fd_set write;
@ -108,11 +105,14 @@ namespace zmq
struct fd_entry_t struct fd_entry_t
{ {
fd_t fd; fd_t fd;
zmq::i_poll_events* events; zmq::i_poll_events *events;
}; };
typedef std::vector<fd_entry_t> fd_entries_t; typedef std::vector<fd_entry_t> fd_entries_t;
#if defined ZMQ_HAVE_WINDOWS void trigger_events (const fd_entries_t &fd_entries_,
const fds_set_t &local_fds_set_,
int event_count_);
struct family_entry_t struct family_entry_t
{ {
family_entry_t (); family_entry_t ();
@ -121,6 +121,13 @@ namespace zmq
fds_set_t fds_set; fds_set_t fds_set;
bool retired; bool retired;
}; };
void select_family_entry (family_entry_t &family_entry_,
int max_fd_,
bool use_timeout_,
struct timeval &tv_);
#if defined ZMQ_HAVE_WINDOWS
typedef std::map<u_short, family_entry_t> family_entries_t; typedef std::map<u_short, family_entry_t> family_entries_t;
struct wsa_events_t struct wsa_events_t
@ -131,25 +138,14 @@ namespace zmq
// read, write, error and readwrite // read, write, error and readwrite
WSAEVENT events [4]; WSAEVENT events [4];
}; };
#endif
void trigger_events(const fd_entries_t &fd_entries_, const fds_set_t &local_fds_set_, int event_count_);
#if defined ZMQ_HAVE_WINDOWS
family_entries_t family_entries; family_entries_t family_entries;
// See loop for details. // See loop for details.
family_entries_t::iterator current_family_entry_it; family_entries_t::iterator current_family_entry_it;
bool try_remove_fd_entry (family_entries_t::iterator family_entry_it, bool try_remove_fd_entry (family_entries_t::iterator family_entry_it,
zmq::fd_t &handle_); zmq::fd_t &handle_);
#else
fd_entries_t fd_entries;
fds_set_t fds_set;
fd_t maxfd;
bool retired;
#endif
#if defined ZMQ_HAVE_WINDOWS
static const size_t fd_family_cache_size = 8; static const size_t fd_family_cache_size = 8;
std::pair<fd_t, u_short> fd_family_cache [fd_family_cache_size]; std::pair<fd_t, u_short> fd_family_cache [fd_family_cache_size];
@ -157,7 +153,13 @@ namespace zmq
// Socket's family or AF_UNSPEC on error. // Socket's family or AF_UNSPEC on error.
static u_short determine_fd_family (fd_t fd_); static u_short determine_fd_family (fd_t fd_);
#else
// on non-Windows, we can treat all fds as one family
family_entry_t family_entry;
fd_t maxfd;
bool retired;
#endif #endif
// 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);
@ -170,12 +172,11 @@ namespace zmq
// Handle of the physical thread doing the I/O work. // Handle of the physical thread doing the I/O work.
thread_t worker; thread_t worker;
select_t (const select_t&); select_t (const select_t &);
const select_t &operator = (const select_t&); const select_t &operator= (const select_t &);
}; };
typedef select_t poller_t;
typedef select_t poller_t;
} }
#endif #endif