0
0
mirror of https://github.com/zeromq/libzmq.git synced 2024-12-29 08:39:42 +08:00

only compare FD when neither item is a zmq socket

This commit is contained in:
Min RK 2016-12-15 14:05:40 +01:00
parent 02a6079968
commit 0abdc28c84

View File

@ -834,7 +834,7 @@ inline int zmq_poller_poll (zmq_pollitem_t *items_, int nitems_, long timeout_)
for (int j = j_start; j < found_events; ++j) { for (int j = j_start; j < found_events; ++j) {
if ( if (
(items_[i].socket && items_[i].socket == events[j].socket) || (items_[i].socket && items_[i].socket == events[j].socket) ||
(!items_[i].socket && items_[i].fd == events[j].fd) (!(items_[i].socket || events[j].socket) && items_[i].fd == events[j].fd)
) { ) {
items_[i].revents = events[j].events & items_[i].events; items_[i].revents = events[j].events & items_[i].events;
if (!repeat_items) { if (!repeat_items) {