implement poll method, handle enomem by closing a 'random' fd

[software/libev.git] / ev.h

diff --git a/ev.h b/ev.h
index c59cc911e2959dbdd814573afefd19cc6cde2e73..66e9bd189a128f86f4941717eeb7809ed0b2338c 100644 (file)
--- a/ev.h
+++ b/ev.h
@@ -30,21 +30,25 @@
 #ifndef EV_H
 #define EV_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 typedef double ev_tstamp;
 
 /* 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_REIFY       0x04 /* private */
-#define EV_TIMEOUT 0x000100
-#define EV_SIGNAL  0x000200
-#define EV_IDLE    0x000400
-#define EV_CHECK   0x000800
-#define EV_PREPARE 0x001000
-#define EV_CHILD   0x002000
-#define EV_ERROR   0x800000 /* sent when an error occurs */
+#define EV_UNDEF          -1 /* guaranteed to be invalid */
+#define EV_NONE         0x00
+#define EV_READ         0x01
+#define EV_WRITE        0x02
+#define EV_TIMEOUT  0x000100
+#define EV_PERIODIC 0x000200
+#define EV_SIGNAL   0x000400
+#define EV_IDLE     0x000800
+#define EV_CHECK    0x001000
+#define EV_PREPARE  0x002000
+#define EV_CHILD    0x004000
+#define EV_ERROR    0x800000 /* sent when an error occurs */
 
 /* can be used to add custom fields to all watchers */
 #ifndef EV_COMMON
@@ -95,6 +99,7 @@ struct ev_watcher_time {
 };
 
 /* invoked after a specific time, repeatable (based on monotonic clock) */
+/* revent EV_TIMEOUT */
 struct ev_timer
 {
   EV_WATCHER_TIME (ev_timer);
@@ -103,6 +108,7 @@ struct ev_timer
 };
 
 /* invoked at some specific time, possibly repeating at regular intervals (based on UTC) */
+/* revent EV_PERIODIC */
 struct ev_periodic
 {
   EV_WATCHER_TIME (ev_periodic);
@@ -111,6 +117,7 @@ struct ev_periodic
 };
 
 /* invoked when fd is either EV_READable or EV_WRITEable */
+/* revent EV_READ, EV_WRITE */
 struct ev_io
 {
   EV_WATCHER_LIST (ev_io);
@@ -120,6 +127,7 @@ struct ev_io
 };
 
 /* invoked when the given signal has been received */
+/* revent EV_SIGNAL */
 struct ev_signal
 {
   EV_WATCHER_LIST (ev_signal);
@@ -128,6 +136,7 @@ struct ev_signal
 };
 
 /* invoked when the nothing else needs to be done, keeps the process from blocking */
+/* revent EV_IDLE */
 struct ev_idle
 {
   EV_WATCHER (ev_idle);
@@ -135,18 +144,21 @@ struct ev_idle
 
 /* invoked for each run of the mainloop, just before the blocking call */
 /* you can still change events in any way you like */
+/* revent EV_PREPARE */
 struct ev_prepare
 {
   EV_WATCHER (ev_prepare);
 };
 
 /* invoked for each run of the mainloop, just after the blocking call */
+/* revent EV_CHECK */
 struct ev_check
 {
   EV_WATCHER (ev_check);
 };
 
 /* invoked when sigchld is received and waitpid indicates the givne pid */
+/* revent EV_CHILD */
 struct ev_child
 {
   EV_WATCHER_LIST (ev_child);
@@ -155,19 +167,21 @@ struct ev_child
   int status; /* rw, holds the exit status, use the macros from sys/wait.h */
 };
 
-#define EVMETHOD_NONE   0
+#define EVMETHOD_AUTO   0 /* consults environment */
 #define EVMETHOD_SELECT 1
-#define EVMETHOD_EPOLL  2
+#define EVMETHOD_POLL   2
+#define EVMETHOD_EPOLL  4
+#define EVMETHOD_ANY    ~0 /* any method, do not consult env */
 #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);
 
 /* 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);
@@ -237,5 +251,9 @@ void ev_child_start    (struct ev_child *w);
 void ev_child_stop     (struct ev_child *w);
 #endif
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif