posix: upgrade libevent from 1.4.7 to 1.4.13

third_party/libevent/poll.c

 /*      $OpenBSD: poll.c,v 1.2 2002/06/25 15:50:15 mickey Exp $ */
 
 /*
  * Copyright 2000-2003 Niels Provos <provos@citi.umich.edu>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
@@ skipping 16 matching lines @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 #include <sys/types.h>
 #ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
 #else
-#include <sys/_time.h>
+#include <sys/_libevent_time.h>
 #endif
 #include <sys/queue.h>
 #include <poll.h>
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include <errno.h>
 #ifdef CHECK_INVARIANTS
@@ skipping 32 matching lines @@
         poll_dealloc,
     0
 };
 
 static void *
 poll_init(struct event_base *base)
 {
         struct pollop *pollop;
 
         /* Disable poll when this environment variable is set */
-        if (getenv("EVENT_NOPOLL"))
+        if (evutil_getenv("EVENT_NOPOLL"))
                 return (NULL);
 
         if (!(pollop = calloc(1, sizeof(struct pollop))))
                 return (NULL);
 
         evsignal_init(base);
 
         return (pollop);
 }
 
@@ skipping 27 matching lines @@
                 assert(pop->idxplus1_by_fd[pfd->fd] == i+1);
         }
 }
 #else
 #define poll_check_ok(pop)
 #endif
 
 static int
 poll_dispatch(struct event_base *base, void *arg, struct timeval *tv)
 {
-        int res, i, msec = -1, nfds;
+        int res, i, j, msec = -1, nfds;
         struct pollop *pop = arg;
 
         poll_check_ok(pop);
 
         if (tv != NULL)
                 msec = tv->tv_sec * 1000 + (tv->tv_usec + 999) / 1000;
 
         nfds = pop->nfds;
         res = poll(pop->event_set, nfds, msec);
 
         if (res == -1) {
                 if (errno != EINTR) {
                         event_warn("poll");
                         return (-1);
                 }
 
                 evsignal_process(base);
                 return (0);
         } else if (base->sig.evsignal_caught) {
                 evsignal_process(base);
         }
 
         event_debug(("%s: poll reports %d", __func__, res));
 
-        if (res == 0)
+        if (res == 0 || nfds == 0)
                 return (0);
 
-        for (i = 0; i < nfds; i++) {
-                int what = pop->event_set[i].revents;
+        i = random() % nfds;
+        for (j = 0; j < nfds; j++) {
                 struct event *r_ev = NULL, *w_ev = NULL;
+                int what;
+                if (++i == nfds)
+                        i = 0;
+                what = pop->event_set[i].revents;
+
                 if (!what)
                         continue;
 
                 res = 0;
 
                 /* If the file gets closed notify */
                 if (what & (POLLHUP|POLLERR))
                         what |= POLLIN|POLLOUT;
                 if (what & POLLIN) {
                         res |= EV_READ;
@@ skipping 186 matching lines @@
         if (pop->event_r_back)
                 free(pop->event_r_back);
         if (pop->event_w_back)
                 free(pop->event_w_back);
         if (pop->idxplus1_by_fd)
                 free(pop->idxplus1_by_fd);
 
         memset(pop, 0, sizeof(struct pollop));
         free(pop);
 }