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

Comparing libev/ev.c (file contents):
Revision 1.263 by root, Wed Oct 1 18:50:03 2008 UTC vs.
Revision 1.285 by root, Wed Apr 15 19:35:53 2009 UTC

 /*
  * libev event processing core, watcher management
  *
- * Copyright (c) 2007,2008 Marc Alexander Lehmann <libev@schmorp.de>
+ * Copyright (c) 2007,2008,2009 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:
  *
 #  include EV_CONFIG_H
 # else
 #  include "config.h"
 # endif
+# if HAVE_CLOCK_SYSCALL
+#  ifndef EV_USE_CLOCK_SYSCALL
+#   define EV_USE_CLOCK_SYSCALL 1
+#   ifndef EV_USE_REALTIME
+#    define EV_USE_REALTIME  0
+#   endif
+#   ifndef EV_USE_MONOTONIC
+#    define EV_USE_MONOTONIC 1
+#   endif
+#  endif
+# endif
 # if HAVE_CLOCK_GETTIME
 #  ifndef EV_USE_MONOTONIC
 #   define EV_USE_MONOTONIC 1
 #  endif
 #  ifndef EV_USE_REALTIME
-#   define EV_USE_REALTIME  1
+#   define EV_USE_REALTIME  0
 #  endif
 # else
 #  ifndef EV_USE_MONOTONIC
 #   define EV_USE_MONOTONIC 0
 #  endif
 # endif
 #endif
 /* this block tries to deduce configuration from header-defined symbols and defaults */
+#ifndef EV_USE_CLOCK_SYSCALL
+# if __linux && __GLIBC__ >= 2
+#  define EV_USE_CLOCK_SYSCALL 1
+# else
+#  define EV_USE_CLOCK_SYSCALL 0
+# endif
+#endif
 #ifndef EV_USE_MONOTONIC
 # if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0
 #  define EV_USE_MONOTONIC 1
 # else
 #  define EV_USE_MONOTONIC 0
 # endif
 #endif
 #ifndef EV_USE_REALTIME
-# define EV_USE_REALTIME 0
+# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL
 #endif
 #ifndef EV_USE_NANOSLEEP
 # if _POSIX_C_SOURCE >= 199309L
 #  define EV_USE_NANOSLEEP 1
 #  include <sys/select.h>
 # endif
 #endif
 #if EV_USE_INOTIFY
+# include <sys/utsname.h>
+# include <sys/statfs.h>
 # include <sys/inotify.h>
 /* some very old inotify.h headers don't have IN_DONT_FOLLOW */
 # ifndef IN_DONT_FOLLOW
 #  undef EV_USE_INOTIFY
 #  define EV_USE_INOTIFY 0
 # endif
 #endif
 #if EV_SELECT_IS_WINSOCKET
 # include <winsock.h>
+#endif
+/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */
+/* which makes programs even slower. might work on other unices, too. */
+#if EV_USE_CLOCK_SYSCALL
+# include <syscall.h>
+# define clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
+# undef EV_USE_MONOTONIC
+# define EV_USE_MONOTONIC 1
 #endif
 #if EV_USE_EVENTFD
 /* our minimum requirement is glibc 2.7 which has the stub, but not the header */
 # include <stdint.h>
 typedef ev_watcher_time *WT;
 #define ev_active(w) ((W)(w))->active
 #define ev_at(w) ((WT)(w))->at
-#if EV_USE_MONOTONIC
+#if EV_USE_REALTIME
 /* sig_atomic_t is used to avoid per-thread variables or locking but still */
 /* giving it a reasonably high chance of working on typical architetcures */
+static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */
+#endif
+#if EV_USE_MONOTONIC
 static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
 #endif
 #ifdef _WIN32
 # include "ev_win32.c"
 {
   syserr_cb = cb;
 }
 static void noinline
