--- libev/ev++.h 2008/01/22 18:09:23 1.36 +++ libev/ev++.h 2018/10/25 03:11:04 1.64 @@ -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, @@ -72,44 +75,51 @@ CHECK = EV_CHECK, PREPARE = EV_PREPARE, 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 #if EV_USE_STDEXCEPT - : std::runtime_error + : std::exception #endif { #if EV_USE_STDEXCEPT - bad_loop () - : std::runtime_error ("libev event loop cannot be initialized, bad value of LIBEV_FLAGS?") + const char *what () const EV_NOEXCEPT { + return "libev event loop cannot be initialized, bad value of LIBEV_FLAGS?"; } #endif }; @@ -132,15 +142,14 @@ struct loop_ref { - - loop_ref (EV_P) throw () + loop_ref (EV_P) EV_NOEXCEPT #if EV_MULTIPLICITY : EV_AX (EV_A) #endif { } - bool operator == (const loop_ref &other) const throw () + bool operator == (const loop_ref &other) const EV_NOEXCEPT { #if EV_MULTIPLICITY return EV_AX == other.EV_AX; @@ -149,7 +158,7 @@ #endif } - bool operator != (const loop_ref &other) const throw () + bool operator != (const loop_ref &other) const EV_NOEXCEPT { #if EV_MULTIPLICITY return ! (*this == other); @@ -159,176 +168,176 @@ } #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 EV_NOEXCEPT { - 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 EV_NOEXCEPT { - return (*this == other); + return ! (*this == EV_A); } - operator struct ev_loop * () const throw () + operator struct ev_loop * () const EV_NOEXCEPT { return EV_AX; } - operator const struct ev_loop * () const throw () + operator const struct ev_loop * () const EV_NOEXCEPT { return EV_AX; } - bool is_default () const throw () + bool is_default () const EV_NOEXCEPT { return EV_AX == ev_default_loop (0); } #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 () + void unloop (how_t how = ONE) EV_NOEXCEPT { - 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) EV_NOEXCEPT { - return ev_loop_count (EV_AX); + ev_break (EV_AX_ how); } - unsigned int backend () const throw () + void post_fork () EV_NOEXCEPT + { + ev_loop_fork (EV_AX); + } + + unsigned int backend () const EV_NOEXCEPT { return ev_backend (EV_AX); } - tstamp now () const throw () + tstamp now () const EV_NOEXCEPT { return ev_now (EV_AX); } - void ref () throw () + void ref () EV_NOEXCEPT { ev_ref (EV_AX); } - void unref () throw () + void unref () EV_NOEXCEPT { ev_unref (EV_AX); } - void set_io_collect_interval (tstamp interval) throw () +#if EV_FEATURE_API + unsigned int iteration () const EV_NOEXCEPT + { + return ev_iteration (EV_AX); + } + + unsigned int depth () const EV_NOEXCEPT + { + return ev_depth (EV_AX); + } + + void set_io_collect_interval (tstamp interval) EV_NOEXCEPT { ev_set_io_collect_interval (EV_AX_ interval); } - void set_timeout_collect_interval (tstamp interval) throw () + void set_timeout_collect_interval (tstamp interval) EV_NOEXCEPT { 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) EV_NOEXCEPT { ev_once (EV_AX_ fd, events, timeout, cb, arg); } // method callback template - void once (int fd, int events, tstamp timeout, K *object) throw () + void once (int fd, int events, tstamp timeout, K *object) EV_NOEXCEPT { once (fd, events, timeout, method_thunk, object); } - template - static void method_thunk (int revents, void* arg) + // default method == operator () + template + void once (int fd, int events, tstamp timeout, K *object) EV_NOEXCEPT { - K *obj = static_cast(arg); - (obj->*method) (revents); + once (fd, events, timeout, method_thunk, object); } - // 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) + 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 () + void once (int fd, int events, tstamp timeout, K *object) EV_NOEXCEPT { once (fd, events, timeout, method_noargs_thunk, object); } 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 template - void once (int fd, int events, tstamp timeout) throw () + void once (int fd, int events, tstamp timeout) EV_NOEXCEPT { once (fd, events, timeout, simpler_func_thunk); } 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 template - void once (int fd, int events, tstamp timeout) throw () + void once (int fd, int events, tstamp timeout) EV_NOEXCEPT { once (fd, events, timeout, simplest_func_thunk); } 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 () + void feed_fd_event (int fd, int revents) EV_NOEXCEPT { ev_feed_fd_event (EV_AX_ fd, revents); } - void feed_signal_event (int signum) throw () + void feed_signal_event (int signum) EV_NOEXCEPT { ev_feed_signal_event (EV_AX_ signum); } @@ -343,14 +352,14 @@ struct dynamic_loop : loop_ref { - dynamic_loop (unsigned int flags = AUTO) throw (bad_loop) + dynamic_loop (unsigned int flags = AUTO) : loop_ref (ev_loop_new (flags)) { if (!EV_AX) throw bad_loop (); } - ~dynamic_loop () throw () + ~dynamic_loop () EV_NOEXCEPT { ev_loop_destroy (EV_AX); EV_AX = 0; @@ -367,8 +376,7 @@ struct default_loop : loop_ref { - - default_loop (unsigned int flags = AUTO) throw (bad_loop) + default_loop (unsigned int flags = AUTO) #if EV_MULTIPLICITY : loop_ref (ev_default_loop (flags)) #endif @@ -383,17 +391,12 @@ 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 () + inline loop_ref get_default_loop () EV_NOEXCEPT { #if EV_MULTIPLICITY return ev_default_loop (0); @@ -421,13 +424,14 @@ #if EV_MULTIPLICITY EV_PX; - void set (EV_PX) throw () + // loop set + void set (EV_P) EV_NOEXCEPT { this->EV_A = EV_A; } #endif - base (EV_PX) throw () + base (EV_PX) EV_NOEXCEPT #if EV_MULTIPLICITY : EV_A (EV_A) #endif @@ -435,56 +439,50 @@ 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)) EV_NOEXCEPT { - 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) EV_NOEXCEPT { - 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) EV_NOEXCEPT { - 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) EV_NOEXCEPT { - 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 () + void set (K *object) EV_NOEXCEPT { set_ (object, method_noargs_thunk); } @@ -492,109 +490,110 @@ 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 () + bool is_active () const EV_NOEXCEPT { return ev_is_active (static_cast(this)); } - bool is_pending () const throw () + bool is_pending () const EV_NOEXCEPT { return ev_is_pending (static_cast(this)); } - void feed_event (int revents) throw () + void feed_event (int revents) EV_NOEXCEPT { - ev_feed_event (EV_A_ static_cast(this), revents); + ev_feed_event (EV_A_ static_cast(this), revents); } }; - inline tstamp now () throw () + inline tstamp now (EV_P) EV_NOEXCEPT { - return ev_time (); + return ev_now (EV_A); } - inline void delay (tstamp interval) throw () + inline void delay (tstamp interval) EV_NOEXCEPT { ev_sleep (interval); } - inline int version_major () throw () + inline int version_major () EV_NOEXCEPT { return ev_version_major (); } - inline int version_minor () throw () + inline int version_minor () EV_NOEXCEPT { return ev_version_minor (); } - inline unsigned int supported_backends () throw () + inline unsigned int supported_backends () EV_NOEXCEPT { return ev_supported_backends (); } - inline unsigned int recommended_backends () throw () + inline unsigned int recommended_backends () EV_NOEXCEPT { return ev_recommended_backends (); } - inline unsigned int embeddable_backends () throw () + inline unsigned int embeddable_backends () EV_NOEXCEPT { return ev_embeddable_backends (); } - inline void set_allocator (void *(*cb)(void *ptr, long size)) throw () + inline void set_allocator (void *(*cb)(void *ptr, long size) EV_NOEXCEPT) EV_NOEXCEPT { ev_set_allocator (cb); } - inline void set_syserr_cb (void (*cb)(const char *msg)) throw () + inline void set_syserr_cb (void (*cb)(const char *msg) EV_NOEXCEPT) EV_NOEXCEPT { ev_set_syserr_cb (cb); } #if EV_MULTIPLICITY #define EV_CONSTRUCT(cppstem,cstem) \ - (EV_PX = get_default_loop ()) throw () \ + (EV_PX = get_default_loop ()) EV_NOEXCEPT \ : base (EV_A) \ { \ } #else #define EV_CONSTRUCT(cppstem,cstem) \ - () throw () \ + () EV_NOEXCEPT \ { \ } #endif - /* using a template here would require quite a bit more lines, + /* using a template here would require quite a few more lines, * so a macro solution was chosen */ #define EV_BEGIN_WATCHER(cppstem,cstem) \ \ struct cppstem : base \ { \ - void start () throw () \ + void start () EV_NOEXCEPT \ { \ ev_ ## cstem ## _start (EV_A_ static_cast(this)); \ } \ \ - void stop () throw () \ + void stop () EV_NOEXCEPT \ { \ ev_ ## cstem ## _stop (EV_A_ static_cast(this)); \ } \ \ cppstem EV_CONSTRUCT(cppstem,cstem) \ \ - ~cppstem () throw () \ + ~cppstem () EV_NOEXCEPT \ { \ stop (); \ } \ @@ -605,7 +604,7 @@ \ cppstem (const cppstem &o); \ \ - cppstem & operator =(const cppstem &o); \ + cppstem &operator =(const cppstem &o); \ \ public: @@ -613,7 +612,7 @@ }; EV_BEGIN_WATCHER (io, io) - void set (int fd, int events) throw () + void set (int fd, int events) EV_NOEXCEPT { int active = is_active (); if (active) stop (); @@ -621,7 +620,7 @@ if (active) start (); } - void set (int events) throw () + void set (int events) EV_NOEXCEPT { int active = is_active (); if (active) stop (); @@ -629,7 +628,7 @@ if (active) start (); } - void start (int fd, int events) throw () + void start (int fd, int events) EV_NOEXCEPT { set (fd, events); start (); @@ -637,7 +636,7 @@ EV_END_WATCHER (io, io) EV_BEGIN_WATCHER (timer, timer) - void set (ev_tstamp after, ev_tstamp repeat = 0.) throw () + void set (ev_tstamp after, ev_tstamp repeat = 0.) EV_NOEXCEPT { int active = is_active (); if (active) stop (); @@ -645,21 +644,26 @@ if (active) start (); } - void start (ev_tstamp after, ev_tstamp repeat = 0.) throw () + void start (ev_tstamp after, ev_tstamp repeat = 0.) EV_NOEXCEPT { set (after, repeat); start (); } - void again () throw () + void again () EV_NOEXCEPT { 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 EV_BEGIN_WATCHER (periodic, periodic) - void set (ev_tstamp at, ev_tstamp interval = 0.) throw () + void set (ev_tstamp at, ev_tstamp interval = 0.) EV_NOEXCEPT { int active = is_active (); if (active) stop (); @@ -667,21 +671,22 @@ if (active) start (); } - void start (ev_tstamp at, ev_tstamp interval = 0.) throw () + void start (ev_tstamp at, ev_tstamp interval = 0.) EV_NOEXCEPT { set (at, interval); start (); } - void again () throw () + void again () EV_NOEXCEPT { ev_periodic_again (EV_A_ static_cast(this)); } EV_END_WATCHER (periodic, periodic) #endif + #if EV_SIGNAL_ENABLE EV_BEGIN_WATCHER (sig, signal) - void set (int signum) throw () + void set (int signum) EV_NOEXCEPT { int active = is_active (); if (active) stop (); @@ -689,32 +694,35 @@ if (active) start (); } - void start (int signum) throw () + void start (int signum) EV_NOEXCEPT { set (signum); 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) EV_NOEXCEPT { 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) EV_NOEXCEPT { - set (pid); + set (pid, trace); start (); } EV_END_WATCHER (child, child) + #endif #if EV_STAT_ENABLE EV_BEGIN_WATCHER (stat, stat) - void set (const char *path, ev_tstamp interval = 0.) throw () + void set (const char *path, ev_tstamp interval = 0.) EV_NOEXCEPT { int active = is_active (); if (active) stop (); @@ -722,38 +730,51 @@ if (active) start (); } - void start (const char *path, ev_tstamp interval = 0.) throw () + void start (const char *path, ev_tstamp interval = 0.) EV_NOEXCEPT { stop (); set (path, interval); start (); } - void update () throw () + void update () EV_NOEXCEPT { ev_stat_stat (EV_A_ static_cast(this)); } EV_END_WATCHER (stat, stat) #endif + #if EV_IDLE_ENABLE EV_BEGIN_WATCHER (idle, idle) - void set () throw () { } + void set () EV_NOEXCEPT { } EV_END_WATCHER (idle, idle) + #endif + #if EV_PREPARE_ENABLE EV_BEGIN_WATCHER (prepare, prepare) - void set () throw () { } + void set () EV_NOEXCEPT { } EV_END_WATCHER (prepare, prepare) + #endif + #if EV_CHECK_ENABLE EV_BEGIN_WATCHER (check, check) - void set () throw () { } + void set () EV_NOEXCEPT { } 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_embed (struct ev_loop *embedded_loop) EV_NOEXCEPT { - 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) EV_NOEXCEPT + { + set (embedded_loop); start (); } @@ -766,16 +787,29 @@ #if EV_FORK_ENABLE EV_BEGIN_WATCHER (fork, fork) - void set () throw () { } + void set () EV_NOEXCEPT { } EV_END_WATCHER (fork, fork) #endif + #if EV_ASYNC_ENABLE + EV_BEGIN_WATCHER (async, async) + void send () EV_NOEXCEPT + { + ev_async_send (EV_A_ static_cast(this)); + } + + bool async_pending () EV_NOEXCEPT + { + 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