--- libev/ev.h 2007/11/04 00:24:17 1.29 +++ libev/ev.h 2007/11/06 18:49:32 1.39 @@ -98,9 +98,9 @@ #define EV_WATCHER(type) \ int active; /* private */ \ int pending; /* private */ \ - int priority; /* ro */ \ + int priority; /* private */ \ EV_COMMON; /* rw */ \ - void (*cb)(EV_P_ struct type *, int revents); /* rw */ /* gets invoked with an eventmask */ + void (*cb)(EV_P_ struct type *, int revents) /* private */ /* gets invoked with an eventmask */ #define EV_WATCHER_LIST(type) \ EV_WATCHER (type); \ @@ -158,9 +158,6 @@ struct ev_signal { EV_WATCHER_LIST (ev_signal); -#if EV_MULTIPLICITY - struct ev_loop *loop; -#endif int signum; /* ro */ }; @@ -199,6 +196,20 @@ 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 @@ -206,28 +217,50 @@ #define EVMETHOD_KQUEUE 8 #define EVMETHOD_DEVPOLL 16 /* NYI */ #define EVMETHOD_PORT 32 /* NYI */ +#define EVMETHOD_WIN32 64 /* NYI */ #define EVMETHOD_ANY ~0 /* any method, do not consult env */ #if EV_PROTOTYPES int ev_version_major (void); int ev_version_minor (void); -/* these three calls are suitable for plugging into pthread_atfork */ -void ev_fork_prepare (void); -void ev_fork_parent (void); -void ev_fork_child (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)(const char *msg)); + # 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 */ +struct ev_loop *ev_default_loop (int methods); /* returns default loop */ + +/* create and destroy alternative loops that don't handle signals */ struct ev_loop *ev_loop_new (int methods); -void ev_loop_delete (EV_P); +void ev_loop_destroy (EV_P); +void ev_loop_fork (EV_P); # else -int ev_init (int methods); /* returns ev_method */ +int ev_default_loop (int methods); /* returns true when successful */ # endif -int ev_method (EV_P); +void ev_default_destroy (void); /* destroy the default loop */ +/* this needs to be called after fork, to duplicate the default loop */ +/* if you create alternative loops you have to call ev_loop_fork on them */ +/* you can call it in either the parent or the child */ +/* you can actually call it at any time, anywhere :) */ +void ev_default_fork (void); +int ev_method (EV_P); #endif #define EVLOOP_NONBLOCK 1 /* do not block/wait */ @@ -256,7 +289,12 @@ /* 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 = (ev)->pending = (ev)->priority = 0; (ev)->cb = (cb_); } while (0) +#define ev_watcher_init(ev,cb_) do { \ + ((struct ev_watcher *)(void *)(ev))->active = \ + ((struct ev_watcher *)(void *)(ev))->pending = \ + ((struct ev_watcher *)(void *)(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) @@ -276,8 +314,13 @@ #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_set_priority(ev,pri) (ev)->priority = pri +#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 *)(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_) /* stopping (enabling, adding) a watcher does nothing if it is already running */ /* stopping (disabling, deleting) a watcher does nothing unless its already running */ @@ -287,14 +330,12 @@ void ev_timer_start (EV_P_ struct ev_timer *w); void ev_timer_stop (EV_P_ struct ev_timer *w); -void ev_timer_again (EV_P_ struct ev_timer *w); /* stops if active and no repeat, restarts if active and repeating, starts if inactive and repeating */ +/* stops if active and no repeat, restarts if active and repeating, starts if inactive and repeating */ +void ev_timer_again (EV_P_ struct ev_timer *w); void ev_periodic_start (EV_P_ struct ev_periodic *w); void ev_periodic_stop (EV_P_ struct ev_periodic *w); -void ev_signal_start (EV_P_ struct ev_signal *w); -void ev_signal_stop (EV_P_ struct ev_signal *w); - void ev_idle_start (EV_P_ struct ev_idle *w); void ev_idle_stop (EV_P_ struct ev_idle *w); @@ -304,6 +345,11 @@ void ev_check_start (EV_P_ struct ev_check *w); void ev_check_stop (EV_P_ struct ev_check *w); +/* only supported in the default loop */ +void ev_signal_start (EV_P_ struct ev_signal *w); +void ev_signal_stop (EV_P_ struct ev_signal *w); + +/* only supported in the default loop */ void ev_child_start (EV_P_ struct ev_child *w); void ev_child_stop (EV_P_ struct ev_child *w); #endif