-syserr (const char *msg)
+ev_syserr (const char *msg)
 {
   if (!msg)
     msg = "(libev) system error";
   if (syserr_cb)
 typedef struct
 {
   WL head;
   unsigned char events;
   unsigned char reify;
+  unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
+  unsigned char unused;
+#if EV_USE_EPOLL
+  unsigned int egen;  /* generation counter to counter epoll bugs */
+#endif
 #if EV_SELECT_IS_WINSOCKET
   SOCKET handle;
 #endif
 } ANFD;
 ev_tstamp
 ev_time (void)
 {
 #if EV_USE_REALTIME
+  if (expect_true (have_realtime))
+    {
-  struct timespec ts;
+      struct timespec ts;
-  clock_gettime (CLOCK_REALTIME, &ts);
+      clock_gettime (CLOCK_REALTIME, &ts);
-  return ts.tv_sec + ts.tv_nsec * 1e-9;
+      return ts.tv_sec + ts.tv_nsec * 1e-9;
-#else
+    }
+#endif
   struct timeval tv;
   gettimeofday (&tv, 0);
   return tv.tv_sec + tv.tv_usec * 1e-6;
-#endif
 }
-ev_tstamp inline_size
+inline_size ev_tstamp
 get_clock (void)
 {
 #if EV_USE_MONOTONIC
   if (expect_true (have_monotonic))
     {
 /*****************************************************************************/
 #define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
-int inline_size
+inline_size int
 array_nextsize (int elem, int cur, int cnt)
 {
   int ncur = cur + 1;
   do
 array_realloc (int elem, void *base, int *cur, int cnt)
 {
   *cur = array_nextsize (elem, *cur, cnt);
   return ev_realloc (base, elem * *cur);
 }
+#define array_init_zero(base,count)	\
+  memset ((void *)(base), 0, sizeof (*(base)) * (count))
 #define array_needsize(type,base,cur,cnt,init)			\
   if (expect_false ((cnt) > (cur)))				\
     {								\
       int ocur_ = (cur);					\
       fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
     }
 #endif
 #define array_free(stem, idx) \
-  ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0;
+  ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; stem ## s idx = 0
 /*****************************************************************************/
 void noinline
 ev_feed_event (EV_P_ void *w, int revents)
       pendings [pri][w_->pending - 1].w      = w_;
       pendings [pri][w_->pending - 1].events = revents;
     }
 }
-void inline_speed
+inline_speed void
+feed_reverse (EV_P_ W w)
+{
+  array_needsize (W, rfeeds, rfeedmax, rfeedcnt + 1, EMPTY2);
+  rfeeds [rfeedcnt++] = w;
+}
+inline_size void
+feed_reverse_done (EV_P_ int revents)
+{
+  do
+    ev_feed_event (EV_A_ rfeeds [--rfeedcnt], revents);
+  while (rfeedcnt);
+}
+inline_speed void
 queue_events (EV_P_ W *events, int eventcnt, int type)
 {
   int i;
   for (i = 0; i < eventcnt; ++i)
     ev_feed_event (EV_A_ events [i], type);
 }
 /*****************************************************************************/
-void inline_size
+inline_speed void
-anfds_init (ANFD *base, int count)
-{
-  while (count--)
-    {
-      base->head   = 0;
-      base->events = EV_NONE;
-      base->reify  = 0;
-      ++base;
-    }
-}
-void inline_speed
 fd_event (EV_P_ int fd, int revents)
 {
   ANFD *anfd = anfds + fd;
   ev_io *w;
 {
   if (fd >= 0 && fd < anfdmax)
     fd_event (EV_A_ fd, revents);
 }
-void inline_size
+inline_size void
 fd_reify (EV_P)
 {
   int i;
   for (i = 0; i < fdchangecnt; ++i)
           #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, &arg) == 0));
+          assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
         }
 #endif
       {
         unsigned char o_events = anfd->events;
         unsigned char o_reify  = anfd->reify;
         anfd->reify  = 0;
         anfd->events = events;
-        if (o_events != events || o_reify & EV_IOFDSET)
+        if (o_events != events || o_reify & EV__IOFDSET)
           backend_modify (EV_A_ fd, o_events, events);
       }
     }
   fdchangecnt = 0;
 }
-void inline_size
+inline_size void
 fd_change (EV_P_ int fd, int flags)
 {
   unsigned char reify = anfds [fd].reify;
   anfds [fd].reify |= flags;
       array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
       fdchanges [fdchangecnt - 1] = fd;
     }
 }
-void inline_speed
+inline_speed void
 fd_kill (EV_P_ int fd)
 {
   ev_io *w;
   while ((w = (ev_io *)anfds [fd].head))
       ev_io_stop (EV_A_ w);
       ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
     }
 }
-int inline_size
+inline_size int
 fd_valid (int fd)
 {
 #ifdef _WIN32
   return _get_osfhandle (fd) != -1;
 #else
   for (fd = 0; fd < anfdmax; ++fd)
     if (anfds [fd].events)
       {
         anfds [fd].events = 0;
+        anfds [fd].emask  = 0;
-        fd_change (EV_A_ fd, EV_IOFDSET | 1);
+        fd_change (EV_A_ fd, EV__IOFDSET | 1);
       }
 }
 /*****************************************************************************/
 #define HEAP0 (DHEAP - 1) /* index of first element in heap */
 #define HPARENT(k) ((((k) - HEAP0 - 1) / DHEAP) + HEAP0)
 #define UPHEAP_DONE(p,k) ((p) == (k))
 /* away from the root */
-void inline_speed
+inline_speed void
 downheap (ANHE *heap, int N, int k)
 {
   ANHE he = heap [k];
   ANHE *E = heap + N + HEAP0;
 #define HEAP0 1
 #define HPARENT(k) ((k) >> 1)
 #define UPHEAP_DONE(p,k) (!(p))
 /* away from the root */
-void inline_speed
+inline_speed void
 downheap (ANHE *heap, int N, int k)
 {
   ANHE he = heap [k];
   for (;;)
   ev_active (ANHE_w (he)) = k;
 }
 #endif
 /* towards the root */
-void inline_speed
+inline_speed void
 upheap (ANHE *heap, int k)
 {
   ANHE he = heap [k];
   for (;;)
   heap [k] = he;
   ev_active (ANHE_w (he)) = k;
 }
-void inline_size
+inline_size void
 adjustheap (ANHE *heap, int N, int k)
 {
   if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k]))
     upheap (heap, k);
   else
     downheap (heap, N, k);
 }
 /* rebuild the heap: this function is used only once and executed rarely */
