*** empty log message ***

[software/libev.git] / ev_select.c

diff --git a/ev_select.c b/ev_select.c
index 46a77e208c06870d411f3cb50fdbcbc5cfa326fe..e3e79ca12e6018a224647f46ed2ff500b71f9c4f 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,28 +35,30 @@
 #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>
 

-static unsigned char *vec_ri, *vec_ro, *vec_wi, *vec_wo;
-static int vec_max;
-

 static void
 static void

-select_modify (int fd, int oev, int nev)
+select_modify (EV_P_ int fd, int oev, int nev)

 {
   int offs = fd >> 3;
   int mask = 1 << (fd & 7);
 
 {
   int offs = fd >> 3;
   int mask = 1 << (fd & 7);
 

+  if (oev == nev)
+    return;
+

   if (vec_max < (fd >> 5) + 1)
     {
       int new_max = (fd >> 5) + 1;
 
   if (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 *)ev_realloc (vec_ri, new_max * 4);
+      vec_ro = (unsigned char *)ev_realloc (vec_ro, new_max * 4); /* could free/malloc */
+      vec_wi = (unsigned char *)ev_realloc (vec_wi, new_max * 4);
+      vec_wo = (unsigned char *)ev_realloc (vec_wo, new_max * 4); /* could free/malloc */

 
       for (; vec_max < new_max; ++vec_max)
         ((uint32_t *)vec_ri)[vec_max] =
 
       for (; vec_max < new_max; ++vec_max)
         ((uint32_t *)vec_ri)[vec_max] =


@@ -70,8 +74,10 @@ 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_P_ ev_tstamp timeout)

 {
 {

+  int word, offs;

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


@@ -83,46 +89,65 @@ static void select_poll (ev_tstamp timeout)
 
   res = select (vec_max * 32, (fd_set *)vec_ro, (fd_set *)vec_wo, 0, &tv);
 
 
   res = select (vec_max * 32, (fd_set *)vec_ro, (fd_set *)vec_wo, 0, &tv);
 

-  if (res > 0)
+  if (res < 0)

     {
     {

-      int word, offs;
-
-      for (word = vec_max; word--; )
-        {
-          if (((uint32_t *)vec_ro) [word] | ((uint32_t *)vec_wo) [word])
-            for (offs = 4; offs--; )
-              {
-                int idx = word * 4 + offs;
-                unsigned char byte_r = vec_ro [idx];
-                unsigned char byte_w = vec_wo [idx];
-                int bit;
-
-                if (byte_r | byte_w)
-                  for (bit = 8; bit--; )
-                    {
-                      int events = 0;
-                      events |= byte_r & (1 << bit) ? EV_READ  : 0;
-                      events |= byte_w & (1 << bit) ? EV_WRITE : 0;
-
-                      if (events)
-                        fd_event (idx * 8 + bit, events);
-                    }
-              }
-        }
+      if (errno == EBADF)
+        fd_ebadf (EV_A);
+      else if (errno == ENOMEM && !syserr_cb)
+        fd_enomem (EV_A);
+      else if (errno != EINTR)
+        syserr ("(libev) select");
+
+      return;

     }
     }

-  else if (res < 0)
+
+  for (word = vec_max; word--; )

     {
     {

-      if (errno == EBADF)
-        fd_recheck ();
+      if (((uint32_t *)vec_ro) [word] | ((uint32_t *)vec_wo) [word])
+        for (offs = 4; offs--; )
+          {
+            int idx = word * 4 + offs;
+            unsigned char byte_r = vec_ro [idx];
+            unsigned char byte_w = vec_wo [idx];
+            int bit;
+
+            if (byte_r | byte_w)
+              for (bit = 8; bit--; )
+                {
+                  int events = 0;
+                  events |= byte_r & (1 << bit) ? EV_READ  : 0;
+                  events |= byte_w & (1 << bit) ? EV_WRITE : 0;
+
+                  if (events)
+                    fd_event (EV_A_ idx * 8 + bit, events);
+                }
+          }

     }
 }
 
     }
 }
 

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

 {
 {

-  ev_method     = EVMETHOD_SELECT;

   method_fudge  = 1e-2; /* needed to compensate for select returning early, very conservative */
   method_modify = select_modify;
   method_poll   = select_poll;
   method_fudge  = 1e-2; /* needed to compensate for select returning early, very conservative */
   method_modify = select_modify;
   method_poll   = select_poll;

+
+  vec_max = 0;
+  vec_ri  = 0; 
+  vec_ri  = 0;   
+  vec_wo  = 0; 
+  vec_wo  = 0; 
+
+  return EVMETHOD_SELECT;
+}
+
+static void
+select_destroy (EV_P)
+{
+  ev_free (vec_ri);
+  ev_free (vec_ro);
+  ev_free (vec_wi);
+  ev_free (vec_wo);

 }
 
 
 }