--- libev/ev++.h 2008/01/22 17:56:54 1.34 +++ libev/ev++.h 2010/10/21 02:33:08 1.52 @@ -1,7 +1,7 @@ /* * libev simple C++ wrapper classes * - * Copyright (c) 2007 Marc Alexander Lehmann + * Copyright (c) 2007,2008,2010 Marc Alexander Lehmann * All rights reserved. * * Redistribution and use in source and binary forms, with or without modifica- @@ -58,7 +58,8 @@ typedef ev_tstamp tstamp; - enum { + enum + { UNDEF = EV_UNDEF, NONE = EV_NONE, READ = EV_READ, @@ -72,27 +73,30 @@ CHECK = EV_CHECK, PREPARE = EV_PREPARE, FORK = EV_FORK, + ASYNC = EV_ASYNC, EMBED = EV_EMBED, +# undef ERROR // some systems stupidly #define ERROR ERROR = EV_ERROR, }; enum { - AUTO = EVFLAG_AUTO, - NOENV = EVFLAG_NOENV, + AUTO = EVFLAG_AUTO, + NOENV = EVFLAG_NOENV, FORKCHECK = EVFLAG_FORKCHECK, - SELECT = EVBACKEND_SELECT, - POLL = EVBACKEND_POLL, - EPOLL = EVBACKEND_EPOLL, - KQUEUE = EVBACKEND_KQUEUE, - DEVPOLL = EVBACKEND_DEVPOLL, - PORT = EVBACKEND_PORT + + SELECT = EVBACKEND_SELECT, + POLL = EVBACKEND_POLL, + EPOLL = EVBACKEND_EPOLL, + KQUEUE = EVBACKEND_KQUEUE, + DEVPOLL = EVBACKEND_DEVPOLL, + PORT = EVBACKEND_PORT }; enum { NONBLOCK = EVLOOP_NONBLOCK, - ONESHOT = EVLOOP_ONESHOT + ONESHOT = EVLOOP_ONESHOT }; enum how_t @@ -132,19 +136,12 @@ struct loop_ref { - - loop_ref (EV_P) + loop_ref (EV_P) throw () #if EV_MULTIPLICITY - throw (bad_loop) : EV_AX (EV_A) - { - if (!EV_AX) - throw bad_loop (); - } -#else - throw () + : EV_AX (EV_A) +#endif { } -#endif bool operator == (const loop_ref &other) const throw () { @@ -165,24 +162,14 @@ } #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 () + bool operator == (const EV_P) const throw () { - return this->EV_AX == other; + return this->EV_AX == EV_A; } - bool operator!= (const struct ev_loop *other) const throw () + bool operator != (const EV_P) const throw () { - return (*this == other); + return (*this == EV_A); } operator struct ev_loop * () const throw () @@ -220,11 +207,6 @@ #endif } - unsigned int count () const throw () - { - return ev_loop_count (EV_AX); - } - unsigned int backend () const throw () { return ev_backend (EV_AX); @@ -245,6 +227,17 @@ ev_unref (EV_AX); } +#if EV_FEATURE_API + unsigned int iteration () const throw () + { + return ev_iteration (EV_AX); + } + + unsigned int depth () const throw () + { + return ev_depth (EV_AX); + } + void set_io_collect_interval (tstamp interval) throw () { ev_set_io_collect_interval (EV_AX_ interval); @@ -254,9 +247,10 @@ { ev_set_timeout_collect_interval (EV_AX_ interval); } +#endif // function callback - void once (int fd, int events, tstamp timeout, void (*cb)(int, void *), void* arg = 0) throw () + 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); } @@ -268,28 +262,21 @@ 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 () + // default method == operator () + template + void once (int fd, int events, tstamp timeout, K *object) throw () { - once (fd, events, timeout, const_method_thunk, object); + once (fd, events, timeout, method_thunk, object); } - template - static void const_method_thunk (int revents, void* arg) + template + static void method_thunk (int revents, void *arg) { - K *obj = static_cast(arg); - (obj->*method) (revents); + static_cast(arg)->*method + (revents); } - // simple method callback + // no-argument method callback template void once (int fd, int events, tstamp timeout, K *object) throw () { @@ -297,10 +284,10 @@ } template - static void method_noargs_thunk (int revents, void* arg) + static void method_noargs_thunk (int revents, void *arg) { - K *obj = static_cast(arg); - (obj->*method) (); + static_cast(arg)->*method + (); } // simpler function callback @@ -311,9 +298,10 @@ } template - static void simpler_func_thunk (int revents, void* arg) + static void simpler_func_thunk (int revents, void *arg) { - (*cb) (revents); + (*cb) + (revents); } // simplest function callback @@ -324,9 +312,10 @@ } template - static void simplest_func_thunk (int revents, void* arg) + static void simplest_func_thunk (int revents, void *arg) { - (*cb) (); + (*cb) + (); } void feed_fd_event (int fd, int revents) throw () @@ -346,12 +335,14 @@ }; #if EV_MULTIPLICITY - struct dynamic_loop: loop_ref + struct dynamic_loop : loop_ref { dynamic_loop (unsigned int flags = AUTO) throw (bad_loop) - : loop_ref (ev_loop_new (flags)) + : loop_ref (ev_loop_new (flags)) { + if (!EV_AX) + throw bad_loop (); } ~dynamic_loop () throw () @@ -369,18 +360,21 @@ }; #endif - struct default_loop: loop_ref + struct default_loop : loop_ref { - default_loop (unsigned int flags = AUTO) throw (bad_loop) #if EV_MULTIPLICITY : loop_ref (ev_default_loop (flags)) #endif { -#ifndef EV_MULTIPLICITY - if (!ev_default_loop (flags)) - throw bad_loop (); + if ( +#if EV_MULTIPLICITY + !EV_AX +#else + !ev_default_loop (flags) #endif + ) + throw bad_loop (); } ~default_loop () throw () @@ -421,7 +415,8 @@ #if EV_MULTIPLICITY EV_PX; - void set (EV_PX) throw () + // loop set + void set (EV_P) throw () { this->EV_A = EV_A; } @@ -435,54 +430,48 @@ ev_init (this, 0); } - void set_ (void *data, void (*cb)(EV_P_ ev_watcher *w, int revents)) throw () + void set_ (const void *data, void (*cb)(EV_P_ ev_watcher *w, int revents)) throw () { - this->data = data; + this->data = (void *)data; ev_set_cb (static_cast(this), cb); } - // method callback - template - void set (K *object) throw () - { - set_ (object, method_thunk); - } - - template - static void method_thunk (EV_P_ ev_watcher *w, int revents) + // function callback + template + void set (void *data = 0) throw () { - K *obj = static_cast(w->data); - (obj->*method) (*static_cast(w), revents); + set_ (data, function_thunk); } - // const method callback - template - void set (const K *object) throw () + template + static void function_thunk (EV_P_ ev_watcher *w, int revents) { - set_ (object, const_method_thunk); + function + (*static_cast(w), revents); } - template - static void const_method_thunk (EV_P_ ev_watcher *w, int revents) + // method callback + template + void set (K *object) throw () { - K *obj = static_cast(w->data); - (static_cast(w->data)->*method) (*static_cast(w), revents); + set_ (object, method_thunk); } - // function callback - template - void set (void *data = 0) throw () + // default method == operator () + template + void set (K *object) throw () { - set_ (data, function_thunk); + set_ (object, method_thunk); } - template - static void function_thunk (EV_P_ ev_watcher *w, int revents) + template + static void method_thunk (EV_P_ ev_watcher *w, int revents) { - function (*static_cast(w), revents); + (static_cast(w->data)->*method) + (*static_cast(w), revents); } - // simple callback + // no-argument callback template void set (K *object) throw () { @@ -492,14 +481,15 @@ template static void method_noargs_thunk (EV_P_ ev_watcher *w, int revents) { - K *obj = static_cast(w->data); - (obj->*method) (); + (static_cast(w->data)->*method) + (); } void operator ()(int events = EV_UNDEF) { - return ev_cb (static_cast(this)) - (static_cast(this), events); + return + ev_cb (static_cast(this)) + (static_cast(this), events); } bool is_active () const throw () @@ -565,13 +555,13 @@ #if EV_MULTIPLICITY #define EV_CONSTRUCT(cppstem,cstem) \ - (EV_PX = get_default_loop ()) throw () \ + (EV_PX = get_default_loop ()) throw () \ : base (EV_A) \ { \ } #else #define EV_CONSTRUCT(cppstem,cstem) \ - () throw () \ + () throw () \ { \ } #endif @@ -582,19 +572,19 @@ \ struct cppstem : base \ { \ - void start () throw () \ + void start () throw () \ { \ ev_ ## cstem ## _start (EV_A_ static_cast(this)); \ } \ \ - void stop () throw () \ + void stop () throw () \ { \ ev_ ## cstem ## _stop (EV_A_ static_cast(this)); \ } \ \ cppstem EV_CONSTRUCT(cppstem,cstem) \ \ - ~cppstem () throw () \ + ~cppstem () throw () \ { \ stop (); \ } \ @@ -605,7 +595,7 @@ \ cppstem (const cppstem &o); \ \ - cppstem & operator =(const cppstem &o); \ + cppstem &operator =(const cppstem &o); \ \ public: @@ -655,6 +645,11 @@ { ev_timer_again (EV_A_ static_cast(this)); } + + ev_tstamp remaining () + { + return ev_timer_remaining (EV_A_ static_cast(this)); + } EV_END_WATCHER (timer, timer) #if EV_PERIODIC_ENABLE @@ -680,6 +675,7 @@ EV_END_WATCHER (periodic, periodic) #endif + #if EV_SIGNAL_ENABLE EV_BEGIN_WATCHER (sig, signal) void set (int signum) throw () { @@ -695,22 +691,25 @@ start (); } EV_END_WATCHER (sig, signal) + #endif + #if EV_CHILD_ENABLE EV_BEGIN_WATCHER (child, child) - void set (int pid) throw () + 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) throw () + void start (int pid, int trace = 0) throw () { - set (pid); + set (pid, trace); start (); } EV_END_WATCHER (child, child) + #endif #if EV_STAT_ENABLE EV_BEGIN_WATCHER (stat, stat) @@ -736,24 +735,37 @@ EV_END_WATCHER (stat, stat) #endif + #if EV_IDLE_ENABLE EV_BEGIN_WATCHER (idle, idle) void set () throw () { } EV_END_WATCHER (idle, idle) + #endif + #if EV_PREPARE_ENABLE EV_BEGIN_WATCHER (prepare, prepare) void set () throw () { } EV_END_WATCHER (prepare, prepare) + #endif + #if EV_CHECK_ENABLE EV_BEGIN_WATCHER (check, check) void set () throw () { } EV_END_WATCHER (check, check) + #endif #if EV_EMBED_ENABLE EV_BEGIN_WATCHER (embed, embed) - void start (struct ev_loop *embedded_loop) throw () + void set (struct ev_loop *embedded_loop) throw () { - stop (); + int active = is_active (); + if (active) stop (); ev_embed_set (static_cast(this), embedded_loop); + if (active) start (); + } + + void start (struct ev_loop *embedded_loop) throw () + { + set (embedded_loop); start (); } @@ -770,12 +782,25 @@ EV_END_WATCHER (fork, fork) #endif + #if EV_ASYNC_ENABLE + EV_BEGIN_WATCHER (async, async) + void send () throw () + { + ev_async_send (EV_A_ static_cast(this)); + } + + bool async_pending () throw () + { + return ev_async_pending (static_cast(this)); + } + EV_END_WATCHER (async, async) + #endif + #undef EV_PX #undef EV_PX_ #undef EV_CONSTRUCT #undef EV_BEGIN_WATCHER #undef EV_END_WATCHER - } #endif