*** empty log message ***

[software/libev.git] / ev_select.c

diff --git a/ev_select.c b/ev_select.c
index 1262f48659bc5d21f0c8f4b2381492cd8c62a192..a0db3b6430cef3a115abce8906965fd901d1310b 100644 (file)
--- a/ev_select.c
+++ b/ev_select.c
@@ -1,4 +1,6 @@
 /*
 /*

+ * libev select fd activity backend
+ *

  * Copyright (c) 2007 Marc Alexander Lehmann <libev@schmorp.de>
  * All rights reserved.
  *
  * Copyright (c) 2007 Marc Alexander Lehmann <libev@schmorp.de>
  * All rights reserved.
  *


@@ -33,7 +35,9 @@
 #include <unistd.h>
 
 /* for unix systems */
 #include <unistd.h>
 
 /* for unix systems */

-#include <sys/select.h>
+#ifndef WIN32
+# include <sys/select.h>
+#endif

 
 #include <string.h>
 #include <inttypes.h>
 
 #include <string.h>
 #include <inttypes.h>


@@ -49,12 +53,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, 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 */

 
 

-      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 */
+      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;


@@ -66,7 +74,8 @@ select_modify (int fd, int oev, int nev)
     vec_wi [offs] &= ~mask;
 }
 
     vec_wi [offs] &= ~mask;
 }
 

-static void select_poll (ev_tstamp timeout)
+static void
+select_poll (ev_tstamp timeout)

 {
   struct timeval tv;
   int res;
 {
   struct timeval tv;
   int res;


@@ -106,9 +115,17 @@ static void select_poll (ev_tstamp timeout)
               }
         }
     }
               }
         }
     }

+  else if (res < 0)
+    {
+      if (errno == EBADF)
+        fd_ebadf ();
+      else if (errno == ENOMEM)
+        fd_enomem ();
+    }

 }
 
 }
 

-void select_init (int flags)
+static void
+select_init (int flags)

 {
   ev_method     = EVMETHOD_SELECT;
   method_fudge  = 1e-2; /* needed to compensate for select returning early, very conservative */
 {
   ev_method     = EVMETHOD_SELECT;
   method_fudge  = 1e-2; /* needed to compensate for select returning early, very conservative */


@@ -116,4 +133,3 @@ void select_init (int flags)
   method_poll   = select_poll;
 }
 
   method_poll   = select_poll;
 }
 

-