generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-10-15 15:16:52 +02:00
Code Issues Projects Releases Wiki Activity

add n_events argument to zmq_poller_wait_all

Browse Source 
avoids unnecessary heap allocations, races on the number of items
This commit is contained in:
Min RK
2016-09-27 14:08:02 +02:00
parent 187b4bff48
commit de7fc1fcf8
5 changed files with 15 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/socket_poller.cpp
View File

@@ -380,7 +380,7 @@ int zmq::socket_poller_t::rebuild ()
return 0;
}
int zmq::socket_poller_t::wait (zmq::socket_poller_t::event_t *events_, long timeout_)
int zmq::socket_poller_t::wait (zmq::socket_poller_t::event_t *events_, int n_events_, long timeout_)
{
if (need_rebuild)
if (rebuild () == -1)
@@ -441,7 +441,7 @@ int zmq::socket_poller_t::wait (zmq::socket_poller_t::event_t *events_, long tim
// Check for the events.
int i=0;
for (items_t::iterator it = items.begin (); it != items.end (); ++i, ++it) {
for (items_t::iterator it = items.begin (); it != items.end () && i < n_events_; ++i, ++it) {
events_[i].socket = NULL;
events_[i].fd = 0;