beginners mistake

diff --git a/ev.c b/ev.c
index 246b38ff75b8aa5c13ac29249d8fcf3948fb807e..e36f182ea573bdff48fe559f58e62f1e4decc9ca 100644 (file)
--- a/ev.c
+++ b/ev.c
@@ -41,8 +41,6 @@
 #include <sys/time.h>
 #include <time.h>
 
 #include <sys/time.h>
 #include <time.h>
 

-#define HAVE_EPOLL 1
-

 #ifndef HAVE_MONOTONIC
 # ifdef CLOCK_MONOTONIC
 #  define HAVE_MONOTONIC 1
 #ifndef HAVE_MONOTONIC
 # ifdef CLOCK_MONOTONIC
 #  define HAVE_MONOTONIC 1


@@ -190,6 +188,19 @@ queue_events (W *events, int eventcnt, int type)
     event (events [i], type);
 }
 
     event (events [i], type);
 }
 

+/* called on EBADF to verify fds */
+static void
+fd_recheck ()
+{
+  int fd;
+
+  for (fd = 0; fd < anfdmax; ++fd)
+    if (anfds [fd].wev)
+      if (fcntl (fd, F_GETFD) == -1 && errno == EBADF)
+        while (anfds [fd].head)
+          evio_stop (anfds [fd].head);
+}
+

 /*****************************************************************************/
 
 static struct ev_timer **timers;
 /*****************************************************************************/
 
 static struct ev_timer **timers;

diff --git a/ev_select.c b/ev_select.c
index 1262f48659bc5d21f0c8f4b2381492cd8c62a192..46a77e208c06870d411f3cb50fdbcbc5cfa326fe 100644 (file)
--- a/ev_select.c
+++ b/ev_select.c
@@ -49,12 +49,16 @@ select_modify (int fd, int oev, int nev)
 
   if (vec_max < (fd >> 5) + 1)
     {
 
   if (vec_max < (fd >> 5) + 1)
     {

-      vec_max = (fd >> 5) + 1;
+      int new_max = (fd >> 5) + 1;

 
 

-      vec_ri = (unsigned char *)realloc (vec_ri, vec_max * 4);
-      vec_ro = (unsigned char *)realloc (vec_ro, vec_max * 4); /* could free/malloc */
-      vec_wi = (unsigned char *)realloc (vec_wi, vec_max * 4);
-      vec_wo = (unsigned char *)realloc (vec_wo, vec_max * 4); /* could free/malloc */
+      vec_ri = (unsigned char *)realloc (vec_ri, new_max * 4);
+      vec_ro = (unsigned char *)realloc (vec_ro, new_max * 4); /* could free/malloc */
+      vec_wi = (unsigned char *)realloc (vec_wi, new_max * 4);
+      vec_wo = (unsigned char *)realloc (vec_wo, new_max * 4); /* could free/malloc */
+
+      for (; vec_max < new_max; ++vec_max)
+        ((uint32_t *)vec_ri)[vec_max] =
+        ((uint32_t *)vec_wi)[vec_max] = 0;

     }
 
   vec_ri [offs] |= mask;
     }
 
   vec_ri [offs] |= mask;


@@ -106,6 +110,11 @@ static void select_poll (ev_tstamp timeout)
               }
         }
     }
               }
         }
     }

+  else if (res < 0)
+    {
+      if (errno == EBADF)
+        fd_recheck ();
+    }

 }
 
 void select_init (int flags)
 }
 
 void select_init (int flags)