prepare for multiple bases

[software/libev.git] / ev.h

diff --git a/ev.h b/ev.h
index d8f7ae1f0383cb561d061fcfe5cbfc380659f557..f8112b0aebe2a386062c5a57759152a7d18a820a 100644 (file)
--- a/ev.h
+++ b/ev.h
@@ -30,8 +30,25 @@
 #ifndef EV_H
 #define EV_H
 
 #ifndef EV_H
 #define EV_H
 

+#ifdef __cplusplus
+extern "C" {
+#endif
+

 typedef double ev_tstamp;
 
 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
+
+#define EV_P void
+#define EV_P_
+#define EV_A
+#define EV_A_
+

 /* eventmask, revents, events... */
 #define EV_UNDEF          -1 /* guaranteed to be invalid */
 #define EV_NONE         0x00
 /* eventmask, revents, events... */
 #define EV_UNDEF          -1 /* guaranteed to be invalid */
 #define EV_NONE         0x00


@@ -68,12 +85,13 @@ typedef double ev_tstamp;
 #define EV_WATCHER(type)                       \
   int active; /* private */                    \
   int pending; /* private */                   \
 #define EV_WATCHER(type)                       \
   int active; /* private */                    \
   int pending; /* private */                   \

+  int priority; /* ro */                       \

   EV_COMMON; /* rw */                          \
   EV_COMMON; /* rw */                          \

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

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

-  struct type *next /* private */
+  struct ev_watcher_list *next /* private */

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


@@ -155,46 +173,62 @@ struct ev_check
 
 /* invoked when sigchld is received and waitpid indicates the givne pid */
 /* revent EV_CHILD */
 
 /* invoked when sigchld is received and waitpid indicates the givne pid */
 /* revent EV_CHILD */

+/* does not support priorities */

 struct ev_child
 {
   EV_WATCHER_LIST (ev_child);
 
 struct ev_child
 {
   EV_WATCHER_LIST (ev_child);
 

-  int pid;    /* ro */
-  int status; /* rw, holds the exit status, use the macros from sys/wait.h */
+  int pid;     /* ro */
+  int rpid;    /* rw, holds the received pid */
+  int rstatus; /* rw, holds the exit status, use the macros from sys/wait.h */

 };
 
 };
 

-#define EVMETHOD_NONE   0
-#define EVMETHOD_SELECT 1
-#define EVMETHOD_EPOLL  2
+#define EVMETHOD_AUTO     0 /* consults environment */
+#define EVMETHOD_SELECT   1
+#define EVMETHOD_POLL     2
+#define EVMETHOD_EPOLL    4
+#define EVMETHOD_KQUEUE   8
+#define EVMETHOD_DEVPOLL 16 /* NYI */
+#define EVMETHOD_PORT    32 /* NYI */
+#define EVMETHOD_ANY     ~0 /* any method, do not consult env */

 #if EV_PROTOTYPES
 #if EV_PROTOTYPES

-extern int ev_method;
-int ev_init (int flags); /* returns ev_method */
+int ev_method (EV_P);
+int ev_init (EV_P_ int methods); /* returns ev_method */

 int ev_version_major (void);
 int ev_version_minor (void);
 
 /* these three calls are suitable for plugging into pthread_atfork */
 int ev_version_major (void);
 int ev_version_minor (void);
 
 /* these three calls are suitable for plugging into pthread_atfork */

-void ev_prefork (void);
-void ev_postfork_parent (void);
-void ev_postfork_child (void);
+void ev_fork_prepare (void);
+void ev_fork_parent (void);
+void ev_fork_child (void);

 
 

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

 ev_tstamp ev_time (void);
 #endif
 
 #define EVLOOP_NONBLOCK        1 /* do not block/wait */
 #define EVLOOP_ONESHOT 2 /* block *once* only */
 #if EV_PROTOTYPES
 ev_tstamp ev_time (void);
 #endif
 
 #define EVLOOP_NONBLOCK        1 /* do not block/wait */
 #define EVLOOP_ONESHOT 2 /* block *once* only */
 #if EV_PROTOTYPES

-void ev_loop (int flags);
-extern int ev_loop_done; /* 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 status); /* 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
+ * should not keep ev_loop from running, unref() after starting, and ref() before stopping.
+ */
+void ev_ref   (EV_P);
+void ev_unref (EV_P);

 
 /* convinience function, wait for a single event, without registering an event watcher */
 /* if timeout is < 0, do wait indefinitely */
 
 /* convinience function, wait for a single event, without registering an event watcher */
 /* if timeout is < 0, do wait indefinitely */

-void ev_once (int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg);
+void ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg);

 #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 */
 #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 { (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)
 
 #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)


@@ -214,35 +248,40 @@ 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_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 */
 #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

-void ev_io_start       (struct ev_io *w);
-void ev_io_stop        (struct ev_io *w);
+void ev_io_start       (EV_P_ struct ev_io *w);
+void ev_io_stop        (EV_P_ struct ev_io *w);
+
+void ev_timer_start    (EV_P_ struct ev_timer *w);
+void ev_timer_stop     (EV_P_ struct ev_timer *w);
+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_start    (struct ev_timer *w);
-void ev_timer_stop     (struct ev_timer *w);
-void ev_timer_again    (struct ev_timer *w); /* stops if active and no repeat, restarts if active and repeating, starts if inactive and repeating */
+void ev_periodic_start (EV_P_ struct ev_periodic *w);
+void ev_periodic_stop  (EV_P_ struct ev_periodic *w);

 
 

-void ev_periodic_start (struct ev_periodic *w);
-void ev_periodic_stop  (struct ev_periodic *w);
+void ev_signal_start   (EV_P_ struct ev_signal *w);
+void ev_signal_stop    (EV_P_ struct ev_signal *w);

 
 

-void ev_signal_start   (struct ev_signal *w);
-void ev_signal_stop    (struct ev_signal *w);
+void ev_idle_start     (EV_P_ struct ev_idle *w);
+void ev_idle_stop      (EV_P_ struct ev_idle *w);

 
 

-void ev_idle_start     (struct ev_idle *w);
-void ev_idle_stop      (struct ev_idle *w);
+void ev_prepare_start  (EV_P_ struct ev_prepare *w);
+void ev_prepare_stop   (EV_P_ struct ev_prepare *w);

 
 

-void ev_prepare_start  (struct ev_prepare *w);
-void ev_prepare_stop   (struct ev_prepare *w);
+void ev_check_start    (EV_P_ struct ev_check *w);
+void ev_check_stop     (EV_P_ struct ev_check *w);

 
 

-void ev_check_start    (struct ev_check *w);
-void ev_check_stop     (struct ev_check *w);
+void ev_child_start    (EV_P_ struct ev_child *w);
+void ev_child_stop     (EV_P_ struct ev_child *w);
+#endif

 
 

-void ev_child_start    (struct ev_child *w);
-void ev_child_stop     (struct ev_child *w);
+#ifdef __cplusplus
+}

 #endif
 
 #endif
 #endif
 
 #endif