better error handling

[software/libev.git] / ev.h

diff --git a/ev.h b/ev.h
index 1b33bf2bb41d89c697c9b3b1663dae5238898640..08b5963e631abfae28e454b8aa2979d2e705fa38 100644 (file)
--- a/ev.h
+++ b/ev.h
@@ -199,6 +199,20 @@ struct ev_child
   int rstatus; /* rw, holds the exit status, use the macros from sys/wait.h */
 };
 
+union ev_any_watcher
+{
+  struct ev_watcher w;
+  struct ev_watcher_list wl;
+  struct ev_io io;
+  struct ev_timer timer;
+  struct ev_periodic periodic;
+  struct ev_signal signal;
+  struct ev_idle idle;
+  struct ev_child child;
+  struct ev_prepare prepare;
+  struct ev_check check;
+};
+
 #define EVMETHOD_AUTO     0 /* consults environment */
 #define EVMETHOD_SELECT   1
 #define EVMETHOD_POLL     2
@@ -215,6 +229,20 @@ int ev_version_minor (void);
 
 ev_tstamp ev_time (void);
 
+/* Sets the allocation function to use, works like realloc.
+ * It is used to allocate and free memory.
+ * If it returns zero when memory needs to be allocated, the library might abort
+ * or take some potentially destructive action.
+ * The default is your system realloc function.
+ */
+void ev_set_allocator (void *(*cb)(void *ptr, long size));
+
+/* set the callback function to call on a
+ * retryable syscall error
+ * (such as failed select, poll, epoll_wait)
+ */
+void ev_set_syserr_cb (void (*cb)(void));
+
 # if EV_MULTIPLICITY
 /* the default loop is the only one that handles signals and child watchers */
 /* you can call this as often as you like */
@@ -265,9 +293,9 @@ void ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revent
 /* 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 {           \
-  ((struct ev_watcher *)(ev))->active   =      \
-  ((struct ev_watcher *)(ev))->pending  =      \
-  ((struct ev_watcher *)(ev))->priority = 0;   \
+  ((struct ev_watcher *)(void *)(ev))->active   =      \
+  ((struct ev_watcher *)(void *)(ev))->pending  =      \
+  ((struct ev_watcher *)(void *)(ev))->priority = 0;   \
   (ev)->cb = (cb_);                            \
 } while (0)
 
@@ -289,10 +317,10 @@ void ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revent
 #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_pending(ev)                   (0 + ((struct ev_watcher *)(ev))->pending) /* ro, true when watcher is waiting for callback invocation */
-#define ev_is_active(ev)                    (0 + ((struct ev_watcher *)(ev))->active) /* ro, true when the watcher has been started */
+#define ev_is_pending(ev)                   (0 + ((struct ev_watcher *)(void *)(ev))->pending) /* ro, true when watcher is waiting for callback invocation */
+#define ev_is_active(ev)                    (0 + ((struct ev_watcher *)(void *)(ev))->active) /* ro, true when the watcher has been started */
 
-#define ev_priority(ev)                     ((struct ev_watcher *)(ev))->priority /* rw */
+#define ev_priority(ev)                     ((struct ev_watcher *)(void *)(ev))->priority /* rw */
 #define ev_cb(ev)                           (ev)->cb /* rw */
 #define ev_set_priority(ev,pri)             ev_priority (ev) = (pri)
 #define ev_set_cb(ev,cb_)                   ev_cb (ev) = (cb_)