Linux: stop libevent from pre-allocating huge arrays.

third_party/libevent/epoll.c

 /*
  * 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
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 76 matching lines @@
 
 #ifdef HAVE_SETFD
 #define FD_CLOSEONEXEC(x) do { \
         if (fcntl(x, F_SETFD, 1) == -1) \
                 event_warn("fcntl(%d, F_SETFD)", x); \
 } while (0)
 #else
 #define FD_CLOSEONEXEC(x)
 #endif
 
-#define NEVENT  32000
+#define NEVENT  32
 
 /* On Linux kernels at least up to 2.6.24.4, epoll can't handle timeout
  * values bigger than (LONG_MAX - 999ULL)/HZ.  HZ in the wild can be
  * as big as 1000, and LONG_MAX can be as small as (1<<31)-1, so the
  * largest number of msec we can support here is 2147482.  Let's
  * round that down by 47 seconds.
  */
 #define MAX_EPOLL_TIMEOUT_MSEC (35*60*1000)
 
 static void *
 epoll_init(struct event_base *base)
 {
         int epfd, nfiles = NEVENT;
         struct rlimit rl;
         struct epollop *epollop;
 
         /* Disable epollueue when this environment variable is set */
         if (getenv("EVENT_NOEPOLL"))
                 return (NULL);
 
-        if (getrlimit(RLIMIT_NOFILE, &rl) == 0 &&
-            rl.rlim_cur != RLIM_INFINITY) {
-                /*
-                 * Solaris is somewhat retarded - it's important to drop
-                 * backwards compatibility when making changes.  So, don't
-                 * dare to put rl.rlim_cur here.
-                 */
-                nfiles = rl.rlim_cur - 1;
-        }
-
         /* Initalize the kernel queue */
 
         if ((epfd = epoll_create(nfiles)) == -1) {
                 if (errno != ENOSYS)
                         event_warn("epoll_create");
                 return (NULL);
         }
 
         FD_CLOSEONEXEC(epfd);
 
@@ skipping 81 matching lines @@
                 evsignal_process(base);
         }
 
         event_debug(("%s: epoll_wait reports %d", __func__, res));
 
         for (i = 0; i < res; i++) {
                 int what = events[i].events;
                 struct event *evread = NULL, *evwrite = NULL;
                 int fd = events[i].data.fd;
 
-                if (fd < 0 && fd >= epollop->nfds)
+                if (fd < 0 || fd >= epollop->nfds)
                         continue;
                 evep = &epollop->fds[fd];
 
                 if (what & (EPOLLHUP|EPOLLERR)) {
                         evread = evep->evread;
                         evwrite = evep->evwrite;
                 } else {
                         if (what & EPOLLIN) {
                                 evread = evep->evread;
                         }
@@ skipping 124 matching lines @@
         if (epollop->fds)
                 free(epollop->fds);
         if (epollop->events)
                 free(epollop->events);
         if (epollop->epfd >= 0)
                 close(epollop->epfd);
 
         memset(epollop, 0, sizeof(struct epollop));
         free(epollop);
 }