*** empty log message ***

[software/libev.git] / ev_select.c

diff --git a/ev_select.c b/ev_select.c
index 7bbf6222fd8c635a6c1c124377c27a8d5134f0a6..9f81e555799180dcca46f4274458be5976942b91 100644 (file)
--- a/ev_select.c
+++ b/ev_select.c
@@ -35,20 +35,22 @@
 #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;


@@ -73,7 +75,7 @@ select_modify (int fd, int oev, int nev)
 }
 
 static void
 }
 
 static void

-select_poll (ev_tstamp timeout)
+select_poll (EV_P_ ev_tstamp timeout)

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


@@ -108,7 +110,7 @@ select_poll (ev_tstamp timeout)
                       events |= byte_w & (1 << bit) ? EV_WRITE : 0;
 
                       if (events)
                       events |= byte_w & (1 << bit) ? EV_WRITE : 0;
 
                       if (events)

-                        fd_event (idx * 8 + bit, events);
+                        fd_event (EV_A_ idx * 8 + bit, events);

                     }
               }
         }
                     }
               }
         }


@@ -116,16 +118,35 @@ select_poll (ev_tstamp timeout)
   else if (res < 0)
     {
       if (errno == EBADF)
   else if (res < 0)
     {
       if (errno == EBADF)

-        fd_recheck ();
+        fd_ebadf (EV_A);
+      else if (errno == ENOMEM)
+        fd_enomem (EV_A);

     }
 }
 
     }
 }
 

-static 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)
+{
+  free (vec_ri);
+  free (vec_ro);
+  free (vec_wi);
+  free (vec_wo);
+}
+
+