-void inline_size
+inline_size void
 reheap (ANHE *heap, int N)
 {
   int i;
   /* we don't use floyds algorithm, upheap is simpler and is more cache-efficient */
 static ANSIG *signals;
 static int signalmax;
 static EV_ATOMIC_T gotsig;
-void inline_size
-signals_init (ANSIG *base, int count)
-{
-  while (count--)
-    {
-      base->head   = 0;
-      base->gotsig = 0;
-      ++base;
-    }
-}
 /*****************************************************************************/
-void inline_speed
+inline_speed void
 fd_intern (int fd)
 {
 #ifdef _WIN32
   unsigned long arg = 1;
   ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
         }
       else
 #endif
         {
           while (pipe (evpipe))
-            syserr ("(libev) error creating signal/async pipe");
+            ev_syserr ("(libev) error creating signal/async pipe");
           fd_intern (evpipe [0]);
           fd_intern (evpipe [1]);
           ev_io_set (&pipeev, evpipe [0], EV_READ);
         }
       ev_io_start (EV_A_ &pipeev);
       ev_unref (EV_A); /* watcher should not keep loop alive */
     }
 }
-void inline_size
+inline_size void
 evpipe_write (EV_P_ EV_ATOMIC_T *flag)
 {
   if (!*flag)
     {
       int old_errno = errno; /* save errno because write might clobber it */
 ev_feed_signal_event (EV_P_ int signum)
 {
   WL w;
 #if EV_MULTIPLICITY
-  assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
+  assert (("libev: feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
 #endif
   --signum;
   if (signum < 0 || signum >= signalmax)
 #ifndef WIFCONTINUED
 # define WIFCONTINUED(status) 0
 #endif
-void inline_speed
+inline_speed void
 child_reap (EV_P_ int chain, int pid, int status)
 {
   ev_child *w;
   int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
   /* kqueue is borked on everything but netbsd apparently */
   /* it usually doesn't work correctly on anything but sockets and pipes */
   flags &= ~EVBACKEND_KQUEUE;
 #endif
 #ifdef __APPLE__
-  // flags &= ~EVBACKEND_KQUEUE; for documentation
+  /* only select works correctly on that "unix-certified" platform */
-  flags &= ~EVBACKEND_POLL;
+  flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */
+  flags &= ~EVBACKEND_POLL;   /* poll is based on kqueue from 10.5 onwards */
 #endif
   return flags;
 }
 static void noinline
 loop_init (EV_P_ unsigned int flags)
 {
   if (!backend)
     {
+#if EV_USE_REALTIME
+      if (!have_realtime)
+        {
+          struct timespec ts;
+          if (!clock_gettime (CLOCK_REALTIME, &ts))
+            have_realtime = 1;
+        }
+#endif
 #if EV_USE_MONOTONIC
+      if (!have_monotonic)
-      {
+        {
-        struct timespec ts;
+          struct timespec ts;
-        if (!clock_gettime (CLOCK_MONOTONIC, &ts))
+          if (!clock_gettime (CLOCK_MONOTONIC, &ts))
-          have_monotonic = 1;
+            have_monotonic = 1;
-      }
+        }
 #endif
       ev_rt_now         = ev_time ();
       mn_now            = get_clock ();
       now_floor         = mn_now;
     }
   ev_free (anfds); anfdmax = 0;
   /* have to use the microsoft-never-gets-it-right macro */
+  array_free (rfeed, EMPTY);
   array_free (fdchange, EMPTY);
   array_free (timer, EMPTY);
 #if EV_PERIODIC_ENABLE
   array_free (periodic, EMPTY);
 #endif
   backend = 0;
 }
 #if EV_USE_INOTIFY
-void inline_size infy_fork (EV_P);
+inline_size void infy_fork (EV_P);
 #endif
-void inline_size
+inline_size void
 loop_fork (EV_P)
 {
 #if EV_USE_PORT
   if (backend == EVBACKEND_PORT  ) port_fork   (EV_A);
 #endif
 #if EV_VERIFY
 static void noinline
 verify_watcher (EV_P_ W w)
 {
-  assert (("watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI));
+  assert (("libev: 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));
+    assert (("libev: 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 (("libev: 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 (("libev: 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]))));
+      assert (("libev: 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_verify (EV_P_ W *ws, int cnt)
 {
   while (cnt--)
     {
-      assert (("active index mismatch", ev_active (ws [cnt]) == cnt + 1));
+      assert (("libev: active index mismatch", ev_active (ws [cnt]) == cnt + 1));
       verify_watcher (EV_A_ ws [cnt]);
     }
 }
 #endif
   assert (activecnt >= -1);
   assert (fdchangemax >= fdchangecnt);
   for (i = 0; i < fdchangecnt; ++i)
-    assert (("negative fd in fdchanges", fdchanges [i] >= 0));
+    assert (("libev: 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 (("libev: inactive fd watcher on anfd list", ev_active (w) == 1));
-        assert (("fd mismatch between watcher and anfd", ((ev_io *)w)->fd == i));
+        assert (("libev: fd mismatch between watcher and anfd", ((ev_io *)w)->fd == i));
       }
   assert (timermax >= timercnt);
   verify_heap (EV_A_ timers, timercnt);
 {
 #if EV_MULTIPLICITY
   struct ev_loop *loop = ev_default_loop_ptr;
 #endif
+  ev_default_loop_ptr = 0;
 #ifndef _WIN32
   ev_ref (EV_A); /* child watcher */
   ev_signal_stop (EV_A_ &childev);
 #endif
 {
 #if EV_MULTIPLICITY
   struct ev_loop *loop = ev_default_loop_ptr;
 #endif
-  if (backend)
-    postfork = 1; /* must be in line with ev_loop_fork */
+  postfork = 1; /* must be in line with ev_loop_fork */
 }
 /*****************************************************************************/
 void
 ev_invoke (EV_P_ void *w, int revents)
 {
   EV_CB_INVOKE ((W)w, revents);
 }
-void inline_speed
+inline_speed void
 call_pending (EV_P)
 {
   int pri;
   for (pri = NUMPRI; pri--; )
       {
         ANPENDING *p = pendings [pri] + --pendingcnt [pri];
         if (expect_true (p->w))
           {
-            /*assert (("non-pending watcher on pending list", p->w->pending));*/
+            /*assert (("libev: non-pending watcher on pending list", p->w->pending));*/
             p->w->pending = 0;
             EV_CB_INVOKE (p->w, p->events);
             EV_FREQUENT_CHECK;
           }
       }
 }
 #if EV_IDLE_ENABLE
-void inline_size
+inline_size void
 idle_reify (EV_P)
 {
   if (expect_false (idleall))
     {
       int pri;
         }
     }
 }
 #endif
-void inline_size
+inline_size void
 timers_reify (EV_P)
 {
   EV_FREQUENT_CHECK;
-  while (timercnt && ANHE_at (timers [HEAP0]) < mn_now)
+  if (timercnt && ANHE_at (timers [HEAP0]) < mn_now)
     {
-      ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]);
+      do
-      /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
-      /* first reschedule or stop timer */
-      if (w->repeat)
         {
+          ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]);
+          /*assert (("libev: inactive timer on timer heap detected", ev_is_active (w)));*/
+          /* first reschedule or stop timer */
+          if (w->repeat)
+            {
-          ev_at (w) += w->repeat;
+              ev_at (w) += w->repeat;
-          if (ev_at (w) < mn_now)
+              if (ev_at (w) < mn_now)
-            ev_at (w) = mn_now;
+                ev_at (w) = mn_now;
-          assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
+              assert (("libev: negative ev_timer repeat value found while processing timers", w->repeat > 0.));
-          ANHE_at_cache (timers [HEAP0]);
+              ANHE_at_cache (timers [HEAP0]);
-          downheap (timers, timercnt, HEAP0);
+              downheap (timers, timercnt, HEAP0);
+            }
+          else
+            ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
+          EV_FREQUENT_CHECK;
+          feed_reverse (EV_A_ (W)w);
         }
-      else
+      while (timercnt && ANHE_at (timers [HEAP0]) < mn_now);
-        ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
-      EV_FREQUENT_CHECK;
-      ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
+      feed_reverse_done (EV_A_ EV_TIMEOUT);
     }
 }
 #if EV_PERIODIC_ENABLE
-void inline_size
+inline_size void
 periodics_reify (EV_P)
 {
   EV_FREQUENT_CHECK;
   while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now)
     {
-      ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]);
+      int feed_count = 0;
-      /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
+      do
-      /* first reschedule or stop timer */
-      if (w->reschedule_cb)
         {
+          ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]);
+          /*assert (("libev: inactive timer on periodic heap detected", ev_is_active (w)));*/
+          /* first reschedule or stop timer */
+          if (w->reschedule_cb)
+            {
-          ev_at (w) = w->reschedule_cb (w, ev_rt_now);
+              ev_at (w) = w->reschedule_cb (w, ev_rt_now);
-          assert (("ev_periodic reschedule callback returned time in the past", ev_at (w) >= ev_rt_now));
+              assert (("libev: ev_periodic reschedule callback returned time in the past", ev_at (w) >= ev_rt_now));
-          ANHE_at_cache (periodics [HEAP0]);
+              ANHE_at_cache (periodics [HEAP0]);
-          downheap (periodics, periodiccnt, HEAP0);
+              downheap (periodics, periodiccnt, HEAP0);
+            }
+          else if (w->interval)
+            {
+              ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
+              /* if next trigger time is not sufficiently in the future, put it there */
+              /* this might happen because of floating point inexactness */
+              if (ev_at (w) - ev_rt_now < TIME_EPSILON)
+                {
+                  ev_at (w) += w->interval;
+                  /* if interval is unreasonably low we might still have a time in the past */
+                  /* so correct this. this will make the periodic very inexact, but the user */
+                  /* has effectively asked to get triggered more often than possible */
+                  if (ev_at (w) < ev_rt_now)
+                    ev_at (w) = ev_rt_now;
+                }
+              ANHE_at_cache (periodics [HEAP0]);
+              downheap (periodics, periodiccnt, HEAP0);
+            }
+          else
+            ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
+          EV_FREQUENT_CHECK;
+          feed_reverse (EV_A_ (W)w);
         }
-      else if (w->interval)
+      while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now);
-        {
-          ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
-          /* if next trigger time is not sufficiently in the future, put it there */
-          /* this might happen because of floating point inexactness */
-          if (ev_at (w) - ev_rt_now < TIME_EPSILON)
-            {
-              ev_at (w) += w->interval;
-              /* if interval is unreasonably low we might still have a time in the past */
-              /* so correct this. this will make the periodic very inexact, but the user */
-              /* has effectively asked to get triggered more often than possible */
-              if (ev_at (w) < ev_rt_now)
-                ev_at (w) = ev_rt_now;
-            }
-          ANHE_at_cache (periodics [HEAP0]);
-          downheap (periodics, periodiccnt, HEAP0);
-        }
-      else
-        ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
-      EV_FREQUENT_CHECK;
-      ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
+      feed_reverse_done (EV_A_ EV_PERIODIC);
     }
 }
 static void noinline
 periodics_reschedule (EV_P)
   reheap (periodics, periodiccnt);
 }
 #endif
-void inline_speed
+static void noinline
+timers_reschedule (EV_P_ ev_tstamp adjust)
+{
+  int i;
+  for (i = 0; i < timercnt; ++i)
+    {
+      ANHE *he = timers + i + HEAP0;
+      ANHE_w (*he)->at += adjust;
+      ANHE_at_cache (*he);
+    }
+}
+inline_speed void
 time_update (EV_P_ ev_tstamp max_block)
 {
   int i;
 #if EV_USE_MONOTONIC
           ev_rt_now = ev_time ();
           mn_now    = get_clock ();
           now_floor = mn_now;
         }
+      /* no timer adjustment, as the monotonic clock doesn't jump */
+      /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
 # if EV_PERIODIC_ENABLE
       periodics_reschedule (EV_A);
 # endif
-      /* no timer adjustment, as the monotonic clock doesn't jump */
-      /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
     }
   else
 #endif
     {
       ev_rt_now = ev_time ();
       if (expect_false (mn_now > ev_rt_now || ev_rt_now > mn_now + max_block + MIN_TIMEJUMP))
         {
+          /* adjust timers. this is easy, as the offset is the same for all of them */
+          timers_reschedule (EV_A_ ev_rt_now - mn_now);
 #if EV_PERIODIC_ENABLE
           periodics_reschedule (EV_A);
 #endif
-          /* adjust timers. this is easy, as the offset is the same for all of them */
-          for (i = 0; i < timercnt; ++i)
-            {
-              ANHE *he = timers + i + HEAP0;
-              ANHE_w (*he)->at += ev_rt_now - mn_now;
-              ANHE_at_cache (*he);
-            }
         }
       mn_now = ev_rt_now;
     }
-}
-void
-ev_ref (EV_P)
-{
-  ++activecnt;
-}
-void
-ev_unref (EV_P)
-{
-  --activecnt;
-}
-void
-ev_now_update (EV_P)
-{
-  time_update (EV_A_ 1e100);
 }
 static int loop_done;
 void
         {
           queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
           call_pending (EV_A);
         }
-      if (expect_false (!activecnt))
-        break;
       /* we might have forked, so reify kernel state if necessary */
       if (expect_false (postfork))
         loop_fork (EV_A);
       /* update fd-related kernel structures */
         if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
           {
             /* update time to cancel out callback processing overhead */
             time_update (EV_A_ 1e100);
-            waittime = MAX_BLOCKTIME;
             if (timercnt)
               {
                 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge;
                 if (waittime > to) waittime = to;
 ev_unloop (EV_P_ int how)
 {
   loop_done = how;
 }
+void
+ev_ref (EV_P)
+{
+  ++activecnt;
+}
+void
+ev_unref (EV_P)
+{
+  --activecnt;
+}
+void
+ev_now_update (EV_P)
+{
+  time_update (EV_A_ 1e100);
+}
+void
+ev_suspend (EV_P)
+{
+  ev_now_update (EV_A);
+}
+void
+ev_resume (EV_P)
+{
+  ev_tstamp mn_prev = mn_now;
+  ev_now_update (EV_A);
+  printf ("update %f\n", mn_now - mn_prev);//D
+  timers_reschedule (EV_A_ mn_now - mn_prev);
+  periodics_reschedule (EV_A);
+}
 /*****************************************************************************/
-void inline_size
+inline_size void
 wlist_add (WL *head, WL elem)
 {
   elem->next = *head;
   *head = elem;
 }
-void inline_size
+inline_size void
 wlist_del (WL *head, WL elem)
 {
   while (*head)
     {
       if (*head == elem)
       head = &(*head)->next;
     }
 }
-void inline_speed
+inline_speed void
 clear_pending (EV_P_ W w)
 {
   if (w->pending)
     {
       pendings [ABSPRI (w)][w->pending - 1].w = 0;
     }
   else
     return 0;
 }
-void inline_size
+inline_size void
 pri_adjust (EV_P_ W w)
 {
   int pri = w->priority;
   pri = pri < EV_MINPRI ? EV_MINPRI : pri;
   pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
   w->priority = pri;
 }
-void inline_speed
+inline_speed void
 ev_start (EV_P_ W w, int active)
 {
   pri_adjust (EV_A_ w);
   w->active = active;
   ev_ref (EV_A);
 }
-void inline_size
+inline_size void
 ev_stop (EV_P_ W w)
 {
   ev_unref (EV_A);
   w->active = 0;
 }
   int fd = w->fd;
   if (expect_false (ev_is_active (w)))
     return;
-  assert (("ev_io_start called with negative fd", fd >= 0));
+  assert (("libev: ev_io_start called with negative fd", fd >= 0));
+  assert (("libev: ev_io start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE))));
   EV_FREQUENT_CHECK;
   ev_start (EV_A_ (W)w, 1);
-  array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
+  array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
   wlist_add (&anfds[fd].head, (WL)w);
-  fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1);
+  fd_change (EV_A_ fd, w->events & EV__IOFDSET | 1);
-  w->events &= ~EV_IOFDSET;
+  w->events &= ~EV__IOFDSET;
   EV_FREQUENT_CHECK;
 }
 void noinline
 {
   clear_pending (EV_A_ (W)w);
   if (expect_false (!ev_is_active (w)))
     return;
-  assert (("ev_io_stop called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
+  assert (("libev: ev_io_stop called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
   EV_FREQUENT_CHECK;
   wlist_del (&anfds[w->fd].head, (WL)w);
   ev_stop (EV_A_ (W)w);
   if (expect_false (ev_is_active (w)))
     return;
   ev_at (w) += mn_now;
-  assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
+  assert (("libev: ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
   EV_FREQUENT_CHECK;
   ++timercnt;
   ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1);
   ANHE_at_cache (timers [ev_active (w)]);
   upheap (timers, ev_active (w));
   EV_FREQUENT_CHECK;
-  /*assert (("internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/
+  /*assert (("libev: internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/
 }
 void noinline
 ev_timer_stop (EV_P_ ev_timer *w)
 {
   EV_FREQUENT_CHECK;
   {
     int active = ev_active (w);
-    assert (("internal timer heap corruption", ANHE_w (timers [active]) == (WT)w));
+    assert (("libev: internal timer heap corruption", ANHE_w (timers [active]) == (WT)w));
     --timercnt;
     if (expect_true (active < timercnt + HEAP0))
       {
   if (w->reschedule_cb)
     ev_at (w) = w->reschedule_cb (w, ev_rt_now);
   else if (w->interval)
     {
-      assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
+      assert (("libev: ev_periodic_start called with negative interval value", w->interval >= 0.));
       /* this formula differs from the one in periodic_reify because we do not always round up */
       ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
     }
   else
     ev_at (w) = w->offset;
   ANHE_at_cache (periodics [ev_active (w)]);
   upheap (periodics, ev_active (w));
   EV_FREQUENT_CHECK;
-  /*assert (("internal periodic heap corruption", ANHE_w (periodics [ev_active (w)]) == (WT)w));*/
+  /*assert (("libev: internal periodic heap corruption", ANHE_w (periodics [ev_active (w)]) == (WT)w));*/
 }
 void noinline
 ev_periodic_stop (EV_P_ ev_periodic *w)
 {
   EV_FREQUENT_CHECK;
   {
     int active = ev_active (w);
-    assert (("internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w));
+    assert (("libev: internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w));
     --periodiccnt;
     if (expect_true (active < periodiccnt + HEAP0))
       {
 void noinline
 ev_signal_start (EV_P_ ev_signal *w)
 {
 #if EV_MULTIPLICITY
-  assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
+  assert (("libev: signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
 #endif
   if (expect_false (ev_is_active (w)))
     return;
-  assert (("ev_signal_start called with illegal signal number", w->signum > 0));
+  assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0));
   evpipe_init (EV_A);
   EV_FREQUENT_CHECK;
     sigset_t full, prev;
     sigfillset (&full);
     sigprocmask (SIG_SETMASK, &full, &prev);
 #endif
-    array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
+    array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero);
 #ifndef _WIN32
     sigprocmask (SIG_SETMASK, &prev, 0);
 #endif
   }
 void
 ev_child_start (EV_P_ ev_child *w)
 {
 #if EV_MULTIPLICITY
-  assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
+  assert (("libev: child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
 #endif
   if (expect_false (ev_is_active (w)))
     return;
   EV_FREQUENT_CHECK;
 # ifdef _WIN32
 #  undef lstat
 #  define lstat(a,b) _stati64 (a,b)
 # endif
-#define DEF_STAT_INTERVAL 5.0074891
+#define DEF_STAT_INTERVAL  5.0074891
+#define NFS_STAT_INTERVAL 30.1074891 /* for filesystems potentially failing inotify */
-#define MIN_STAT_INTERVAL 0.1074891
+#define MIN_STAT_INTERVAL  0.1074891
 static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
 #if EV_USE_INOTIFY
 # define EV_INOTIFY_BUFSIZE 8192
 {
   w->wd = inotify_add_watch (fs_fd, w->path, IN_ATTRIB | IN_DELETE_SELF | IN_MOVE_SELF | IN_MODIFY | IN_DONT_FOLLOW | IN_MASK_ADD);
   if (w->wd < 0)
     {
+      w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
-      ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
+      ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
       /* monitor some parent directory for speedup hints */
-      /* note that exceeding the hardcoded limit is not a correctness issue, */
+      /* note that exceeding the hardcoded path limit is not a correctness issue, */
       /* but an efficiency issue only */
       if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
         {
           char path [4096];
           strcpy (path, w->path);
               int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF
                        | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO);
               char *pend = strrchr (path, '/');
-              if (!pend)
+              if (!pend || pend == path)
-                break; /* whoops, no '/', complain to your admin */
+                break;
               *pend = 0;
               w->wd = inotify_add_watch (fs_fd, path, mask);
             }
           while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
         }
     }
-  else
-    ev_timer_stop (EV_A_ &w->timer); /* we can watch this in a race-free way */
   if (w->wd >= 0)
+    {
-    wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
+      wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
+      /* now local changes will be tracked by inotify, but remote changes won't */
+      /* unless the filesystem it known to be local, we therefore still poll */
+      /* also do poll on <2.6.25, but with normal frequency */
+      struct statfs sfs;
+      if (fs_2625 && !statfs (w->path, &sfs))
+        if (sfs.f_type == 0x1373 /* devfs */
+            || sfs.f_type == 0xEF53 /* ext2/3 */
+            || sfs.f_type == 0x3153464a /* jfs */
+            || sfs.f_type == 0x52654973 /* reiser3 */
+            || sfs.f_type == 0x01021994 /* tempfs */
+            || sfs.f_type == 0x58465342 /* xfs */)
+          return;
+      w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
+      ev_timer_again (EV_A_ &w->timer);
+    }
 }
 static void noinline
 infy_del (EV_P_ ev_stat *w)
 {
 static void noinline
 infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
 {
   if (slot < 0)
-    /* overflow, need to check for all hahs slots */
+    /* overflow, need to check for all hash slots */
     for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
       infy_wd (EV_A_ slot, wd, ev);
   else
     {
       WL w_;
           if (w->wd == wd || wd == -1)
             {
               if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
                 {
+                  wlist_del (&fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
                   w->wd = -1;
                   infy_add (EV_A_ w); /* re-add, no matter what */
                 }
               stat_timer_cb (EV_A_ &w->timer, 0);
   for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len)
     infy_wd (EV_A_ ev->wd, ev->wd, ev);
 }
-void inline_size
+inline_size void
+check_2625 (EV_P)
+{
+  /* kernels < 2.6.25 are borked
+   * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
+   */
+  struct utsname buf;
+  int major, minor, micro;
+  if (uname (&buf))
+    return;
+  if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
+    return;
+  if (major < 2
+      || (major == 2 && minor < 6)
+      || (major == 2 && minor == 6 && micro < 25))
+    return;
+  fs_2625 = 1;
+}
+inline_size void
 infy_init (EV_P)
 {
   if (fs_fd != -2)
     return;
+  fs_fd = -1;
+  check_2625 (EV_A);
   fs_fd = inotify_init ();
   if (fs_fd >= 0)
     {
       ev_set_priority (&fs_w, EV_MAXPRI);
       ev_io_start (EV_A_ &fs_w);
     }
 }
-void inline_size
+inline_size void
 infy_fork (EV_P)
 {
   int slot;
   if (fs_fd < 0)
           w->wd = -1;
           if (fs_fd >= 0)
             infy_add (EV_A_ w); /* re-add, no matter what */
           else
-            ev_timer_start (EV_A_ &w->timer);
+            ev_timer_again (EV_A_ &w->timer);
         }
     }
 }
 #endif
     || w->prev.st_atime != w->attr.st_atime
     || w->prev.st_mtime != w->attr.st_mtime
     || w->prev.st_ctime != w->attr.st_ctime
   ) {
       #if EV_USE_INOTIFY
+        if (fs_fd >= 0)
+          {
-        infy_del (EV_A_ w);
+            infy_del (EV_A_ w);
-        infy_add (EV_A_ w);
+            infy_add (EV_A_ w);
-        ev_stat_stat (EV_A_ w); /* avoid race... */
+            ev_stat_stat (EV_A_ w); /* avoid race... */
+          }
       #endif
       ev_feed_event (EV_A_ w, EV_STAT);
     }
 }
 ev_stat_start (EV_P_ ev_stat *w)
 {
   if (expect_false (ev_is_active (w)))
     return;
-  /* since we use memcmp, we need to clear any padding data etc. */
-  memset (&w->prev, 0, sizeof (ev_statdata));
-  memset (&w->attr, 0, sizeof (ev_statdata));
   ev_stat_stat (EV_A_ w);
+  if (w->interval < MIN_STAT_INTERVAL && w->interval)
-  if (w->interval < MIN_STAT_INTERVAL)
+    w->interval = MIN_STAT_INTERVAL;
-    w->interval = w->interval ? MIN_STAT_INTERVAL : DEF_STAT_INTERVAL;
-  ev_timer_init (&w->timer, stat_timer_cb, w->interval, w->interval);
+  ev_timer_init (&w->timer, stat_timer_cb, 0., w->interval ? w->interval : DEF_STAT_INTERVAL);
   ev_set_priority (&w->timer, ev_priority (w));
 #if EV_USE_INOTIFY
   infy_init (EV_A);
   if (fs_fd >= 0)
     infy_add (EV_A_ w);
   else
 #endif
-    ev_timer_start (EV_A_ &w->timer);
+    ev_timer_again (EV_A_ &w->timer);
   ev_start (EV_A_ (W)w, 1);
   EV_FREQUENT_CHECK;
 }
 static void
 embed_fork_cb (EV_P_ ev_fork *fork_w, int revents)
 {
   ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
+  ev_embed_stop (EV_A_ w);
   {
     struct ev_loop *loop = w->other;
     ev_loop_fork (EV_A);
+    ev_loop (EV_A_ EVLOOP_NONBLOCK);
   }
+  ev_embed_start (EV_A_ w);
 }
 #if 0
 static void
 embed_idle_cb (EV_P_ ev_idle *idle, int revents)
   if (expect_false (ev_is_active (w)))
     return;
   {
     struct ev_loop *loop = w->other;
-    assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
+    assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
     ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
   }
   EV_FREQUENT_CHECK;
       ev_timer_set (&once->to, timeout, 0.);
       ev_timer_start (EV_A_ &once->to);
     }
 }
+/*****************************************************************************/
+#if 0
+void
+ev_walk (EV_P_ int types, void (*cb)(EV_P_ int type, void *w))
+{
+  int i, j;
+  ev_watcher_list *wl, *wn;
+  if (types & (EV_IO | EV_EMBED))
+    for (i = 0; i < anfdmax; ++i)
+      for (wl = anfds [i].head; wl; )
+        {
+          wn = wl->next;
+#if EV_EMBED_ENABLE
+          if (ev_cb ((ev_io *)wl) == embed_io_cb)
+            {
+              if (types & EV_EMBED)
+                cb (EV_A_ EV_EMBED, ((char *)wl) - offsetof (struct ev_embed, io));
+            }
+          else
+#endif
+#if EV_USE_INOTIFY
+          if (ev_cb ((ev_io *)wl) == infy_cb)
+            ;
+          else
+#endif
+          if ((ev_io *)wl != &pipeev)
+            if (types & EV_IO)
+              cb (EV_A_ EV_IO, wl);
+          wl = wn;
+        }
+  if (types & (EV_TIMER | EV_STAT))
+    for (i = timercnt + HEAP0; i-- > HEAP0; )
+#if EV_STAT_ENABLE
+      /*TODO: timer is not always active*/
+      if (ev_cb ((ev_timer *)ANHE_w (timers [i])) == stat_timer_cb)
+        {
+          if (types & EV_STAT)
+            cb (EV_A_ EV_STAT, ((char *)ANHE_w (timers [i])) - offsetof (struct ev_stat, timer));
+        }
+      else
+#endif
+      if (types & EV_TIMER)
+        cb (EV_A_ EV_TIMER, ANHE_w (timers [i]));
+#if EV_PERIODIC_ENABLE
+  if (types & EV_PERIODIC)
+    for (i = periodiccnt + HEAP0; i-- > HEAP0; )
+      cb (EV_A_ EV_PERIODIC, ANHE_w (periodics [i]));
+#endif
+#if EV_IDLE_ENABLE
+  if (types & EV_IDLE)
+    for (j = NUMPRI; i--; )
+      for (i = idlecnt [j]; i--; )
+        cb (EV_A_ EV_IDLE, idles [j][i]);
+#endif
+#if EV_FORK_ENABLE
+  if (types & EV_FORK)
+    for (i = forkcnt; i--; )
+      if (ev_cb (forks [i]) != embed_fork_cb)
+        cb (EV_A_ EV_FORK, forks [i]);
+#endif
+#if EV_ASYNC_ENABLE
+  if (types & EV_ASYNC)
+    for (i = asynccnt; i--; )
+      cb (EV_A_ EV_ASYNC, asyncs [i]);
+#endif
+  if (types & EV_PREPARE)
+    for (i = preparecnt; i--; )
+#if EV_EMBED_ENABLE
+      if (ev_cb (prepares [i]) != embed_prepare_cb)
+#endif
+        cb (EV_A_ EV_PREPARE, prepares [i]);
+  if (types & EV_CHECK)
+    for (i = checkcnt; i--; )
+      cb (EV_A_ EV_CHECK, checks [i]);
+  if (types & EV_SIGNAL)
+    for (i = 0; i < signalmax; ++i)
+      for (wl = signals [i].head; wl; )
+        {
+          wn = wl->next;
+          cb (EV_A_ EV_SIGNAL, wl);
+          wl = wn;
+        }
+  if (types & EV_CHILD)
+    for (i = EV_PID_HASHSIZE; i--; )
+      for (wl = childs [i]; wl; )
+        {
+          wn = wl->next;
+          cb (EV_A_ EV_CHILD, wl);
+          wl = wn;
+        }
+/* EV_STAT     0x00001000 /* stat data changed */
+/* EV_EMBED    0x00010000 /* embedded event loop needs sweep */
+}
+#endif
 #if EV_MULTIPLICITY
   #include "ev_wrap.h"
 #endif
 #ifdef __cplusplus

Diff Legend

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

Comparing libev/ev.c (file contents): Revision 1.263 by root, Wed Oct 1 18:50:03 2008 UTC vs. Revision 1.285 by root, Wed Apr 15 19:35:53 2009 UTC

Diff Legend

Comparing libev/ev.c (file contents):
Revision 1.263 by root, Wed Oct 1 18:50:03 2008 UTC vs.
Revision 1.285 by root, Wed Apr 15 19:35:53 2009 UTC