impleemnt static priorities

2 files changed, 35 insertions, 19 deletions

diff --git a/ev.c b/ev.c
index c77ad2a..23507bd 100644
--- a/ev.c
+++ b/ev.c
@@ -102,6 +102,9 @@
 #define expect_false(expr) expect ((expr) != 0, 0)
 #define expect_true(expr)  expect ((expr) != 0, 1)
 
+#define NUMPRI    (EV_MAXPRI - EV_MINPRI + 1)
+#define ABSPRI(w) ((w)->priority - EV_MINPRI)
+
 typedef struct ev_watcher *W;
 typedef struct ev_watcher_list *WL;
 typedef struct ev_watcher_time *WT;
@@ -195,22 +198,22 @@ typedef struct
   int events;
 } ANPENDING;
 
-static ANPENDING *pendings;
-static int pendingmax, pendingcnt;
+static ANPENDING *pendings [NUMPRI];
+static int pendingmax [NUMPRI], pendingcnt [NUMPRI];
 
 static void
 event (W w, int events)
 {
   if (w->pending)
     {
-      pendings [w->pending - 1].events |= events;
+      pendings [ABSPRI (w)][w->pending - 1].events |= events;
       return;
     }
 
-  w->pending = ++pendingcnt;
-  array_needsize (pendings, pendingmax, pendingcnt, );
-  pendings [pendingcnt - 1].w      = w;
-  pendings [pendingcnt - 1].events = events;
+  w->pending = ++pendingcnt [ABSPRI (w)];
+  array_needsize (pendings [ABSPRI (w)], pendingmax [ABSPRI (w)], pendingcnt [ABSPRI (w)], );
+  pendings [ABSPRI (w)][w->pending - 1].w      = w;
+  pendings [ABSPRI (w)][w->pending - 1].events = events;
 }
 
 static void
@@ -595,16 +598,19 @@ ev_fork_child (void)
 static void
 call_pending (void)
 {
-  while (pendingcnt)
-    {
-      ANPENDING *p = pendings + --pendingcnt;
+  int pri;
 
-      if (p->w)
-        {
-          p->w->pending = 0;
-          p->w->cb (p->w, p->events);
-        }
-    }
+  for (pri = NUMPRI; pri--; )
+    while (pendingcnt [pri])
+      {
+        ANPENDING *p = pendings [pri] + --pendingcnt [pri];
+
+        if (p->w)
+          {
+            p->w->pending = 0;
+            p->w->cb (p->w, p->events);
+          }
+      }
 }
 
 static void
@@ -846,7 +852,7 @@ ev_clear_pending (W w)
 {
   if (w->pending)
     {
-      pendings [w->pending - 1].w = 0;
+      pendings [ABSPRI (w)][w->pending - 1].w = 0;
       w->pending = 0;
     }
 }
diff --git a/ev.h b/ev.h
index 66e9bd1..c3692dd 100644
--- a/ev.h
+++ b/ev.h
@@ -36,6 +36,14 @@ extern "C" {
 
 typedef double ev_tstamp;
 
+/* these priorities are inclusive, higher priorities will be called earlier */
+#ifndef EV_MINPRI
+# define EV_MINPRI -2
+#endif
+#ifndef EV_MAXPRI
+# define EV_MAXPRI +2
+#endif
+
 /* eventmask, revents, events... */
 #define EV_UNDEF          -1 /* guaranteed to be invalid */
 #define EV_NONE         0x00
@@ -72,6 +80,7 @@ typedef double ev_tstamp;
 #define EV_WATCHER(type)			\
   int active; /* private */			\
   int pending; /* private */			\
+  int priority; /* ro */			\
   EV_COMMON; /* rw */				\
   void (*cb)(struct type *, int revents); /* rw */ /* gets invoked with an eventmask */
 
@@ -200,7 +209,7 @@ void ev_once (int fd, int events, ev_tstamp timeout, void (*cb)(int revents, voi
 
 /* these may evaluate ev multiple times, and the other arguments at most once */
 /* either use ev_watcher_init + ev_TYPE_set, or the ev_TYPE_init macro, below, to first initialise a watcher */
-#define ev_watcher_init(ev,cb_)             do { (ev)->active = 0; (ev)->pending = 0; (ev)->cb = (cb_); } while (0)
+#define ev_watcher_init(ev,cb_)             do { (ev)->active = (ev)->pending = (ev)->priority = 0; (ev)->cb = (cb_); } while (0)
 
 #define ev_io_set(ev,fd_,events_)           do { (ev)->fd = (fd_); (ev)->events = (events_); } while (0)
 #define ev_timer_set(ev,after_,repeat_)     do { (ev)->at = (after_); (ev)->repeat = (repeat_); } while (0)
@@ -220,7 +229,8 @@ void ev_once (int fd, int events, ev_tstamp timeout, void (*cb)(int revents, voi
 #define ev_check_init(ev,cb)                do { ev_watcher_init ((ev), (cb)); ev_check_set ((ev)); } while (0)
 #define ev_child_init(ev,cb,pid)            do { ev_watcher_init ((ev), (cb)); ev_child_set ((ev),(pid)); } while (0)
 
-#define ev_is_active(ev) (0 + (ev)->active) /* true when the watcher has been started */
+#define ev_is_active(ev)                    (0 + (ev)->active) /* true when the watcher has been started */
+#define ev_set_priority(ev,pri)             (ev)->priority = pri
 
 /* stopping (enabling, adding) a watcher does nothing if it is already running */
 /* stopping (disabling, deleting) a watcher does nothing unless its already running */