generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2024-12-12 18:40:27 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2145 from minrk/zmq-poll-repeat

Browse Source 
allow duplicate entries in zmq_poller_poll
This commit is contained in:
Luca Boccassi 2016-09-29 15:36:55 +01:00 committed by GitHub
commit 6c1669371a
2 changed files with 54 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/proxy.cpp
View File

@ -130,15 +130,6 @@ int zmq::proxy (
{ backend_, 0, ZMQ_POLLOUT, 0 } { backend_, 0, ZMQ_POLLOUT, 0 }
}; };
int control_idx = 2;
if (frontend_ == backend_) {
// when frontend & backend are the same,
// avoid duplicate poll entries
qt_poll_items -= 1;
items[1] = items[2];
control_idx = 1;
}
// Proxy can be in these three states // Proxy can be in these three states
enum { enum {
active, active,
@ -163,7 +154,7 @@ int zmq::proxy (
} }
// Process a control command if any // Process a control command if any
if (control_ && items [control_idx].revents & ZMQ_POLLIN) { if (control_ && items [2].revents & ZMQ_POLLIN) {
rc = control_->recv (&msg, 0); rc = control_->recv (&msg, 0);
if (unlikely (rc < 0)) if (unlikely (rc < 0))
return -1; return -1;

66
src/zmq.cpp
View File

@ -753,12 +753,28 @@ inline int zmq_poller_poll (zmq_pollitem_t *items_, int nitems_, long timeout_)
void *poller = zmq_poller_new (); void *poller = zmq_poller_new ();
alloc_assert(poller); alloc_assert(poller);
bool repeat_items = false;
// Register sockets with poller // Register sockets with poller
for (int i = 0; i < nitems_; i++) { for (int i = 0; i < nitems_; i++) {
items_[i].revents = 0; items_[i].revents = 0;
bool modify = false;
short e = items_[i].events;
if (items_[i].socket) { if (items_[i].socket) {
// Poll item is a 0MQ socket. // Poll item is a 0MQ socket.
rc = zmq_poller_add (poller, items_[i].socket, NULL, items_[i].events); for (int j = 0; j < i; ++j) {
// Check for repeat entries
if (items_[j].socket == items_[i].socket) {
repeat_items = true;
modify = true;
e |= items_[j].events;
}
}
if (modify) {
rc = zmq_poller_modify (poller, items_[i].socket, e);
} else {
rc = zmq_poller_add (poller, items_[i].socket, NULL, e);
}
if (rc < 0) { if (rc < 0) {
zmq_poller_destroy (&poller); zmq_poller_destroy (&poller);
delete [] events; delete [] events;
@ -766,7 +782,19 @@ inline int zmq_poller_poll (zmq_pollitem_t *items_, int nitems_, long timeout_)
} }
} else { } else {
// Poll item is a raw file descriptor. // Poll item is a raw file descriptor.
rc = zmq_poller_add_fd (poller, items_[i].fd, NULL, items_[i].events); for (int j = 0; j < i; ++j) {
// Check for repeat entries
if (items_[j].fd == items_[i].fd) {
repeat_items = true;
modify = true;
e |= items_[j].events;
}
}
if (modify) {
rc = zmq_poller_modify_fd (poller, items_[i].fd, e);
} else {
rc = zmq_poller_add_fd (poller, items_[i].fd, NULL, e);
}
if (rc < 0) { if (rc < 0) {
zmq_poller_destroy (&poller); zmq_poller_destroy (&poller);
delete [] events; delete [] events;
@ -786,18 +814,30 @@ inline int zmq_poller_poll (zmq_pollitem_t *items_, int nitems_, long timeout_)
return rc; return rc;
} }
// Transform poller events into zmq_pollitem events // Transform poller events into zmq_pollitem events.
// items_ contains all items, while events only contains fired events. // items_ contains all items, while events only contains fired events.
// The two are still co-ordered, so the step through items // If no sockets are repeated (likely), the two are still co-ordered, so the step through items
// Checking for matches only on the first event // Checking for matches only on the first event.
int found_events = rc; // If there are repeat items, they cannot be assumed to be co-ordered,
for (int i = 0, j = 0; i < nitems_ && j < found_events; i++) { // so each pollitem must check fired events from the beginning.
if ( int j_start = 0, found_events = rc;
(items_[i].socket && items_[i].socket == events[j].socket) || for (int i = 0; i < nitems_; i++) {
(items_[i].fd && items_[i].fd == events[j].fd) for (int j = j_start; j < found_events; ++j) {
) { if (
items_[i].revents = events[j].events; (items_[i].socket && items_[i].socket == events[j].socket) ||
j++; (items_[i].fd && items_[i].fd == events[j].fd)
) {
items_[i].revents = events[j].events & items_[i].events;
if (!repeat_items) {
// no repeats, we can ignore events we've already seen
j_start++;
}
break;
}
if (!repeat_items) {
// no repeats, never have to look at j > j_start
break;
}
} }
} }