[ViewVC] Diff of: cvs/libev/ev

Comparing libev/ev_select.c (file contents):
Revision 1.15 by root, Tue Nov 6 00:52:33 2007 UTC vs.
Revision 1.29 by root, Tue May 20 19:26:45 2008 UTC

  * libev select fd activity backend
  *
  * Copyright (c) 2007 Marc Alexander Lehmann <libev@schmorp.de>
  * All rights reserved.
  *
- * Redistribution and use in source and binary forms, with or without
+ * Redistribution and use in source and binary forms, with or without modifica-
- * modification, are permitted provided that the following conditions are
+ * tion, are permitted provided that the following conditions are met:
- * met:
+ *
+ *   1.  Redistributions of source code must retain the above copyright notice,
+ *       this list of conditions and the following disclaimer.
+ *
+ *   2.  Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MER-
+ * CHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+ * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPE-
+ * CIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTH-
+ * ERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *     * Redistributions of source code must retain the above copyright
+ * Alternatively, the contents of this file may be used under the terms of
- *       notice, this list of conditions and the following disclaimer.
+ * the GNU General Public License ("GPL") version 2 or any later version,
- *
+ * in which case the provisions of the GPL are applicable instead of
- *     * Redistributions in binary form must reproduce the above
+ * the above. If you wish to allow the use of your version of this file
- *       copyright notice, this list of conditions and the following
+ * only under the terms of the GPL and not to allow others to use your
- *       disclaimer in the documentation and/or other materials provided
+ * version of this file under the BSD license, indicate your decision
- *       with the distribution.
+ * by deleting the provisions above and replace them with the notice
- *
+ * and other provisions required by the GPL. If you do not delete the
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * provisions above, a recipient may use your version of this file under
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * either the BSD or the GPL.
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-/* for broken bsd's */
+#ifndef _WIN32
-#include <sys/time.h>
-#include <sys/types.h>
-#include <unistd.h>
 /* for unix systems */
-#ifndef WIN32
 # include <sys/select.h>
+# include <inttypes.h>
+#endif
+#ifndef EV_SELECT_USE_FD_SET
+# ifdef NFDBITS
+#  define EV_SELECT_USE_FD_SET 0
+# else
+#  define EV_SELECT_USE_FD_SET 1
+# endif
+#endif
+#if EV_SELECT_IS_WINSOCKET
+# undef EV_SELECT_USE_FD_SET
+# define EV_SELECT_USE_FD_SET 1
+# undef EINTR
+# define EINTR WSAEINTR
+# undef EBADF
+# define EBADF WSAENOTSOCK
+# undef ENOMEM
+# define ENOMEM (errno + 1)
+#endif
+#if !EV_SELECT_USE_FD_SET
+# define NFDBYTES (NFDBITS / 8)
 #endif
 #include <string.h>
