[ViewVC] Diff of: cvs/libev/ev.c

Comparing libev/ev.c (file contents):
Revision 1.250 by root, Thu May 22 02:44:57 2008 UTC vs.
Revision 1.256 by root, Thu Jun 19 06:53:49 2008 UTC

 #ifndef _WIN32
 # include <sys/time.h>
 # include <sys/wait.h>
 # include <unistd.h>
 #else
+# include <io.h>
 # define WIN32_LEAN_AND_MEAN
 # include <windows.h>
 # ifndef EV_SELECT_IS_WINSOCKET
 #  define EV_SELECT_IS_WINSOCKET 1
 # endif
 #endif
 /* this block tries to deduce configuration from header-defined symbols and defaults */
 #ifndef EV_USE_MONOTONIC
+# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0
+#  define EV_USE_MONOTONIC 1
+# else
-# define EV_USE_MONOTONIC 0
+#  define EV_USE_MONOTONIC 0
+# endif
 #endif
 #ifndef EV_USE_REALTIME
 # define EV_USE_REALTIME 0
 #endif
 #ifndef EV_USE_NANOSLEEP
+# if _POSIX_C_SOURCE >= 199309L
+#  define EV_USE_NANOSLEEP 1
+# else
-# define EV_USE_NANOSLEEP 0
+#  define EV_USE_NANOSLEEP 0
+# endif
 #endif
 #ifndef EV_USE_SELECT
 # define EV_USE_SELECT 1
 #endif
         events |= (unsigned char)w->events;
 #if EV_SELECT_IS_WINSOCKET
       if (events)
         {
-          unsigned long argp;
+          unsigned long arg;
           #ifdef EV_FD_TO_WIN32_HANDLE
             anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
           #else
             anfd->handle = _get_osfhandle (fd);
           #endif
-          assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0));
+          assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
         }
 #endif
       {
         unsigned char o_events = anfd->events;
 {
   int fd;
   for (fd = 0; fd < anfdmax; ++fd)
     if (anfds [fd].events)
-      if (!fd_valid (fd) == -1 && errno == EBADF)
+      if (!fd_valid (fd) && errno == EBADF)
         fd_kill (EV_A_ fd);
 }
 /* called on ENOMEM in select/poll to kill some fds and retry */
 static void noinline
 /* rebuild the heap: this function is used only once and executed rarely */
 void inline_size
 reheap (ANHE *heap, int N)
 {
   int i;
   /* we don't use floyds algorithm, upheap is simpler and is more cache-efficient */
   /* also, this is easy to implement and correct for both 2-heaps and 4-heaps */
   for (i = 0; i < N; ++i)
     upheap (heap, i + HEAP0);
 }
-#if EV_VERIFY
-static void
-checkheap (ANHE *heap, int N)
-{
-  int i;
-  for (i = HEAP0; i < N + HEAP0; ++i)
-    {
-      assert (("active index mismatch in heap", ev_active (ANHE_w (heap [i])) == i));
-      assert (("heap condition violated", i == HEAP0 || ANHE_at (heap [HPARENT (i)]) <= ANHE_at (heap [i])));
-      assert (("heap at cache mismatch", ANHE_at (heap [i]) == ev_at (ANHE_w (heap [i]))));
-    }
-}
-#endif
 /*****************************************************************************/
 typedef struct
 {
   WL head;
 void inline_speed
 fd_intern (int fd)
 {
 #ifdef _WIN32
-  int arg = 1;
+  unsigned long arg = 1;
   ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
 #else
   fcntl (fd, F_SETFD, FD_CLOEXEC);
   fcntl (fd, F_SETFL, O_NONBLOCK);
 #endif
 {
   postfork = 1; /* must be in line with ev_default_fork */
 }
 #if EV_VERIFY
-static void
+void noinline
+verify_watcher (EV_P_ W w)
+{
+  assert (("watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI));
+  if (w->pending)
+    assert (("pending watcher not on pending queue", pendings [ABSPRI (w)][w->pending - 1].w == w));
+}
+static void noinline
+verify_heap (EV_P_ ANHE *heap, int N)
+{
+  int i;
+  for (i = HEAP0; i < N + HEAP0; ++i)
+    {
+      assert (("active index mismatch in heap", ev_active (ANHE_w (heap [i])) == i));
+      assert (("heap condition violated", i == HEAP0 || ANHE_at (heap [HPARENT (i)]) <= ANHE_at (heap [i])));
+      assert (("heap at cache mismatch", ANHE_at (heap [i]) == ev_at (ANHE_w (heap [i]))));
+      verify_watcher (EV_A_ (W)ANHE_w (heap [i]));
+    }
+}
+static void noinline
-array_check (W **ws, int cnt)
+array_verify (EV_P_ W *ws, int cnt)
 {
   while (cnt--)
+    {
-    assert (("active index mismatch", ev_active (ws [cnt]) == cnt + 1));
+      assert (("active index mismatch", ev_active (ws [cnt]) == cnt + 1));
+      verify_watcher (EV_A_ ws [cnt]);
+    }
 }
 #endif
 void
 ev_loop_verify (EV_P)
 {
 #if EV_VERIFY
   int i;
+  WL w;
+  assert (activecnt >= -1);
+  assert (fdchangemax >= fdchangecnt);
+  for (i = 0; i < fdchangecnt; ++i)
+    assert (("negative fd in fdchanges", fdchanges [i] >= 0));
+  assert (anfdmax >= 0);
+  for (i = 0; i < anfdmax; ++i)
+    for (w = anfds [i].head; w; w = w->next)
+      {
+        verify_watcher (EV_A_ (W)w);
+        assert (("inactive fd watcher on anfd list", ev_active (w) == 1));
+        assert (("fd mismatch between watcher and anfd", ((ev_io *)w)->fd == i));
+      }
+  assert (timermax >= timercnt);
-  checkheap (timers, timercnt);
+  verify_heap (EV_A_ timers, timercnt);
 #if EV_PERIODIC_ENABLE
+  assert (periodicmax >= periodiccnt);
-  checkheap (periodics, periodiccnt);
+  verify_heap (EV_A_ periodics, periodiccnt);
 #endif
+  for (i = NUMPRI; i--; )
+    {
+      assert (pendingmax [i] >= pendingcnt [i]);
 #if EV_IDLE_ENABLE
-  for (i = NUMPRI; i--; )
+      assert (idleall >= 0);
+      assert (idlemax [i] >= idlecnt [i]);
-    array_check ((W **)idles [i], idlecnt [i]);
+      array_verify (EV_A_ (W *)idles [i], idlecnt [i]);
 #endif
+    }
 #if EV_FORK_ENABLE
+  assert (forkmax >= forkcnt);
-  array_check ((W **)forks, forkcnt);
+  array_verify (EV_A_ (W *)forks, forkcnt);
 #endif
 #if EV_ASYNC_ENABLE
+  assert (asyncmax >= asynccnt);
-  array_check ((W **)asyncs, asynccnt);
+  array_verify (EV_A_ (W *)asyncs, asynccnt);
+#endif
+  assert (preparemax >= preparecnt);
+  array_verify (EV_A_ (W *)prepares, preparecnt);
+  assert (checkmax >= checkcnt);
+  array_verify (EV_A_ (W *)checks, checkcnt);
+# if 0
+  for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
+  for (signum = signalmax; signum--; ) if (signals [signum].gotsig)
-#endif
+# endif
-  array_check ((W **)prepares, preparecnt);
-  array_check ((W **)checks, checkcnt);
 #endif
 }
 #endif /* multiplicity */
         }
     }
 }
+#endif
+#ifdef _WIN32
+# define EV_LSTAT(p,b) _stati64 (p, b)
+#else
+# define EV_LSTAT(p,b) lstat (p, b)
 #endif
 void
 ev_stat_stat (EV_P_ ev_stat *w)
 {

Diff Legend

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

Comparing libev/ev.c (file contents): Revision 1.250 by root, Thu May 22 02:44:57 2008 UTC vs. Revision 1.256 by root, Thu Jun 19 06:53:49 2008 UTC

Diff Legend

Comparing libev/ev.c (file contents):
Revision 1.250 by root, Thu May 22 02:44:57 2008 UTC vs.
Revision 1.256 by root, Thu Jun 19 06:53:49 2008 UTC