fix moa bugs, change the way adjustheap is being used, make it work with multiplicity...

[software/libev.git] / ev.h

diff --git a/ev.h b/ev.h
index e7386f2c611277b7a86920d02c06f88bb92d0efb..fec2ca4a9fd1a64b32361784390e738234bd0306 100644 (file)
--- a/ev.h
+++ b/ev.h
@@ -27,8 +27,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 

-#ifndef EV_H
-#define EV_H
+#ifndef EV_H__
+#define EV_H__

 
 #ifdef __cplusplus
 extern "C" {
 
 #ifdef __cplusplus
 extern "C" {


@@ -48,6 +48,10 @@ typedef double ev_tstamp;
 # define EV_MULTIPLICITY 1
 #endif
 
 # define EV_MULTIPLICITY 1
 #endif
 

+#ifndef EV_PERIODICS
+# define EV_PERIODICS 1
+#endif
+

 /* support multiple event loops? */
 #if EV_MULTIPLICITY
 struct ev_loop;
 /* support multiple event loops? */
 #if EV_MULTIPLICITY
 struct ev_loop;


@@ -55,11 +59,15 @@ struct ev_loop;
 # define EV_P_ EV_P,
 # define EV_A loop
 # define EV_A_ EV_A,
 # define EV_P_ EV_P,
 # define EV_A loop
 # define EV_A_ EV_A,

+# define EV_DEFAULT_A ev_default_loop (0)
+# define EV_DEFAULT_A_ EV_DEFAULT_A,

 #else
 # define EV_P void
 # define EV_P_
 # define EV_A
 # define EV_A_
 #else
 # define EV_P void
 # define EV_P_
 # define EV_A
 # define EV_A_

+# define EV_DEFAULT_A
+# define EV_DEFAULT_A_

 #endif
 
 /* eventmask, revents, events... */
 #endif
 
 /* eventmask, revents, events... */


@@ -87,6 +95,13 @@ struct ev_loop;
 #define EV_VERSION_MAJOR 1
 #define EV_VERSION_MINOR 1
 
 #define EV_VERSION_MAJOR 1
 #define EV_VERSION_MINOR 1
 

+#ifndef EV_CB_DECLARE
+# define EV_CB_DECLARE(type) void (*cb)(EV_P_ struct type *w, int revents);
+#endif
+#ifndef EV_CB_INVOKE
+# define EV_CB_INVOKE(watcher,revents) (watcher)->cb (EV_A_ (watcher), (revents))
+#endif
+

 /*
  * struct member types:
  * private: you can look at them, but not change them, and they might not mean anything to you.
 /*
  * struct member types:
  * private: you can look at them, but not change them, and they might not mean anything to you.


@@ -100,7 +115,7 @@ struct ev_loop;
   int pending; /* private */                   \
   int priority; /* private */                  \
   EV_COMMON; /* rw */                          \
   int pending; /* private */                   \
   int priority; /* private */                  \
   EV_COMMON; /* rw */                          \

-  void (*cb)(EV_P_ struct type *, int revents) /* private */ /* gets invoked with an eventmask */
+  EV_CB_DECLARE (type) /* private */

 
 #define EV_WATCHER_LIST(type)                  \
   EV_WATCHER (type);                           \
 
 #define EV_WATCHER_LIST(type)                  \
   EV_WATCHER (type);                           \


@@ -111,17 +126,20 @@ struct ev_loop;
   ev_tstamp at     /* private */
 
 /* base class, nothing to see here unless you subclass */
   ev_tstamp at     /* private */
 
 /* base class, nothing to see here unless you subclass */

-struct ev_watcher {
+struct ev_watcher
+{

   EV_WATCHER (ev_watcher);
 };
 
 /* base class, nothing to see here unless you subclass */
   EV_WATCHER (ev_watcher);
 };
 
 /* base class, nothing to see here unless you subclass */

-struct ev_watcher_list {
+struct ev_watcher_list
+{

   EV_WATCHER_LIST (ev_watcher_list);
 };
 
 /* base class, nothing to see here unless you subclass */
   EV_WATCHER_LIST (ev_watcher_list);
 };
 
 /* base class, nothing to see here unless you subclass */

-struct ev_watcher_time {
+struct ev_watcher_time
+{

   EV_WATCHER_TIME (ev_watcher_time);
 };
 
   EV_WATCHER_TIME (ev_watcher_time);
 };
 


@@ -141,6 +159,7 @@ struct ev_periodic
   EV_WATCHER_TIME (ev_periodic);
 
   ev_tstamp interval; /* rw */
   EV_WATCHER_TIME (ev_periodic);
 
   ev_tstamp interval; /* rw */

+  ev_tstamp (*reschedule_cb)(struct ev_periodic *w, ev_tstamp now); /* rw */

 };
 
 /* invoked when fd is either EV_READable or EV_WRITEable */
 };
 
 /* invoked when fd is either EV_READable or EV_WRITEable */


