--- libev/ev++.h 2007/12/04 16:23:29 1.13 +++ libev/ev++.h 2008/01/18 18:13:40 1.25 @@ -1,10 +1,98 @@ +/* + * libev simple C++ wrapper classes + * + * Copyright (c) 2007 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 + * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPE- + * CIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; + * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTH- + * ERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED + * OF THE POSSIBILITY OF SUCH DAMAGE. + * + * Alternatively, the contents of this file may be used under the terms of + * the GNU General Public License ("GPL") version 2 or any later version, + * in which case the provisions of the GPL are applicable instead of + * the above. If you wish to allow the use of your version of this file + * only under the terms of the GPL and not to allow others to use your + * version of this file under the BSD license, indicate your decision + * by deleting the provisions above and replace them with the notice + * and other provisions required by the GPL. If you do not delete the + * provisions above, a recipient may use your version of this file under + * either the BSD or the GPL. + */ + #ifndef EVPP_H__ #define EVPP_H__ -#include "ev.h" +#ifdef EV_H +# include EV_H +#else +# include "ev.h" +#endif namespace ev { + typedef ev_tstamp tstamp; + + enum { + UNDEF = EV_UNDEF, + NONE = EV_NONE, + READ = EV_READ, + WRITE = EV_WRITE, + TIMEOUT = EV_TIMEOUT, + PERIODIC = EV_PERIODIC, + SIGNAL = EV_SIGNAL, + CHILD = EV_CHILD, + STAT = EV_STAT, + IDLE = EV_IDLE, + CHECK = EV_CHECK, + PREPARE = EV_PREPARE, + FORK = EV_FORK, + EMBED = EV_EMBED, + ERROR = EV_ERROR, + }; + + enum + { + 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 + }; + + enum + { + NONBLOCK = EVLOOP_NONBLOCK, + ONESHOT = EVLOOP_ONESHOT + }; + + enum how_t + { + ONE = EVUNLOOP_ONE, + ALL = EVUNLOOP_ALL + }; + template struct base : ev_watcher { @@ -22,12 +110,13 @@ ev_init (this, 0); } - void set_ (void *object, void (*cb)(ev_watcher *w, int revents)) + void set_ (void *data, void (*cb)(EV_P_ ev_watcher *w, int revents)) { - this->data = object; + this->data = data; ev_set_cb (static_cast(this), cb); } + // method callback template void set (K *object) { @@ -35,13 +124,13 @@ } template - static void method_thunk (ev_watcher *w, int revents) + static void method_thunk (EV_P_ ev_watcher *w, int revents) { - watcher *self = static_cast(w); - K *obj = static_cast(self->data); - (obj->*method) (*self, revents); + K *obj = static_cast(w->data); + (obj->*method) (*static_cast(w), revents); } + // const method callback template void set (const K *object) { @@ -49,29 +138,43 @@ } template - static void const_method_thunk (ev_watcher *w, int revents) + static void const_method_thunk (EV_P_ ev_watcher *w, int revents) { - watcher *self = static_cast(w); - K *obj = static_cast(self->data); - (obj->*method) (*self, revents); + K *obj = static_cast(w->data); + (static_cast(w->data)->*method) (*static_cast(w), revents); } + // function callback template - void set () + void set (void *data = 0) { - set_ (0, function_thunk); + set_ (data, function_thunk); } template - static void function_thunk (ev_watcher *w, int revents) + static void function_thunk (EV_P_ ev_watcher *w, int revents) + { + function (*static_cast(w), revents); + } + + // simple callback + template + void set (K *object) + { + set_ (object, method_noargs_thunk); + } + + template + static void method_noargs_thunk (EV_P_ ev_watcher *w, int revents) { - watcher *self = static_cast(w); - function (*self, revents); + K *obj = static_cast(w->data); + (obj->*method) (); } void operator ()(int events = EV_UNDEF) { - return e_cb (static_cast(this)) (events); + return ev_cb (static_cast(this)) + (static_cast(this), events); } bool is_active () const @@ -85,25 +188,6 @@ } }; - enum { - UNDEF = EV_UNDEF, - NONE = EV_NONE, - READ = EV_READ, - WRITE = EV_WRITE, - TIMEOUT = EV_TIMEOUT, - PERIODIC = EV_PERIODIC, - SIGNAL = EV_SIGNAL, - CHILD = EV_CHILD, - STAT = EV_STAT, - IDLE = EV_IDLE, - CHECK = EV_CHECK, - PREPARE = EV_PREPARE, - FORK = EV_FORK, - EMBED = EV_EMBED, - ERROR = EV_ERROR, - }; - - typedef ev_tstamp tstamp; inline ev_tstamp now (EV_P) { @@ -150,10 +234,9 @@ \ private: \ \ - cppstem (const cppstem &o) \ - { /* disabled */ } \ + cppstem (const cppstem &o); \ \ - void operator =(const cppstem &o) { /* disabled */ } \ + cppstem & operator =(const cppstem &o); \ \ public: