--- libev/ev++.h 2007/11/24 09:48:37 1.7 +++ libev/ev++.h 2007/12/04 17:08:05 1.14 @@ -5,42 +5,84 @@ namespace ev { - template - class callback + template + struct base : ev_watcher { - struct object { }; + #if EV_MULTIPLICITY + EV_P; - void *obj; - void (object::*meth)(watcher &, int); - - /* a proxy is a kind of recipe on how to call a specific class method */ - struct proxy_base { - virtual void call (void *obj, void (object::*meth)(watcher &, int), watcher &w, int) const = 0; - }; - template - struct proxy : proxy_base { - virtual void call (void *obj, void (object::*meth)(watcher &, int), watcher &w, int e) const + void set (EV_P) { - ((reinterpret_cast(obj)) ->* (reinterpret_cast(meth))) - (w, e); + this->EV_A = EV_A; } - }; + #endif - proxy_base *prxy; + base () + { + ev_init (this, 0); + } - public: - template - explicit callback (O1 *object, void (O2::*method)(watcher &, int)) + void set_ (void *object, void (*cb)(ev_watcher *w, int revents)) + { + this->data = object; + ev_set_cb (static_cast(this), cb); + } + + template + void set (K *object) + { + set_ (object, method_thunk); + } + + template + static void method_thunk (ev_watcher *w, int revents) + { + watcher *self = static_cast(w); + K *obj = static_cast(self->data); + (obj->*method) (*self, revents); + } + + template + void set (const K *object) + { + set_ (object, const_method_thunk); + } + + template + static void const_method_thunk (ev_watcher *w, int revents) + { + watcher *self = static_cast(w); + K *obj = static_cast(self->data); + (obj->*method) (*self, revents); + } + + template + void set () + { + set_ (0, function_thunk); + } + + template + static void function_thunk (ev_watcher *w, int revents) + { + watcher *self = static_cast(w); + function (*self, revents); + } + + void operator ()(int events = EV_UNDEF) + { + return ev_cb (static_cast(this)) + (static_cast(this), events); + } + + bool is_active () const { - static proxy p; - obj = reinterpret_cast(object); - meth = reinterpret_cast(method); - prxy = &p; + return ev_is_active (static_cast(this)); } - void call (watcher *w, int e) const + bool is_pending () const { - return prxy->call (obj, meth, *w, e); + return ev_is_pending (static_cast(this)); } }; @@ -52,10 +94,13 @@ TIMEOUT = EV_TIMEOUT, PERIODIC = EV_PERIODIC, SIGNAL = EV_SIGNAL, + CHILD = EV_CHILD, + STAT = EV_STAT, IDLE = EV_IDLE, CHECK = EV_CHECK, PREPARE = EV_PREPARE, - CHILD = EV_CHILD, + FORK = EV_FORK, + EMBED = EV_EMBED, ERROR = EV_ERROR, }; @@ -67,49 +112,24 @@ } #if EV_MULTIPLICITY - - #define EV_CONSTRUCT(cppstem) \ - EV_P; \ - \ - void set (EV_P) \ + #define EV_CONSTRUCT \ + (EV_P = EV_DEFAULT) \ { \ - this->EV_A = EV_A; \ - } \ - \ - template \ - explicit cppstem (O1 *object, void (O2::*method)(cppstem &, int), EV_P = ev_default_loop (0)) \ - : callback (object, method), EV_A (EV_A) - + set (EV_A); \ + } #else - - #define EV_CONSTRUCT(cppstem) \ - template \ - explicit cppstem (O1 *object, void (O2::*method)(cppstem &, int)) \ - : callback (object, method) - + #define EV_CONSTRUCT \ + () \ + { \ + } #endif /* using a template here would require quite a bit more lines, * so a macro solution was chosen */ #define EV_BEGIN_WATCHER(cppstem,cstem) \ \ - struct cppstem : ev_ ## cstem, callback \ + struct cppstem : base \ { \ - EV_CONSTRUCT (cppstem) \ - { \ - ev_init (static_cast(this), thunk); \ - } \ - \ - bool is_active () const \ - { \ - return ev_is_active (static_cast(this)); \ - } \ - \ - bool is_pending () const \ - { \ - return ev_is_pending (static_cast(this)); \ - } \ - \ void start () \ { \ ev_ ## cstem ## _start (EV_A_ static_cast(this)); \ @@ -120,29 +140,22 @@ ev_ ## cstem ## _stop (EV_A_ static_cast(this)); \ } \ \ - void operator ()(int events = EV_UNDEF) \ - { \ - return call (this, events); \ - } \ + cppstem EV_CONSTRUCT \ \ ~cppstem () \ { \ stop (); \ } \ \ + using base::set; \ + \ private: \ \ cppstem (const cppstem &o) \ - : callback (this, (void (cppstem::*)(cppstem &, int))0) \ { /* disabled */ } \ \ void operator =(const cppstem &o) { /* disabled */ } \ \ - static void thunk (EV_P_ struct ev_ ## cstem *w, int revents) \ - { \ - (*static_cast(w))(revents); \ - } \ - \ public: #define EV_END_WATCHER(cppstem,cstem) \ @@ -193,7 +206,7 @@ } EV_END_WATCHER (timer, timer) - #if EV_PERIODICS + #if EV_PERIODIC_ENABLE EV_BEGIN_WATCHER (periodic, periodic) void set (ev_tstamp at, ev_tstamp interval = 0.) { @@ -216,18 +229,6 @@ EV_END_WATCHER (periodic, periodic) #endif - EV_BEGIN_WATCHER (idle, idle) - void set () { } - EV_END_WATCHER (idle, idle) - - EV_BEGIN_WATCHER (prepare, prepare) - void set () { } - EV_END_WATCHER (prepare, prepare) - - EV_BEGIN_WATCHER (check, check) - void set () { } - EV_END_WATCHER (check, check) - EV_BEGIN_WATCHER (sig, signal) void set (int signum) { @@ -260,20 +261,48 @@ } EV_END_WATCHER (child, child) - #if EV_MULTIPLICITY - - EV_BEGIN_WATCHER (embed, embed) - void set (struct ev_loop *loop) + #if EV_STAT_ENABLE + EV_BEGIN_WATCHER (stat, stat) + void set (const char *path, ev_tstamp interval = 0.) { int active = is_active (); if (active) stop (); - ev_embed_set (static_cast(this), loop); + ev_stat_set (static_cast(this), path, interval); if (active) start (); } + void start (const char *path, ev_tstamp interval = 0.) + { + stop (); + set (path, interval); + start (); + } + + void update () + { + ev_stat_stat (EV_A_ static_cast(this)); + } + EV_END_WATCHER (stat, stat) + #endif + + EV_BEGIN_WATCHER (idle, idle) + void set () { } + EV_END_WATCHER (idle, idle) + + EV_BEGIN_WATCHER (prepare, prepare) + void set () { } + EV_END_WATCHER (prepare, prepare) + + EV_BEGIN_WATCHER (check, check) + void set () { } + EV_END_WATCHER (check, check) + + #if EV_EMBED_ENABLE + EV_BEGIN_WATCHER (embed, embed) void start (struct ev_loop *embedded_loop) { - set (embedded_loop); + stop (); + ev_embed_set (static_cast(this), embedded_loop); start (); } @@ -282,7 +311,12 @@ ev_embed_sweep (EV_A_ static_cast(this)); } EV_END_WATCHER (embed, embed) + #endif + #if EV_FORK_ENABLE + EV_BEGIN_WATCHER (fork, fork) + void set () { } + EV_END_WATCHER (fork, fork) #endif #undef EV_CONSTRUCT