@@ -158,9 +177,6 @@ struct ev_io
 struct ev_signal
 {
   EV_WATCHER_LIST (ev_signal);
 struct ev_signal
 {
   EV_WATCHER_LIST (ev_signal);

-#if EV_MULTIPLICITY
-  struct ev_loop *loop;
-#endif

 
   int signum; /* ro */
 };
 
   int signum; /* ro */
 };


@@ -199,18 +215,20 @@ struct ev_child
   int rstatus; /* rw, holds the exit status, use the macros from sys/wait.h */
 };
 
   int rstatus; /* rw, holds the exit status, use the macros from sys/wait.h */
 };
 

+/* the presence of this union forces similar struct layout */

 union ev_any_watcher
 {
   struct ev_watcher w;
   struct ev_watcher_list wl;
 union ev_any_watcher
 {
   struct ev_watcher w;
   struct ev_watcher_list wl;

+

   struct ev_io io;
   struct ev_timer timer;
   struct ev_periodic periodic;
   struct ev_io io;
   struct ev_timer timer;
   struct ev_periodic periodic;

-  struct ev_signal signal;

   struct ev_idle idle;
   struct ev_idle idle;

-  struct ev_child child;

   struct ev_prepare prepare;
   struct ev_check check;
   struct ev_prepare prepare;
   struct ev_check check;

+  struct ev_signal signal;
+  struct ev_child child;

 };
 
 #define EVMETHOD_AUTO     0 /* consults environment */
 };
 
 #define EVMETHOD_AUTO     0 /* consults environment */


@@ -252,8 +270,20 @@ struct ev_loop *ev_default_loop (int methods); /* returns default loop */
 struct ev_loop *ev_loop_new (int methods);
 void ev_loop_destroy (EV_P);
 void ev_loop_fork (EV_P);
 struct ev_loop *ev_loop_new (int methods);
 void ev_loop_destroy (EV_P);
 void ev_loop_fork (EV_P);

+
+ev_tstamp ev_now (EV_P); /* time w.r.t. timers and the eventloop, updated after each poll */
+

 # else
 # else

+

 int ev_default_loop (int methods); /* returns true when successful */
 int ev_default_loop (int methods); /* returns true when successful */

+
+static ev_tstamp
+ev_now ()
+{
+  extern ev_tstamp ev_rt_now;
+
+  return ev_rt_now;
+}

 # endif
 
 void ev_default_destroy (void); /* destroy the default loop */
 # endif
 
 void ev_default_destroy (void); /* destroy the default loop */


@@ -275,8 +305,6 @@ int ev_method (EV_P);
 void ev_loop (EV_P_ int flags);
 void ev_unloop (EV_P_ int how); /* set to 1 to break out of event loop, set to 2 to break out of all event loops */
 
 void ev_loop (EV_P_ int flags);
 void ev_unloop (EV_P_ int how); /* set to 1 to break out of event loop, set to 2 to break out of all event loops */
 

