stuffs

[software/libev.git] / ev.h

diff --git a/ev.h b/ev.h
index a86261344fe91abf826349c59446740c6f9fda91..0454138c0e4fc152ebe8af8d8240747623752880 100644 (file)
--- a/ev.h
+++ b/ev.h
@@ -34,14 +34,16 @@ typedef double ev_tstamp;
 
 /* eventmask, revents, events... */
 #define EV_UNDEF   -1 /* guaranteed to be invalid */
 
 /* eventmask, revents, events... */
 #define EV_UNDEF   -1 /* guaranteed to be invalid */

-#define EV_NONE    0x00
-#define EV_READ    0x01
-#define EV_WRITE   0x02
-#define EV_TIMEOUT 0x04
-#define EV_SIGNAL  0x08
-#define EV_IDLE    0x10
-#define EV_CHECK   0x20
-#define EV_ERROR   (0x3f|0x80)
+#define EV_NONE    0x000000
+#define EV_READ    0x000001
+#define EV_WRITE   0x000002
+#define EV_TIMEOUT 0x000004
+#define EV_SIGNAL  0x000008
+#define EV_IDLE    0x000010
+#define EV_CHECK   0x000020
+#define EV_PREPARE 0x000040
+#define EV_CHILD   0x000080
+#define EV_ERROR   0x800000

 
 /* can be used to add custom fields to all watchers */
 #ifndef EV_COMMON
 
 /* can be used to add custom fields to all watchers */
 #ifndef EV_COMMON


@@ -51,6 +53,9 @@ typedef double ev_tstamp;
 # define EV_PROTOTYPES 1
 #endif
 
 # define EV_PROTOTYPES 1
 #endif
 

+#define EV_VERSION_MAJOR 1
+#define EV_VERSION_MINOR 1
+

 /*
  * 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.


@@ -127,18 +132,36 @@ struct ev_idle
   EV_WATCHER (ev_idle);
 };
 
   EV_WATCHER (ev_idle);
 };
 

-/* invoked for each run of the mainloop, just before the next blocking vall is initiated */
+/* invoked for each run of the mainloop, just before the blocking call */
+/* you can still change events in any way you like */
+struct ev_prepare
+{
+  EV_WATCHER (ev_prepare);
+};
+
+/* invoked for each run of the mainloop, just after the blocking call */

 struct ev_check
 {
   EV_WATCHER (ev_check);
 };
 
 struct ev_check
 {
   EV_WATCHER (ev_check);
 };
 

+/* invoked when sigchld is received and waitpid indicates the givne pid */
+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 */
+};
+

 #define EVMETHOD_NONE   0
 #define EVMETHOD_SELECT 1
 #define EVMETHOD_EPOLL  2
 #if EV_PROTOTYPES
 extern int ev_method;
 int ev_init (int flags); /* returns ev_method */
 #define EVMETHOD_NONE   0
 #define EVMETHOD_SELECT 1
 #define EVMETHOD_EPOLL  2
 #if EV_PROTOTYPES
 extern int ev_method;
 int ev_init (int flags); /* returns ev_method */

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

 
 /* these three calls are suitable for plugging into pthread_atfork */
 void ev_prefork (void);
 
 /* these three calls are suitable for plugging into pthread_atfork */
 void ev_prefork (void);


@@ -168,15 +191,19 @@ void ev_once (int fd, int events, ev_tstamp timeout, void (*cb)(int revents, voi
 #define evtimer_set(ev,after_,repeat_)     do { (ev)->at = (after_); (ev)->repeat = (repeat_); } while (0)
 #define evperiodic_set(ev,at_,interval_)   do { (ev)->at = (at_); (ev)->interval = (interval_); } while (0)
 #define evsignal_set(ev,signum_)           do { (ev)->signum = (signum_); } while (0)
 #define evtimer_set(ev,after_,repeat_)     do { (ev)->at = (after_); (ev)->repeat = (repeat_); } while (0)
 #define evperiodic_set(ev,at_,interval_)   do { (ev)->at = (at_); (ev)->interval = (interval_); } while (0)
 #define evsignal_set(ev,signum_)           do { (ev)->signum = (signum_); } while (0)

-#define evcheck_set(ev)                    /* nop, yes, this is a serious in-joke */

 #define evidle_set(ev)                     /* nop, yes, this is a serious in-joke */
 #define evidle_set(ev)                     /* nop, yes, this is a serious in-joke */

+#define evprepare_set(ev)                  /* nop, yes, this is a serious in-joke */
+#define evcheck_set(ev)                    /* nop, yes, this is a serious in-joke */
+#define evchild_set(ev,pid_)               do { (ev)->pid = (pid_); } while (0)

 
 #define evio_init(ev,cb,fd,events)         do { evw_init ((ev), (cb)); evio_set ((ev),(fd),(events)); } while (0)
 #define evtimer_init(ev,cb,after,repeat)   do { evw_init ((ev), (cb)); evtimer_set ((ev),(after),(repeat)); } while (0)
 #define evperiodic_init(ev,cb,at,interval) do { evw_init ((ev), (cb)); evperiodic_set ((ev),(at),(interval)); } while (0)
 #define evsignal_init(ev,cb,signum)        do { evw_init ((ev), (cb)); evsignal_set ((ev), (signum)); } while (0)
 
 #define evio_init(ev,cb,fd,events)         do { evw_init ((ev), (cb)); evio_set ((ev),(fd),(events)); } while (0)
 #define evtimer_init(ev,cb,after,repeat)   do { evw_init ((ev), (cb)); evtimer_set ((ev),(after),(repeat)); } while (0)
 #define evperiodic_init(ev,cb,at,interval) do { evw_init ((ev), (cb)); evperiodic_set ((ev),(at),(interval)); } while (0)
 #define evsignal_init(ev,cb,signum)        do { evw_init ((ev), (cb)); evsignal_set ((ev), (signum)); } while (0)

-#define evcheck_init(ev,cb)                do { evw_init ((ev), (cb)); evcheck_set ((ev)); } while (0)

 #define evidle_init(ev,cb)                 do { evw_init ((ev), (cb)); evidle_set ((ev)); } while (0)
 #define evidle_init(ev,cb)                 do { evw_init ((ev), (cb)); evidle_set ((ev)); } while (0)

+#define evprepare_init(ev,cb)              do { evw_init ((ev), (cb)); evprepare_set ((ev)); } while (0)
+#define evcheck_init(ev,cb)                do { evw_init ((ev), (cb)); evcheck_set ((ev)); } while (0)
+#define evchild_init(ev,cb,pid)            do { evw_init ((ev), (cb)); evchild_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 */
 


@@ -199,8 +226,14 @@ void evsignal_stop    (struct ev_signal *w);
 void evidle_start     (struct ev_idle *w);
 void evidle_stop      (struct ev_idle *w);
 
 void evidle_start     (struct ev_idle *w);
 void evidle_stop      (struct ev_idle *w);
 

+void evprepare_start  (struct ev_prepare *w);
+void evprepare_stop   (struct ev_prepare *w);
+

 void evcheck_start    (struct ev_check *w);
 void evcheck_stop     (struct ev_check *w);
 void evcheck_start    (struct ev_check *w);
 void evcheck_stop     (struct ev_check *w);

+
+void evchild_start    (struct ev_child *w);
+void evchild_stop     (struct ev_child *w);

 #endif
 
 #endif
 #endif
 
 #endif