[ViewVC] Diff of: cvs/libev/ev

Comparing libev/ev_select.c (file contents):
Revision 1.33 by root, Mon May 26 04:14:32 2008 UTC vs.
Revision 1.54 by root, Fri Jun 3 00:04:52 2011 UTC

 /*
  * libev select fd activity backend
  *
- * Copyright (c) 2007,2008 Marc Alexander Lehmann <libev@schmorp.de>
+ * Copyright (c) 2007,2008,2009,2010,2011 Marc Alexander Lehmann <libev@schmorp.de>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modifica-
  * tion, are permitted provided that the following conditions are 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,
  * either the BSD or the GPL.
  */
 #ifndef _WIN32
 /* for unix systems */
-# include <sys/select.h>
 # include <inttypes.h>
+# ifndef __hpux
+/* for REAL unix systems */
+#  include <sys/select.h>
+# endif
 #endif
 #ifndef EV_SELECT_USE_FD_SET
 # ifdef NFDBITS
 #  define EV_SELECT_USE_FD_SET 0
 #endif
 #if EV_SELECT_IS_WINSOCKET
 # undef EV_SELECT_USE_FD_SET
 # define EV_SELECT_USE_FD_SET 1
+# undef NFDBITS
+# define NFDBITS 0
 #endif
 #if !EV_SELECT_USE_FD_SET
 # define NFDBYTES (NFDBITS / 8)
 #endif
     SOCKET handle = anfds [fd].handle;
     #else
     int handle = fd;
     #endif
+    assert (("libev: fd >= FD_SETSIZE passed to fd_set-based select backend", fd < FD_SETSIZE));
+    /* FD_SET is broken on windows (it adds the fd to a set twice or more,
+     * which eventually leads to overflows). Need to call it only on changes.
+     */
+    #if EV_SELECT_IS_WINSOCKET
+    if ((oev ^ nev) & EV_READ)
+    #endif
-    if (nev & EV_READ)
+      if (nev & EV_READ)
-      FD_SET (handle, (fd_set *)vec_ri);
+        FD_SET (handle, (fd_set *)vec_ri);
-    else
+      else
-      FD_CLR (handle, (fd_set *)vec_ri);
+        FD_CLR (handle, (fd_set *)vec_ri);
+    #if EV_SELECT_IS_WINSOCKET
+    if ((oev ^ nev) & EV_WRITE)
+    #endif
-    if (nev & EV_WRITE)
+      if (nev & EV_WRITE)
-      FD_SET (handle, (fd_set *)vec_wi);
+        FD_SET (handle, (fd_set *)vec_wi);
-    else
+      else
-      FD_CLR (handle, (fd_set *)vec_wi);
+        FD_CLR (handle, (fd_set *)vec_wi);
 #else
     int     word = fd / NFDBITS;
     fd_mask mask = 1UL << (fd % NFDBITS);
 {
   struct timeval tv;
   int res;
   int fd_setsize;
-  tv.tv_sec  = (long)timeout;
+  EV_RELEASE_CB;
-  tv.tv_usec = (long)((timeout - (ev_tstamp)tv.tv_sec) * 1e6);
+  EV_TV_SET (tv, timeout);
 #if EV_SELECT_USE_FD_SET
   fd_setsize = sizeof (fd_set);
 #else
   fd_setsize = vec_max * NFDBYTES;
    * errors to be reported as an exception and not by setting
    * the writable bit. this is so uncontrollably lame.
    */
   memcpy (vec_eo, vec_wi, fd_setsize);
   res = select (vec_max * NFDBITS, (fd_set *)vec_ro, (fd_set *)vec_wo, (fd_set *)vec_eo, &tv);
+#elif EV_SELECT_USE_FD_SET
+  fd_setsize = anfdmax < FD_SETSIZE ? anfdmax : FD_SETSIZE;
+  res = select (fd_setsize, (fd_set *)vec_ro, (fd_set *)vec_wo, 0, &tv);
 #else
   res = select (vec_max * NFDBITS, (fd_set *)vec_ro, (fd_set *)vec_wo, 0, &tv);
 #endif
+  EV_ACQUIRE_CB;
   if (expect_false (res < 0))
     {
       #if EV_SELECT_IS_WINSOCKET
       errno = WSAGetLastError ();
         else
           errno -= WSABASEERR;
       #endif
       #ifdef _WIN32
-      /* select on windows errornously returns EINVAL when no fd sets have been
+      /* select on windows erroneously 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
+       * 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);
+          if (timeout)
+            {
+              unsigned long ms = timeout * 1e3;
+              Sleep (ms ? ms : 1);
+            }
           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");
+        ev_syserr ("(libev) select");
       return;
     }
 #if EV_SELECT_USE_FD_SET
 }
 int inline_size
 select_init (EV_P_ int flags)
 {
-  backend_fudge  = 0.; /* posix says this is zero */
+  backend_fudge  = 1e-6;
   backend_modify = select_modify;
   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));
   #ifdef _WIN32
   vec_eo  = ev_malloc (sizeof (fd_set));
   #endif
 #else
   vec_max = 0;
   vec_ri  = 0;
-  vec_ri  = 0;
+  vec_ro  = 0;
+  vec_wi  = 0;
   vec_wo  = 0;
+  #ifdef _WIN32
-  vec_wo  = 0;
+  vec_eo  = 0;
+  #endif
 #endif
   return EVBACKEND_SELECT;
 }
 {
   ev_free (vec_ri);
   ev_free (vec_ro);
   ev_free (vec_wi);
   ev_free (vec_wo);
+  #ifdef _WIN32
+  ev_free (vec_eo);
+  #endif
 }

Diff Legend

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

Comparing libev/ev_select.c (file contents): Revision 1.33 by root, Mon May 26 04:14:32 2008 UTC vs. Revision 1.54 by root, Fri Jun 3 00:04:52 2011 UTC

Diff Legend

Comparing libev/ev_select.c (file contents):
Revision 1.33 by root, Mon May 26 04:14:32 2008 UTC vs.
Revision 1.54 by root, Fri Jun 3 00:04:52 2011 UTC