-ev_tstamp ev_now (EV_P); /* time w.r.t. timers and the eventloop, updated after each poll */
-

 /*
  * ref/unref can be used to add or remove a refcount on the mainloop. every watcher
  * keeps one reference. if you have a long-runing watcher you never unregister that
 /*
  * ref/unref can be used to add or remove a refcount on the mainloop. every watcher
  * keeps one reference. if you have a long-runing watcher you never unregister that


@@ -291,31 +319,31 @@ void ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revent
 #endif
 
 /* these may evaluate ev multiple times, and the other arguments at most once */
 #endif
 
 /* 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 {           \
+/* either use ev_init + ev_TYPE_set, or the ev_TYPE_init macro, below, to first initialise a watcher */
+#define ev_init(ev,cb_) do {                           \

   ((struct ev_watcher *)(void *)(ev))->active   =      \
   ((struct ev_watcher *)(void *)(ev))->pending  =      \
   ((struct ev_watcher *)(void *)(ev))->priority = 0;   \
   ((struct ev_watcher *)(void *)(ev))->active   =      \
   ((struct ev_watcher *)(void *)(ev))->pending  =      \
   ((struct ev_watcher *)(void *)(ev))->priority = 0;   \

-  (ev)->cb = (cb_);                            \
+  ev_set_cb ((ev), 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)
 } 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)

-#define ev_periodic_set(ev,at_,interval_)   do { (ev)->at = (at_); (ev)->interval = (interval_); } while (0)
+#define ev_periodic_set(ev,at_,ival_,res_)  do { (ev)->at = (at_); (ev)->interval = (ival_); (ev)->reschedule_cb= (res_); } while (0)

 #define ev_signal_set(ev,signum_)           do { (ev)->signum = (signum_); } while (0)
 #define ev_idle_set(ev)                     /* nop, yes, this is a serious in-joke */
 #define ev_prepare_set(ev)                  /* nop, yes, this is a serious in-joke */
 #define ev_check_set(ev)                    /* nop, yes, this is a serious in-joke */
 #define ev_child_set(ev,pid_)               do { (ev)->pid = (pid_); } while (0)
 
 #define ev_signal_set(ev,signum_)           do { (ev)->signum = (signum_); } while (0)
 #define ev_idle_set(ev)                     /* nop, yes, this is a serious in-joke */
 #define ev_prepare_set(ev)                  /* nop, yes, this is a serious in-joke */
 #define ev_check_set(ev)                    /* nop, yes, this is a serious in-joke */
 #define ev_child_set(ev,pid_)               do { (ev)->pid = (pid_); } while (0)
 

-#define ev_io_init(ev,cb,fd,events)         do { ev_watcher_init ((ev), (cb)); ev_io_set ((ev),(fd),(events)); } while (0)
-#define ev_timer_init(ev,cb,after,repeat)   do { ev_watcher_init ((ev), (cb)); ev_timer_set ((ev),(after),(repeat)); } while (0)
-#define ev_periodic_init(ev,cb,at,interval) do { ev_watcher_init ((ev), (cb)); ev_periodic_set ((ev),(at),(interval)); } while (0)
-#define ev_signal_init(ev,cb,signum)        do { ev_watcher_init ((ev), (cb)); ev_signal_set ((ev), (signum)); } while (0)
-#define ev_idle_init(ev,cb)                 do { ev_watcher_init ((ev), (cb)); ev_idle_set ((ev)); } while (0)
-#define ev_prepare_init(ev,cb)              do { ev_watcher_init ((ev), (cb)); ev_prepare_set ((ev)); } while (0)
-#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_io_init(ev,cb,fd,events)         do { ev_init ((ev), (cb)); ev_io_set ((ev),(fd),(events)); } while (0)
+#define ev_timer_init(ev,cb,after,repeat)   do { ev_init ((ev), (cb)); ev_timer_set ((ev),(after),(repeat)); } while (0)
+#define ev_periodic_init(ev,cb,at,ival,res) do { ev_init ((ev), (cb)); ev_periodic_set ((ev),(at),(ival),(res)); } while (0)
+#define ev_signal_init(ev,cb,signum)        do { ev_init ((ev), (cb)); ev_signal_set ((ev), (signum)); } while (0)
+#define ev_idle_init(ev,cb)                 do { ev_init ((ev), (cb)); ev_idle_set ((ev)); } while (0)
+#define ev_prepare_init(ev,cb)              do { ev_init ((ev), (cb)); ev_prepare_set ((ev)); } while (0)
+#define ev_check_init(ev,cb)                do { ev_init ((ev), (cb)); ev_check_set ((ev)); } while (0)
+#define ev_child_init(ev,cb,pid)            do { ev_init ((ev), (cb)); ev_child_set ((ev),(pid)); } while (0)

 
 #define ev_is_pending(ev)                   (0 + ((struct ev_watcher *)(void *)(ev))->pending) /* ro, true when watcher is waiting for callback invocation */
 #define ev_is_active(ev)                    (0 + ((struct ev_watcher *)(void *)(ev))->active) /* ro, true when the watcher has been started */
 
 #define ev_is_pending(ev)                   (0 + ((struct ev_watcher *)(void *)(ev))->pending) /* ro, true when watcher is waiting for callback invocation */
 #define ev_is_active(ev)                    (0 + ((struct ev_watcher *)(void *)(ev))->active) /* ro, true when the watcher has been started */


