add rpid/rstatus

[software/libev.git] / ev.h

diff --git a/ev.h b/ev.h
index a7898a5a1d2b1916b2a7f5e32193ebb3154aa9b4..8d2922d9c8d112643afb99cbb9bcce2437138db7 100644 (file)
--- a/ev.h
+++ b/ev.h
@@ -30,8 +30,20 @@
 #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
+

 /* 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,6 +80,7 @@ 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 */                          \
   void (*cb)(struct type *, int revents); /* rw */ /* gets invoked with an eventmask */
 
   EV_COMMON; /* rw */                          \
   void (*cb)(struct type *, int revents); /* rw */ /* gets invoked with an eventmask */
 


@@ -159,16 +172,22 @@ struct ev_child
 {
   EV_WATCHER_LIST (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
 extern int ev_method;
 #if EV_PROTOTYPES
 extern int ev_method;

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

 int ev_version_major (void);
 int ev_version_minor (void);
 
 int ev_version_major (void);
 int ev_version_minor (void);
 


@@ -194,7 +213,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 */
 
 /* 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,7 +233,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_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 */
 
 /* stopping (enabling, adding) a watcher does nothing if it is already running */
 /* stopping (disabling, deleting) a watcher does nothing unless its already running */


@@ -245,5 +265,9 @@ void ev_child_start    (struct ev_child *w);
 void ev_child_stop     (struct ev_child *w);
 #endif
 
 void ev_child_stop     (struct ev_child *w);
 #endif
 

+#ifdef __cplusplus
+}
+#endif
+

 #endif
 
 #endif