X-Git-Url: https://git.llucax.com/software/libev.git/blobdiff_plain/1b109e5d8b0948a2e7151b3820f1c4784cafeece..34a787b55768ddae6645862dc60434188e1fad8d:/ev_epoll.c

diff --git a/ev_epoll.c b/ev_epoll.c
index f0a9678..a7918af 100644
--- a/ev_epoll.c
+++ b/ev_epoll.c
@@ -1,4 +1,6 @@
 /*
+ * libev epoll fd activity backend
+ *
  * Copyright (c) 2007 Marc Alexander Lehmann <libev@schmorp.de>
  * All rights reserved.
  *
@@ -37,7 +39,7 @@ epoll_modify (int fd, int oev, int nev)
   int mode = nev ? oev ? EPOLL_CTL_MOD : EPOLL_CTL_ADD : EPOLL_CTL_DEL;
 
   struct epoll_event ev;
-  ev.data.fd = fd;
+  ev.data.u64 = fd; /* use u64 to fully initialise the struct, for nicer strace etc. */
   ev.events =
       (nev & EV_READ ? EPOLLIN : 0)
       | (nev & EV_WRITE ? EPOLLOUT : 0);
@@ -73,16 +75,16 @@ epoll_poll (ev_tstamp timeout)
 
   for (i = 0; i < eventcnt; ++i)
     fd_event (
-      events [i].data.fd,
+      events [i].data.u64,
       (events [i].events & (EPOLLOUT | EPOLLERR | EPOLLHUP) ? EV_WRITE : 0)
       | (events [i].events & (EPOLLIN | EPOLLERR | EPOLLHUP) ? EV_READ : 0)
     );
 
   /* if the receive array was full, increase its size */
-  if (eventcnt == eventmax)
+  if (expect_false (eventcnt == eventmax))
     {
       free (events);
-      eventmax += eventmax >> 1;
+      eventmax = array_roundsize (events, eventmax << 1);
       events = malloc (sizeof (struct epoll_event) * eventmax);
     }
 }