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

[software/libev.git] / ev.h

diff --git a/ev.h b/ev.h
index d8f7ae1f0383cb561d061fcfe5cbfc380659f557..66e9bd189a128f86f4941717eeb7809ed0b2338c 100644 (file)
--- a/ev.h
+++ b/ev.h
@@ -30,6 +30,10 @@
 #ifndef EV_H
 #define EV_H
 
 #ifndef EV_H
 #define EV_H
 

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

 typedef double ev_tstamp;
 
 /* eventmask, revents, events... */
 typedef double ev_tstamp;
 
 /* eventmask, revents, events... */


@@ -163,19 +167,21 @@ struct ev_child
   int status; /* rw, holds the exit status, use the macros from sys/wait.h */
 };
 
   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_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;
 #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 */
 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);
 
 extern ev_tstamp ev_now; /* time w.r.t. timers and the eventloop, updated after each poll */
 ev_tstamp ev_time (void);


@@ -245,5 +251,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