-#include <inttypes.h>
 static void
 select_modify (EV_P_ int fd, int oev, int nev)
 {
-  int offs = fd >> 3;
-  int mask = 1 << (fd & 7);
   if (oev == nev)
     return;
-  if (vec_max < (fd >> 5) + 1)
+  {
+#if EV_SELECT_USE_FD_SET
+    #if EV_SELECT_IS_WINSOCKET
+    SOCKET handle = anfds [fd].handle;
+    #else
+    int handle = fd;
+    #endif
+    if (nev & EV_READ)
+      FD_SET (handle, (fd_set *)vec_ri);
+    else
+      FD_CLR (handle, (fd_set *)vec_ri);
+    if (nev & EV_WRITE)
+      FD_SET (handle, (fd_set *)vec_wi);
+    else
+      FD_CLR (handle, (fd_set *)vec_wi);
+#else
+    int     word = fd / NFDBITS;
+    fd_mask mask = 1UL << (fd % NFDBITS);
+    if (expect_false (vec_max <= word))
-    {
+      {
-      int new_max = (fd >> 5) + 1;
+        int new_max = word + 1;
-      vec_ri = (unsigned char *)ev_realloc (vec_ri, new_max * 4);
+        vec_ri = ev_realloc (vec_ri, new_max * NFDBYTES);
-      vec_ro = (unsigned char *)ev_realloc (vec_ro, new_max * 4); /* could free/malloc */
+        vec_ro = ev_realloc (vec_ro, new_max * NFDBYTES); /* could free/malloc */
-      vec_wi = (unsigned char *)ev_realloc (vec_wi, new_max * 4);
+        vec_wi = ev_realloc (vec_wi, new_max * NFDBYTES);
-      vec_wo = (unsigned char *)ev_realloc (vec_wo, new_max * 4); /* could free/malloc */
+        vec_wo = ev_realloc (vec_wo, new_max * NFDBYTES); /* could free/malloc */
-      for (; vec_max < new_max; ++vec_max)
+        for (; vec_max < new_max; ++vec_max)
-        ((uint32_t *)vec_ri)[vec_max] =
+          ((fd_mask *)vec_ri) [vec_max] =
-        ((uint32_t *)vec_wi)[vec_max] = 0;
+          ((fd_mask *)vec_wi) [vec_max] = 0;
-    }
+      }
-  vec_ri [offs] |= mask;
+    ((fd_mask *)vec_ri) [word] |= mask;
-  if (!(nev & EV_READ))
+    if (!(nev & EV_READ))
-    vec_ri [offs] &= ~mask;
+      ((fd_mask *)vec_ri) [word] &= ~mask;
-  vec_wi [offs] |= mask;
+    ((fd_mask *)vec_wi) [word] |= mask;
-  if (!(nev & EV_WRITE))
+    if (!(nev & EV_WRITE))
-    vec_wi [offs] &= ~mask;
+      ((fd_mask *)vec_wi) [word] &= ~mask;
+#endif
+  }
 }
 static void
 select_poll (EV_P_ ev_tstamp timeout)
 {
-  int word, offs;
   struct timeval tv;
   int res;
+#if EV_SELECT_USE_FD_SET
+  memcpy (vec_ro, vec_ri, sizeof (fd_set));
+  memcpy (vec_wo, vec_wi, sizeof (fd_set));
+#else
-  memcpy (vec_ro, vec_ri, vec_max * 4);
+  memcpy (vec_ro, vec_ri, vec_max * NFDBYTES);
-  memcpy (vec_wo, vec_wi, vec_max * 4);
+  memcpy (vec_wo, vec_wi, vec_max * NFDBYTES);
+#endif
   tv.tv_sec  = (long)timeout;
   tv.tv_usec = (long)((timeout - (ev_tstamp)tv.tv_sec) * 1e6);
-  res = select (vec_max * 32, (fd_set *)vec_ro, (fd_set *)vec_wo, 0, &tv);
+  res = select (vec_max * NFDBITS, (fd_set *)vec_ro, (fd_set *)vec_wo, 0, &tv);
-  if (res < 0)
+  if (expect_false (res < 0))
     {
+      #if EV_SELECT_IS_WINSOCKET
+      errno = WSAGetLastError ();
+      #endif
+      #ifdef WSABASEERR
+      /* on windows, select returns incompatible error codes, fix this */
+      if (errno >= WSABASEERR && errno < WSABASEERR + 1000)
+        if (errno == WSAENOTSOCK)
+          errno = EBADF;
+        else
+          errno -= WSABASEERR;
+      #endif
+      #ifdef _WIN32
+      /* select on windows errornously returns EINVAL when no fd sets have been
+       * provided (this is documented). what microsoft doesn't tell you that this bug
+       * exists even when the fd sets are provided, so we have to check for this bug
+       * here and emulate by sleeping manually.
+       * we also get EINVAL when the timeout is invalid, but we ignore this case here
+       * and assume that EINVAL always means: you have to wait manually.
+       */
+      if (errno == EINVAL)
+        {
+          ev_sleep (timeout);
+          return;
+        }
+      #endif
       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;
     }
+#if EV_SELECT_USE_FD_SET
+  {
+    int fd;
+    for (fd = 0; fd < anfdmax; ++fd)
+      if (anfds [fd].events)
+        {
+          int events = 0;
+          #if EV_SELECT_IS_WINSOCKET
+          SOCKET handle = anfds [fd].handle;
+          #else
+          int handle = fd;
+          #endif
+          if (FD_ISSET (handle, (fd_set *)vec_ro)) events |= EV_READ;
+          if (FD_ISSET (handle, (fd_set *)vec_wo)) events |= EV_WRITE;
+          if (expect_true (events))
+            fd_event (EV_A_ fd, events);
+        }
+  }
+#else
+  {
+    int word, bit;
-  for (word = vec_max; word--; )
+    for (word = vec_max; word--; )
-    {
+      {
-      if (((uint32_t *)vec_ro) [word] | ((uint32_t *)vec_wo) [word])
+        fd_mask word_r = ((fd_mask *)vec_ro) [word];
-        for (offs = 4; offs--; )
+        fd_mask word_w = ((fd_mask *)vec_wo) [word];
+        if (word_r || word_w)
+          for (bit = NFDBITS; bit--; )
-          {
+            {
-            int idx = word * 4 + offs;
+              fd_mask mask = 1UL << bit;
-            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;
+              int events = 0;
-                  events |= byte_r & (1 << bit) ? EV_READ  : 0;
+              events |= word_r & mask ? EV_READ  : 0;
-                  events |= byte_w & (1 << bit) ? EV_WRITE : 0;
+              events |= word_w & mask ? EV_WRITE : 0;
-                  if (events)
+              if (expect_true (events))
-                    fd_event (EV_A_ idx * 8 + bit, events);
+                fd_event (EV_A_ word * NFDBITS + bit, events);
-                }
-          }
+            }
-    }
+      }
-}
+  }
-static int
+#endif
+}
+int inline_size
 select_init (EV_P_ int flags)
 {
-  method_fudge  = 1e-2; /* needed to compensate for select returning early, very conservative */
+  backend_fudge  = 0.; /* posix says this is zero */
-  method_modify = select_modify;
+  backend_modify = select_modify;
-  method_poll   = select_poll;
+  backend_poll   = select_poll;
+#if EV_SELECT_USE_FD_SET
+  vec_max = FD_SETSIZE / 32;
+  vec_ri  = ev_malloc (sizeof (fd_set)); FD_ZERO ((fd_set *)vec_ri);
+  vec_ro  = ev_malloc (sizeof (fd_set));
+  vec_wi  = ev_malloc (sizeof (fd_set)); FD_ZERO ((fd_set *)vec_wi);
+  vec_wo  = ev_malloc (sizeof (fd_set));
+#else
   vec_max = 0;
   vec_ri  = 0;
   vec_ri  = 0;
   vec_wo  = 0;
   vec_wo  = 0;
+#endif
-  return EVMETHOD_SELECT;
+  return EVBACKEND_SELECT;
 }
-static void
+void inline_size
 select_destroy (EV_P)
 {
   ev_free (vec_ri);
   ev_free (vec_ro);
   ev_free (vec_wi);

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing libev/ev_select.c (file contents): Revision 1.15 by root, Tue Nov 6 00:52:33 2007 UTC vs. Revision 1.29 by root, Tue May 20 19:26:45 2008 UTC

Diff Legend

Comparing libev/ev_select.c (file contents):
Revision 1.15 by root, Tue Nov 6 00:52:33 2007 UTC vs.
Revision 1.29 by root, Tue May 20 19:26:45 2008 UTC