--- libev/ev++.h 2008/04/15 04:34:07 1.39 +++ libev/ev++.h 2011/02/16 08:02:50 1.57 @@ -1,19 +1,19 @@ /* * 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- * tion, are permitted provided that the following conditions are met: - * + * * 1. Redistributions of source code must retain the above copyright notice, * this list of conditions and the following disclaimer. - * + * * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * + * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MER- * CHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO @@ -63,7 +63,10 @@ NONE = EV_NONE, READ = EV_READ, WRITE = EV_WRITE, +#if EV_COMPAT3 TIMEOUT = EV_TIMEOUT, +#endif + TIMER = EV_TIMER, PERIODIC = EV_PERIODIC, SIGNAL = EV_SIGNAL, CHILD = EV_CHILD, @@ -74,32 +77,38 @@ FORK = EV_FORK, ASYNC = EV_ASYNC, EMBED = EV_EMBED, - ERROR = EV_ERROR, +# 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 { +#if EV_COMPAT3 NONBLOCK = EVLOOP_NONBLOCK, - ONESHOT = EVLOOP_ONESHOT + ONESHOT = EVLOOP_ONESHOT, +#endif + NOWAIT = EVRUN_NOWAIT, + ONCE = EVRUN_ONCE }; enum how_t { - ONE = EVUNLOOP_ONE, - ALL = EVUNLOOP_ALL + ONE = EVBREAK_ONE, + ALL = EVBREAK_ALL }; struct bad_loop @@ -159,24 +168,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 () @@ -195,28 +194,31 @@ } #endif +#if EV_COMPAT3 void loop (int flags = 0) { - ev_loop (EV_AX_ flags); + ev_run (EV_AX_ flags); } void unloop (how_t how = ONE) throw () { - ev_unloop (EV_AX_ how); + ev_break (EV_AX_ how); } +#endif - void post_fork () throw () + void run (int flags = 0) { -#if EV_MULTIPLICITY - ev_loop_fork (EV_AX); -#else - ev_default_fork (); -#endif + ev_run (EV_AX_ flags); } - unsigned int count () const throw () + void break_loop (how_t how = ONE) throw () { - return ev_loop_count (EV_AX); + ev_break (EV_AX_ how); + } + + void post_fork () throw () + { + ev_loop_fork (EV_AX); } unsigned int backend () const throw () @@ -239,6 +241,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); @@ -248,9 +261,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); } @@ -262,28 +276,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 () { @@ -291,10 +298,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 @@ -305,9 +312,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 @@ -318,9 +326,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 () @@ -382,11 +391,6 @@ throw bad_loop (); } - ~default_loop () throw () - { - ev_default_destroy (); - } - private: default_loop (const default_loop &); default_loop &operator = (const default_loop &); @@ -420,7 +424,8 @@ #if EV_MULTIPLICITY EV_PX; - void set (EV_PX) throw () + // loop set + void set (EV_P) throw () { this->EV_A = EV_A; } @@ -434,54 +439,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 () { @@ -491,14 +490,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 () @@ -654,6 +654,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 @@ -679,6 +684,7 @@ EV_END_WATCHER (periodic, periodic) #endif + #if EV_SIGNAL_ENABLE EV_BEGIN_WATCHER (sig, signal) void set (int signum) throw () { @@ -694,7 +700,9 @@ start (); } EV_END_WATCHER (sig, signal) + #endif + #if EV_CHILD_ENABLE EV_BEGIN_WATCHER (child, child) void set (int pid, int trace = 0) throw () { @@ -710,6 +718,7 @@ start (); } EV_END_WATCHER (child, child) + #endif #if EV_STAT_ENABLE EV_BEGIN_WATCHER (stat, stat) @@ -735,17 +744,23 @@ 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) @@ -778,8 +793,6 @@ #if EV_ASYNC_ENABLE EV_BEGIN_WATCHER (async, async) - void set () throw () { } - void send () throw () { ev_async_send (EV_A_ static_cast(this));