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

Problem: code duplication within socket_poller_t

Browse Source 
Solution: remove duplicated code
This commit is contained in:
Simon Giesecke 2018-06-01 16:40:47 +02:00
parent 74d3d8421f
commit 4a651251a7
1 changed files with 6 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/socket_poller.cpp
View File

@ -42,10 +42,7 @@ static bool is_thread_safe (zmq::socket_base_t &socket_)
zmq::socket_poller_t::socket_poller_t () : zmq::socket_poller_t::socket_poller_t () :
_tag (0xCAFEBABE), _tag (0xCAFEBABE),
_signaler (NULL), _signaler (NULL)
_need_rebuild (true),
_use_signaler (false),
_pollset_size (0)
#if defined ZMQ_POLL_BASED_ON_POLL #if defined ZMQ_POLL_BASED_ON_POLL
, ,
_pollfds (NULL) _pollfds (NULL)
@ -54,20 +51,7 @@ zmq::socket_poller_t::socket_poller_t () :
_max_fd (0) _max_fd (0)
#endif #endif
{ {
#if defined ZMQ_POLL_BASED_ON_SELECT rebuild ();
#if defined ZMQ_HAVE_WINDOWS
// On Windows fd_set contains array of SOCKETs, each 4 bytes.
// For large fd_sets memset() could be expensive and it is unnecessary.
// It is enough to set fd_count to 0, exactly what FD_ZERO() macro does.
FD_ZERO (&_pollset_in);
FD_ZERO (&_pollset_out);
FD_ZERO (&_pollset_err);
#else
memset (&_pollset_in, 0, sizeof (_pollset_in));
memset (&_pollset_out, 0, sizeof (_pollset_out));
memset (&_pollset_err, 0, sizeof (_pollset_err));
#endif
#endif
} }
zmq::socket_poller_t::~socket_poller_t () zmq::socket_poller_t::~socket_poller_t ()
@ -271,6 +255,10 @@ int zmq::socket_poller_t::remove_fd (fd_t fd_)
void zmq::socket_poller_t::rebuild () void zmq::socket_poller_t::rebuild ()
{ {
_use_signaler = false;
_pollset_size = 0;
_need_rebuild = false;
#if defined ZMQ_POLL_BASED_ON_POLL #if defined ZMQ_POLL_BASED_ON_POLL
if (_pollfds) { if (_pollfds) {
@ -278,10 +266,6 @@ void zmq::socket_poller_t::rebuild ()
_pollfds = NULL; _pollfds = NULL;
} }
_use_signaler = false;
_pollset_size = 0;
for (items_t::iterator it = _items.begin (); it != _items.end (); ++it) { for (items_t::iterator it = _items.begin (); it != _items.end (); ++it) {
if (it->events) { if (it->events) {
if (it->socket && is_thread_safe (*it->socket)) { if (it->socket && is_thread_safe (*it->socket)) {
@ -342,10 +326,6 @@ void zmq::socket_poller_t::rebuild ()
// file descriptors. // file descriptors.
zmq_assert (_items.size () <= FD_SETSIZE); zmq_assert (_items.size () <= FD_SETSIZE);
_pollset_size = 0;
_use_signaler = false;
for (items_t::iterator it = _items.begin (); it != _items.end (); ++it) { for (items_t::iterator it = _items.begin (); it != _items.end (); ++it) {
if (it->socket && is_thread_safe (*it->socket) && it->events) { if (it->socket && is_thread_safe (*it->socket) && it->events) {
_use_signaler = true; _use_signaler = true;
@ -395,8 +375,6 @@ void zmq::socket_poller_t::rebuild ()
} }
#endif #endif
_need_rebuild = false;
} }
void zmq::socket_poller_t::zero_trail_events ( void zmq::socket_poller_t::zero_trail_events (