Merge pull request #507 from bjoto/master

 LIBZMQ-498 - Remove heap allocations in zmq_poll for small poll item sets

include/zmq.h

@@ -381,6 +381,8 @@ typedef struct
     short revents;
 } zmq_pollitem_t;
 
+#define ZMQ_POLLITEMS_DFLT 16
+
 ZMQ_EXPORT int zmq_poll (zmq_pollitem_t *items, int nitems, long timeout);
 
 /*  Built-in message proxy (3-way) */

src/zmq.cpp

@@ -647,9 +647,13 @@ int zmq_poll (zmq_pollitem_t *items_, int nitems_, long timeout_)
     zmq::clock_t clock;
     uint64_t now = 0;
     uint64_t end = 0;
+    pollfd spollfds[ZMQ_POLLITEMS_DFLT];
+    pollfd *pollfds = spollfds;
 
-    pollfd *pollfds = (pollfd*) malloc (nitems_ * sizeof (pollfd));
+    if (nitems_ > ZMQ_POLLITEMS_DFLT) {
+        pollfds = (pollfd*) malloc (nitems_ * sizeof (pollfd));
         alloc_assert (pollfds);
+    }
 
     //  Build pollset for poll () system call.
     for (int i = 0; i != nitems_; i++) {
@@ -660,6 +664,7 @@ int zmq_poll (zmq_pollitem_t *items_, int nitems_, long timeout_)
             size_t zmq_fd_size = sizeof (zmq::fd_t);
             if (zmq_getsockopt (items_ [i].socket, ZMQ_FD, &pollfds [i].fd,
                 &zmq_fd_size) == -1) {
+                if (pollfds != spollfds)
                     free (pollfds);
                 return -1;
             }
@@ -693,6 +698,7 @@ int zmq_poll (zmq_pollitem_t *items_, int nitems_, long timeout_)
         while (true) {
             int rc = poll (pollfds, nitems_, timeout);
             if (rc == -1 && errno == EINTR) {
+                if (pollfds != spollfds)
                     free (pollfds);
                 return -1;
             }
@@ -711,6 +717,7 @@ int zmq_poll (zmq_pollitem_t *items_, int nitems_, long timeout_)
                 uint32_t zmq_events;
                 if (zmq_getsockopt (items_ [i].socket, ZMQ_EVENTS, &zmq_events,
                     &zmq_events_size) == -1) {
+                    if (pollfds != spollfds)
                         free (pollfds);
                     return -1;
                 }
@@ -771,6 +778,7 @@ int zmq_poll (zmq_pollitem_t *items_, int nitems_, long timeout_)
             break;
     }
 
+    if (pollfds != spollfds)
         free (pollfds);
     return nevents;