@@ -323,11 +351,21 @@ void ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revent
 #define ev_priority(ev)                     ((struct ev_watcher *)(void *)(ev))->priority /* rw */
 #define ev_cb(ev)                           (ev)->cb /* rw */
 #define ev_set_priority(ev,pri)             ev_priority (ev) = (pri)
 #define ev_priority(ev)                     ((struct ev_watcher *)(void *)(ev))->priority /* rw */
 #define ev_cb(ev)                           (ev)->cb /* rw */
 #define ev_set_priority(ev,pri)             ev_priority (ev) = (pri)

-#define ev_set_cb(ev,cb_)                   ev_cb (ev) = (cb_)
+
+#ifndef ev_set_cb
+# define ev_set_cb(ev,cb_)                  ev_cb (ev) = (cb_)
+#endif

 
 /* stopping (enabling, adding) a watcher does nothing if it is already running */
 /* stopping (disabling, deleting) a watcher does nothing unless its already running */
 #if EV_PROTOTYPES
 
 /* stopping (enabling, adding) a watcher does nothing if it is already running */
 /* stopping (disabling, deleting) a watcher does nothing unless its already running */
 #if EV_PROTOTYPES

+
+/* feeds an event into a watcher as if the event actually occured */
+/* accepts any ev_watcher type */
+void ev_feed_event     (EV_P_ void *w, int revents);
+void ev_feed_fd_event  (EV_P_ int fd, int revents);
+void ev_feed_signal_event (EV_P_ int signum);
+

 void ev_io_start       (EV_P_ struct ev_io *w);
 void ev_io_stop        (EV_P_ struct ev_io *w);
 
 void ev_io_start       (EV_P_ struct ev_io *w);
 void ev_io_stop        (EV_P_ struct ev_io *w);
 


@@ -336,8 +374,11 @@ void ev_timer_stop     (EV_P_ struct ev_timer *w);
 /* stops if active and no repeat, restarts if active and repeating, starts if inactive and repeating */
 void ev_timer_again    (EV_P_ struct ev_timer *w);
 
 /* stops if active and no repeat, restarts if active and repeating, starts if inactive and repeating */
 void ev_timer_again    (EV_P_ struct ev_timer *w);
 

+#if EV_PERIODICS

 void ev_periodic_start (EV_P_ struct ev_periodic *w);
 void ev_periodic_stop  (EV_P_ struct ev_periodic *w);
 void ev_periodic_start (EV_P_ struct ev_periodic *w);
 void ev_periodic_stop  (EV_P_ struct ev_periodic *w);

+void ev_periodic_again (EV_P_ struct ev_periodic *w);
+#endif

 
 void ev_idle_start     (EV_P_ struct ev_idle *w);
 void ev_idle_stop      (EV_P_ struct ev_idle *w);
 
 void ev_idle_start     (EV_P_ struct ev_idle *w);
 void ev_idle_stop      (EV_P_ struct ev_idle *w);