--- libev/ev++.h 2008/01/18 18:14:23 1.27 +++ libev/ev++.h 2008/01/28 11:43:37 1.38 @@ -46,6 +46,14 @@ # include "ev.h" #endif +#ifndef EV_USE_STDEXCEPT +# define EV_USE_STDEXCEPT 1 +#endif + +#if EV_USE_STDEXCEPT +# include +#endif + namespace ev { typedef ev_tstamp tstamp; @@ -93,24 +101,339 @@ ALL = EVUNLOOP_ALL }; + struct bad_loop +#if EV_USE_STDEXCEPT + : std::runtime_error +#endif + { +#if EV_USE_STDEXCEPT + bad_loop () + : std::runtime_error ("libev event loop cannot be initialized, bad value of LIBEV_FLAGS?") + { + } +#endif + }; + +#ifdef EV_AX +# undef EV_AX +#endif + +#ifdef EV_AX_ +# undef EV_AX_ +#endif + +#if EV_MULTIPLICITY +# define EV_AX raw_loop +# define EV_AX_ raw_loop, +#else +# define EV_AX +# define EV_AX_ +#endif + + struct loop_ref + { + loop_ref (EV_P) throw () +#if EV_MULTIPLICITY + : EV_AX (EV_A) +#endif + { + } + + bool operator == (const loop_ref &other) const throw () + { +#if EV_MULTIPLICITY + return EV_AX == other.EV_AX; +#else + return true; +#endif + } + + bool operator != (const loop_ref &other) const throw () + { +#if EV_MULTIPLICITY + return ! (*this == other); +#else + return false; +#endif + } + +#if EV_MULTIPLICITY + bool operator == (struct ev_loop *other) const throw () + { + return this->EV_AX == other; + } + + bool operator != (struct ev_loop *other) const throw () + { + return ! (*this == other); + } + + bool operator == (const struct ev_loop *other) const throw () + { + return this->EV_AX == other; + } + + bool operator != (const struct ev_loop *other) const throw () + { + return (*this == other); + } + + operator struct ev_loop * () const throw () + { + return EV_AX; + } + + operator const struct ev_loop * () const throw () + { + return EV_AX; + } + + bool is_default () const throw () + { + return EV_AX == ev_default_loop (0); + } +#endif + + void loop (int flags = 0) + { + ev_loop (EV_AX_ flags); + } + + void unloop (how_t how = ONE) throw () + { + ev_unloop (EV_AX_ how); + } + + void post_fork () throw () + { +#if EV_MULTIPLICITY + ev_loop_fork (EV_AX); +#else + ev_default_fork (); +#endif + } + + unsigned int count () const throw () + { + return ev_loop_count (EV_AX); + } + + unsigned int backend () const throw () + { + return ev_backend (EV_AX); + } + + tstamp now () const throw () + { + return ev_now (EV_AX); + } + + void ref () throw () + { + ev_ref (EV_AX); + } + + void unref () throw () + { + ev_unref (EV_AX); + } + + void set_io_collect_interval (tstamp interval) throw () + { + ev_set_io_collect_interval (EV_AX_ interval); + } + + void set_timeout_collect_interval (tstamp interval) throw () + { + ev_set_timeout_collect_interval (EV_AX_ interval); + } + + // function callback + void once (int fd, int events, tstamp timeout, void (*cb)(int, void *), void* arg = 0) throw () + { + ev_once (EV_AX_ fd, events, timeout, cb, arg); + } + + // method callback + template + void once (int fd, int events, tstamp timeout, K *object) throw () + { + once (fd, events, timeout, method_thunk, object); + } + + template + static void method_thunk (int revents, void* arg) + { + K *obj = static_cast(arg); + (obj->*method) (revents); + } + + // const method callback + template + void once (int fd, int events, tstamp timeout, const K *object) throw () + { + once (fd, events, timeout, const_method_thunk, object); + } + + template + static void const_method_thunk (int revents, void* arg) + { + K *obj = static_cast(arg); + (obj->*method) (revents); + } + + // simple method callback + template + void once (int fd, int events, tstamp timeout, K *object) throw () + { + once (fd, events, timeout, method_noargs_thunk, object); + } + + template + static void method_noargs_thunk (int revents, void* arg) + { + K *obj = static_cast(arg); + (obj->*method) (); + } + + // simpler function callback + template + void once (int fd, int events, tstamp timeout) throw () + { + once (fd, events, timeout, simpler_func_thunk); + } + + template + static void simpler_func_thunk (int revents, void* arg) + { + (*cb) (revents); + } + + // simplest function callback + template + void once (int fd, int events, tstamp timeout) throw () + { + once (fd, events, timeout, simplest_func_thunk); + } + + template + static void simplest_func_thunk (int revents, void* arg) + { + (*cb) (); + } + + void feed_fd_event (int fd, int revents) throw () + { + ev_feed_fd_event (EV_AX_ fd, revents); + } + + void feed_signal_event (int signum) throw () + { + ev_feed_signal_event (EV_AX_ signum); + } + +#if EV_MULTIPLICITY + struct ev_loop* EV_AX; +#endif + + }; + +#if EV_MULTIPLICITY + struct dynamic_loop : loop_ref + { + + dynamic_loop (unsigned int flags = AUTO) throw (bad_loop) + : loop_ref (ev_loop_new (flags)) + { + if (!EV_AX) + throw bad_loop (); + } + + ~dynamic_loop () throw () + { + ev_loop_destroy (EV_AX); + EV_AX = 0; + } + + private: + + dynamic_loop (const dynamic_loop &); + + dynamic_loop & operator= (const dynamic_loop &); + + }; +#endif + + struct default_loop : loop_ref + { + default_loop (unsigned int flags = AUTO) throw (bad_loop) +#if EV_MULTIPLICITY + : loop_ref (ev_default_loop (flags)) +#endif + { + if ( +#if EV_MULTIPLICITY + !EV_AX +#else + !ev_default_loop (flags) +#endif + ) + throw bad_loop (); + } + + ~default_loop () throw () + { + ev_default_destroy (); + } + + private: + default_loop (const default_loop &); + default_loop &operator = (const default_loop &); + }; + + inline loop_ref get_default_loop () throw () + { +#if EV_MULTIPLICITY + return ev_default_loop (0); +#else + return loop_ref (); +#endif + } + +#undef EV_AX +#undef EV_AX_ + +#undef EV_PX +#undef EV_PX_ +#if EV_MULTIPLICITY +# define EV_PX loop_ref EV_A +# define EV_PX_ loop_ref EV_A_ +#else +# define EV_PX +# define EV_PX_ +#endif + template struct base : ev_watcher { #if EV_MULTIPLICITY - EV_P; + EV_PX; - void set (EV_P) + void set (EV_PX) throw () { this->EV_A = EV_A; } #endif - base () + base (EV_PX) throw () + #if EV_MULTIPLICITY + : EV_A (EV_A) + #endif { ev_init (this, 0); } - void set_ (void *data, void (*cb)(EV_P_ ev_watcher *w, int revents)) + void set_ (void *data, void (*cb)(EV_P_ ev_watcher *w, int revents)) throw () { this->data = data; ev_set_cb (static_cast(this), cb); @@ -118,7 +441,7 @@ // method callback template - void set (K *object) + void set (K *object) throw () { set_ (object, method_thunk); } @@ -132,7 +455,7 @@ // const method callback template - void set (const K *object) + void set (const K *object) throw () { set_ (object, const_method_thunk); } @@ -146,7 +469,7 @@ // function callback template - void set (void *data = 0) + void set (void *data = 0) throw () { set_ (data, function_thunk); } @@ -159,7 +482,7 @@ // simple callback template - void set (K *object) + void set (K *object) throw () { set_ (object, method_noargs_thunk); } @@ -177,77 +500,76 @@ (static_cast(this), events); } - bool is_active () const + bool is_active () const throw () { return ev_is_active (static_cast(this)); } - bool is_pending () const + bool is_pending () const throw () { return ev_is_pending (static_cast(this)); } - void feed_event (int revents) + void feed_event (int revents) throw () { ev_feed_event (EV_A_ static_cast(this), revents); } }; - inline void delay (tstamp interval) + inline tstamp now () throw () + { + return ev_time (); + } + + inline void delay (tstamp interval) throw () { ev_sleep (interval); } - inline int version_major () + inline int version_major () throw () { return ev_version_major (); } - inline int version_minor () + inline int version_minor () throw () { return ev_version_minor (); } - inline unsigned int supported_backends () + inline unsigned int supported_backends () throw () { return ev_supported_backends (); } - inline unsigned int recommended_backends () + inline unsigned int recommended_backends () throw () { return ev_recommended_backends (); } - inline unsigned int embeddable_backends () + inline unsigned int embeddable_backends () throw () { return ev_embeddable_backends (); } - inline void set_allocator (void *(*cb)(void *ptr, long size)) + inline void set_allocator (void *(*cb)(void *ptr, long size)) throw () { ev_set_allocator (cb); } - inline void set_syserr_cb (void (*cb)(const char *msg)) + inline void set_syserr_cb (void (*cb)(const char *msg)) throw () { ev_set_syserr_cb (cb); } - - inline ev_tstamp now (EV_P) - { - return ev_now (EV_A); - } - #if EV_MULTIPLICITY - #define EV_CONSTRUCT \ - (EV_P = EV_DEFAULT) \ + #define EV_CONSTRUCT(cppstem,cstem) \ + (EV_PX = get_default_loop ()) throw () \ + : base (EV_A) \ { \ - set (EV_A); \ } #else - #define EV_CONSTRUCT \ - () \ + #define EV_CONSTRUCT(cppstem,cstem) \ + () throw () \ { \ } #endif @@ -258,19 +580,19 @@ \ struct cppstem : base \ { \ - void start () \ + void start () throw () \ { \ ev_ ## cstem ## _start (EV_A_ static_cast(this)); \ } \ \ - void stop () \ + void stop () throw () \ { \ ev_ ## cstem ## _stop (EV_A_ static_cast(this)); \ } \ \ - cppstem EV_CONSTRUCT \ + cppstem EV_CONSTRUCT(cppstem,cstem) \ \ - ~cppstem () \ + ~cppstem () throw () \ { \ stop (); \ } \ @@ -289,7 +611,7 @@ }; EV_BEGIN_WATCHER (io, io) - void set (int fd, int events) + void set (int fd, int events) throw () { int active = is_active (); if (active) stop (); @@ -297,7 +619,7 @@ if (active) start (); } - void set (int events) + void set (int events) throw () { int active = is_active (); if (active) stop (); @@ -305,7 +627,7 @@ if (active) start (); } - void start (int fd, int events) + void start (int fd, int events) throw () { set (fd, events); start (); @@ -313,7 +635,7 @@ EV_END_WATCHER (io, io) EV_BEGIN_WATCHER (timer, timer) - void set (ev_tstamp after, ev_tstamp repeat = 0.) + void set (ev_tstamp after, ev_tstamp repeat = 0.) throw () { int active = is_active (); if (active) stop (); @@ -321,13 +643,13 @@ if (active) start (); } - void start (ev_tstamp after, ev_tstamp repeat = 0.) + void start (ev_tstamp after, ev_tstamp repeat = 0.) throw () { set (after, repeat); start (); } - void again () + void again () throw () { ev_timer_again (EV_A_ static_cast(this)); } @@ -335,7 +657,7 @@ #if EV_PERIODIC_ENABLE EV_BEGIN_WATCHER (periodic, periodic) - void set (ev_tstamp at, ev_tstamp interval = 0.) + void set (ev_tstamp at, ev_tstamp interval = 0.) throw () { int active = is_active (); if (active) stop (); @@ -343,13 +665,13 @@ if (active) start (); } - void start (ev_tstamp at, ev_tstamp interval = 0.) + void start (ev_tstamp at, ev_tstamp interval = 0.) throw () { set (at, interval); start (); } - void again () + void again () throw () { ev_periodic_again (EV_A_ static_cast(this)); } @@ -357,7 +679,7 @@ #endif EV_BEGIN_WATCHER (sig, signal) - void set (int signum) + void set (int signum) throw () { int active = is_active (); if (active) stop (); @@ -365,7 +687,7 @@ if (active) start (); } - void start (int signum) + void start (int signum) throw () { set (signum); start (); @@ -373,24 +695,24 @@ EV_END_WATCHER (sig, signal) EV_BEGIN_WATCHER (child, child) - void set (int pid) + void set (int pid, int trace = 0) throw () { int active = is_active (); if (active) stop (); - ev_child_set (static_cast(this), pid); + ev_child_set (static_cast(this), pid, trace); if (active) start (); } - void start (int pid) + void start (int pid, int trace = 0) throw () { - set (pid); + set (pid, trace); start (); } EV_END_WATCHER (child, child) #if EV_STAT_ENABLE EV_BEGIN_WATCHER (stat, stat) - void set (const char *path, ev_tstamp interval = 0.) + void set (const char *path, ev_tstamp interval = 0.) throw () { int active = is_active (); if (active) stop (); @@ -398,14 +720,14 @@ if (active) start (); } - void start (const char *path, ev_tstamp interval = 0.) + void start (const char *path, ev_tstamp interval = 0.) throw () { stop (); set (path, interval); start (); } - void update () + void update () throw () { ev_stat_stat (EV_A_ static_cast(this)); } @@ -413,20 +735,20 @@ #endif EV_BEGIN_WATCHER (idle, idle) - void set () { } + void set () throw () { } EV_END_WATCHER (idle, idle) EV_BEGIN_WATCHER (prepare, prepare) - void set () { } + void set () throw () { } EV_END_WATCHER (prepare, prepare) EV_BEGIN_WATCHER (check, check) - void set () { } + void set () throw () { } EV_END_WATCHER (check, check) #if EV_EMBED_ENABLE EV_BEGIN_WATCHER (embed, embed) - void start (struct ev_loop *embedded_loop) + void start (struct ev_loop *embedded_loop) throw () { stop (); ev_embed_set (static_cast(this), embedded_loop); @@ -442,10 +764,12 @@ #if EV_FORK_ENABLE EV_BEGIN_WATCHER (fork, fork) - void set () { } + void set () throw () { } EV_END_WATCHER (fork, fork) #endif + #undef EV_PX + #undef EV_PX_ #undef EV_CONSTRUCT #undef EV_BEGIN_WATCHER #undef EV_END_WATCHER