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

Comparing libev/ev.c (file contents):
Revision 1.78 by root, Thu Nov 8 21:08:56 2007 UTC vs.
Revision 1.84 by root, Fri Nov 9 23:04:35 2007 UTC

 #define MIN_TIMEJUMP  1. /* minimum timejump that gets detected (if monotonic clock available) */
 #define MAX_BLOCKTIME 59.731 /* never wait longer than this time (to detect time jumps) */
 #define PID_HASHSIZE  16 /* size of pid hash table, must be power of two */
 /*#define CLEANUP_INTERVAL 300. /* how often to try to free memory and re-check fds */
+#ifdef EV_H
+# include EV_H
+#else
-#include "ev.h"
+# include "ev.h"
+#endif
 #if __GNUC__ >= 3
 # define expect(expr,value)         __builtin_expect ((expr),(value))
 # define inline                     inline
 #else
   int events;
 } ANPENDING;
 #if EV_MULTIPLICITY
-struct ev_loop
+  struct ev_loop
-{
+  {
-# define VAR(name,decl) decl;
+    #define VAR(name,decl) decl;
-# include "ev_vars.h"
+      #include "ev_vars.h"
-};
-# undef VAR
+    #undef VAR
+  };
-# include "ev_wrap.h"
+  #include "ev_wrap.h"
+  struct ev_loop default_loop_struct;
+  static struct ev_loop *default_loop;
 #else
-# define VAR(name,decl) static decl;
+  #define VAR(name,decl) static decl;
-# include "ev_vars.h"
+    #include "ev_vars.h"
-# undef VAR
+  #undef VAR
+  static int default_loop;
 #endif
 /*****************************************************************************/
   for (i = 0; i < eventcnt; ++i)
     ev_feed_event (EV_A_ events [i], type);
 }
-static void
+inline void
-fd_event (EV_P_ int fd, int events)
+fd_event (EV_P_ int fd, int revents)
 {
   ANFD *anfd = anfds + fd;
   struct ev_io *w;
   for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next)
     {
-      int ev = w->events & events;
+      int ev = w->events & revents;
       if (ev)
         ev_feed_event (EV_A_ (W)w, ev);
     }
+}
+void
+ev_feed_fd_event (EV_P_ int fd, int revents)
+{
+  fd_event (EV_A_ fd, revents);
 }
 /*****************************************************************************/
 static void
   heap [k] = w;
   ((W)heap [k])->active = k + 1;
 }
+inline void
+adjustheap (WT *heap, int N, int k, ev_tstamp at)
+{
+  ev_tstamp old_at = heap [k]->at;
+  heap [k]->at = at;
+  if (old_at < at)
+    downheap (heap, N, k);
+  else
+    upheap (heap, k);
+}
 /*****************************************************************************/
 typedef struct
 {
   WL head;
 #endif
       errno = old_errno;
     }
 }
+void
+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 == default_loop));
+#endif
+  --signum;
+  if (signum < 0 || signum >= signalmax)
+    return;
+  signals [signum].gotsig = 0;
+  for (w = signals [signum].head; w; w = w->next)
+    ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
+}
 static void
 sigcb (EV_P_ struct ev_io *iow, int revents)
 {
-  WL w;
   int signum;
 #ifdef WIN32
   recv (sigpipe [0], &revents, 1, MSG_DONTWAIT);
 #else
 #endif
   gotsig = 0;
   for (signum = signalmax; signum--; )
     if (signals [signum].gotsig)
-      {
+      ev_feed_signal_event (EV_A_ signum + 1);
-        signals [signum].gotsig = 0;
-        for (w = signals [signum].head; w; w = w->next)
-          ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
-      }
 }
 static void
 siginit (EV_P)
 {
 #endif
 #if EV_USE_SELECT
       if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods);
 #endif
-      ev_watcher_init (&sigev, sigcb);
+      ev_init (&sigev, sigcb);
       ev_set_priority (&sigev, EV_MAXPRI);
     }
 }
 void
 }
 #endif
 #if EV_MULTIPLICITY
-struct ev_loop default_loop_struct;
-static struct ev_loop *default_loop;
 struct ev_loop *
 #else
-static int default_loop;
 int
 #endif
 ev_default_loop (int methods)
 {
   if (sigpipe [0] == sigpipe [1])
         ANPENDING *p = pendings [pri] + --pendingcnt [pri];
         if (p->w)
           {
             p->w->pending = 0;
-            p->w->cb (EV_A_ p->w, p->events);
+            EV_CB_INVOKE (p->w, p->events);
           }
       }
 }
 static void
 ev_timer_again (EV_P_ struct ev_timer *w)
 {
   if (ev_is_active (w))
     {
       if (w->repeat)
-        {
-          ((WT)w)->at = mn_now + w->repeat;
-          downheap ((WT *)timers, timercnt, ((W)w)->active - 1);
+        adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1, mn_now + w->repeat);
-        }
       else
         ev_timer_stop (EV_A_ w);
     }
   else if (w->repeat)
     ev_timer_start (EV_A_ w);
 }
 void
 ev_periodic_again (EV_P_ struct ev_periodic *w)
 {
+  /* TODO: use adjustheap and recalculation */
   ev_periodic_stop (EV_A_ w);
   ev_periodic_start (EV_A_ w);
 }
 void
   else
     {
       once->cb  = cb;
       once->arg = arg;
-      ev_watcher_init (&once->io, once_cb_io);
+      ev_init (&once->io, once_cb_io);
       if (fd >= 0)
         {
           ev_io_set (&once->io, fd, events);
           ev_io_start (EV_A_ &once->io);
         }
-      ev_watcher_init (&once->to, once_cb_to);
+      ev_init (&once->to, once_cb_to);
       if (timeout >= 0.)
         {
           ev_timer_set (&once->to, timeout, 0.);
           ev_timer_start (EV_A_ &once->to);
         }

Diff Legend

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

Comparing libev/ev.c (file contents): Revision 1.78 by root, Thu Nov 8 21:08:56 2007 UTC vs. Revision 1.84 by root, Fri Nov 9 23:04:35 2007 UTC

Diff Legend

Comparing libev/ev.c (file contents):
Revision 1.78 by root, Thu Nov 8 21:08:56 2007 UTC vs.
Revision 1.84 by root, Fri Nov 9 23:04:35 2007 UTC