posix: upgrade libevent from 1.4.7 to 1.4.13

third_party/libevent/select.c

 /*      $OpenBSD: select.c,v 1.2 2002/06/25 15:50:15 mickey Exp $       */
 
 /*
  * Copyright 2000-2002 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
 #ifdef HAVE_SYS_SELECT_H
 #include <sys/select.h>
 #endif
 #include <sys/queue.h>
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include <errno.h>
 #ifdef CHECK_INVARIANTS
 #include <assert.h>
 #endif
 
 #include "event.h"
+#include "evutil.h"
 #include "event-internal.h"
 #include "evsignal.h"
 #include "log.h"
 
 #ifndef howmany
 #define        howmany(x, y)   (((x)+((y)-1))/(y))
 #endif
 
+#ifndef _EVENT_HAVE_FD_MASK
+/* This type is mandatory, but Android doesn't define it. */
+#undef NFDBITS
+#define NFDBITS (sizeof(long)*8)
+typedef unsigned long fd_mask;
+#endif
+
 struct selectop {
         int event_fds;          /* Highest fd in fd set */
         int event_fdsz;
         fd_set *event_readset_in;
         fd_set *event_writeset_in;
         fd_set *event_readset_out;
         fd_set *event_writeset_out;
         struct event **event_r_by_fd;
         struct event **event_w_by_fd;
 };
@@ skipping 15 matching lines @@
 };
 
 static int select_resize(struct selectop *sop, int fdsz);
 
 static void *
 select_init(struct event_base *base)
 {
         struct selectop *sop;
 
         /* Disable select when this environment variable is set */
-        if (getenv("EVENT_NOSELECT"))
+        if (evutil_getenv("EVENT_NOSELECT"))
                 return (NULL);
 
         if (!(sop = calloc(1, sizeof(struct selectop))))
                 return (NULL);
 
         select_resize(sop, howmany(32 + 1, NFDBITS)*sizeof(fd_mask));
 
         evsignal_init(base);
 
         return (sop);
@@ skipping 22 matching lines @@
         }
 
 }
 #else
 #define check_selectop(sop) do { (void) sop; } while (0)
 #endif
 
 static int
 select_dispatch(struct event_base *base, void *arg, struct timeval *tv)
 {
-        int res, i;
+        int res, i, j;
         struct selectop *sop = arg;
 
         check_selectop(sop);
 
         memcpy(sop->event_readset_out, sop->event_readset_in,
                sop->event_fdsz);
         memcpy(sop->event_writeset_out, sop->event_writeset_in,
                sop->event_fdsz);
 
         res = select(sop->event_fds + 1, sop->event_readset_out,
             sop->event_writeset_out, NULL, tv);
 
         check_selectop(sop);
 
         if (res == -1) {
                 if (errno != EINTR) {
                         event_warn("select");
                         return (-1);
                 }
 
                 evsignal_process(base);
                 return (0);
         } else if (base->sig.evsignal_caught) {
                 evsignal_process(base);
         }
 
         event_debug(("%s: select reports %d", __func__, res));
 
         check_selectop(sop);
-        for (i = 0; i <= sop->event_fds; ++i) {
+        i = random() % (sop->event_fds+1);
+        for (j = 0; j <= sop->event_fds; ++j) {
                 struct event *r_ev = NULL, *w_ev = NULL;
+                if (++i >= sop->event_fds+1)
+                        i = 0;
+
                 res = 0;
                 if (FD_ISSET(i, sop->event_readset_out)) {
                         r_ev = sop->event_r_by_fd[i];
                         res |= EV_READ;
                 }
                 if (FD_ISSET(i, sop->event_writeset_out)) {
                         w_ev = sop->event_w_by_fd[i];
                         res |= EV_WRITE;
                 }
                 if (r_ev && (res & r_ev->ev_events)) {
@@ skipping 161 matching lines @@
         if (sop->event_writeset_out)
                 free(sop->event_writeset_out);
         if (sop->event_r_by_fd)
                 free(sop->event_r_by_fd);
         if (sop->event_w_by_fd)
                 free(sop->event_w_by_fd);
 
         memset(sop, 0, sizeof(struct selectop));
         free(sop);
 }