[ViewVC] Diff of: cvs/libev/ev

Comparing libev/ev_select.c (file contents):
Revision 1.22 by root, Fri Nov 23 05:13:49 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.
  */
 #ifndef _WIN32
 /* for unix systems */
 # include <sys/select.h>
     else
       FD_CLR (handle, (fd_set *)vec_wi);
 #else
-    int word = fd / NFDBITS;
+    int     word = fd / NFDBITS;
-    int mask = 1UL << (fd % NFDBITS);
+    fd_mask mask = 1UL << (fd % NFDBITS);
-    if (vec_max < word + 1)
+    if (expect_false (vec_max <= word))
       {
         int new_max = word + 1;
         vec_ri = ev_realloc (vec_ri, new_max * NFDBYTES);
         vec_ro = ev_realloc (vec_ro, new_max * NFDBYTES); /* could free/malloc */
         vec_wi = ev_realloc (vec_wi, new_max * NFDBYTES);
         vec_wo = ev_realloc (vec_wo, new_max * NFDBYTES); /* could free/malloc */
         for (; vec_max < new_max; ++vec_max)
-          ((fd_mask *)vec_ri)[vec_max] =
+          ((fd_mask *)vec_ri) [vec_max] =
-          ((fd_mask *)vec_wi)[vec_max] = 0;
+          ((fd_mask *)vec_wi) [vec_max] = 0;
       }
     ((fd_mask *)vec_ri) [word] |= mask;
     if (!(nev & EV_READ))
       ((fd_mask *)vec_ri) [word] &= ~mask;
   tv.tv_sec  = (long)timeout;
   tv.tv_usec = (long)((timeout - (ev_tstamp)tv.tv_sec) * 1e6);
   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)
           #endif
           if (FD_ISSET (handle, (fd_set *)vec_ro)) events |= EV_READ;
           if (FD_ISSET (handle, (fd_set *)vec_wo)) events |= EV_WRITE;
-          if (events)
+          if (expect_true (events))
             fd_event (EV_A_ fd, events);
         }
   }
 #else
               int events = 0;
               events |= word_r & mask ? EV_READ  : 0;
               events |= word_w & mask ? EV_WRITE : 0;
-              if (events)
+              if (expect_true (events))
                 fd_event (EV_A_ word * NFDBITS + bit, events);
             }
       }
   }
 #endif
 }
-static int
+int inline_size
 select_init (EV_P_ int flags)
 {
-  backend_fudge  = 1e-2; /* needed to compensate for select returning early, very conservative */
+  backend_fudge  = 0.; /* posix says this is zero */
   backend_modify = select_modify;
   backend_poll   = select_poll;
 #if EV_SELECT_USE_FD_SET
   vec_max = FD_SETSIZE / 32;
 #endif
   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.22 by root, Fri Nov 23 05:13:49 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.22 by root, Fri Nov 23 05:13:49 2007 UTC vs.
Revision 1.29 by root, Tue May 20 19:26:45 2008 UTC