--- libev/ev++.h 2009/07/10 00:36:21 1.45 +++ libev/ev++.h 2020/01/22 13:33:44 1.67 @@ -1,19 +1,19 @@ /* * libev simple C++ wrapper classes * - * Copyright (c) 2007,2008 Marc Alexander Lehmann + * Copyright (c) 2007,2008,2010,2018 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 @@ -58,13 +58,15 @@ typedef ev_tstamp tstamp; - enum - { + enum { UNDEF = EV_UNDEF, 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, @@ -76,7 +78,7 @@ ASYNC = EV_ASYNC, EMBED = EV_EMBED, # undef ERROR // some systems stupidly #define ERROR - ERROR = EV_ERROR, + ERROR = EV_ERROR }; enum @@ -95,25 +97,29 @@ 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 }; @@ -136,14 +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; @@ -152,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); @@ -162,109 +168,117 @@ } #if EV_MULTIPLICITY - bool operator == (const EV_P) const throw () + bool operator == (const EV_P) const EV_NOEXCEPT { return this->EV_AX == EV_A; } - bool operator != (const EV_P) const throw () + bool operator != (const EV_P) const EV_NOEXCEPT { - return (*this == EV_A); + 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) + { + ev_run (EV_AX_ flags); + } + + void break_loop (how_t how = ONE) EV_NOEXCEPT + { + ev_break (EV_AX_ how); + } + + void post_fork () EV_NOEXCEPT { -#if EV_MULTIPLICITY ev_loop_fork (EV_AX); -#else - ev_default_fork (); -#endif } - unsigned int backend () const throw () + 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); } -#if EV_MINIMAL < 2 - unsigned int count () const throw () +#if EV_FEATURE_API + unsigned int iteration () const EV_NOEXCEPT { - return ev_loop_count (EV_AX); + return ev_iteration (EV_AX); } - unsigned int depth () const throw () + unsigned int depth () const EV_NOEXCEPT { - return ev_loop_depth (EV_AX); + return ev_depth (EV_AX); } - void set_io_collect_interval (tstamp interval) throw () + 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); } // default method == operator () 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); } @@ -272,13 +286,13 @@ template static void method_thunk (int revents, void *arg) { - static_cast(arg)->*method + (static_cast(arg)->*method) (revents); } // 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); } @@ -286,13 +300,13 @@ template static void method_noargs_thunk (int revents, void *arg) { - static_cast(arg)->*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); } @@ -306,7 +320,7 @@ // 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); } @@ -318,12 +332,12 @@ (); } - 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); } @@ -338,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; @@ -362,7 +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 @@ -377,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); @@ -412,16 +421,35 @@ template struct base : ev_watcher { + // scoped pause/unpause of a watcher + struct freeze_guard + { + watcher &w; + bool active; + + freeze_guard (watcher *self) EV_NOEXCEPT + : w (*self), active (w.is_active ()) + { + if (active) w.stop (); + } + + ~freeze_guard () + { + if (active) w.start (); + } + }; + #if EV_MULTIPLICITY EV_PX; - void set (EV_P) 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 @@ -429,7 +457,7 @@ ev_init (this, 0); } - void set_ (const 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 = (void *)data; ev_set_cb (static_cast(this), cb); @@ -437,7 +465,7 @@ // function callback template - void set (void *data = 0) throw () + void set (void *data = 0) EV_NOEXCEPT { set_ (data, function_thunk); } @@ -451,14 +479,14 @@ // method callback template - void set (K *object) throw () + void set (K *object) EV_NOEXCEPT { set_ (object, method_thunk); } // default method == operator () template - void set (K *object) throw () + void set (K *object) EV_NOEXCEPT { set_ (object, method_thunk); } @@ -472,7 +500,7 @@ // no-argument callback template - void set (K *object) throw () + void set (K *object) EV_NOEXCEPT { set_ (object, method_noargs_thunk); } @@ -480,7 +508,7 @@ template static void method_noargs_thunk (EV_P_ ev_watcher *w, int revents) { - static_cast(w->data)->*method + (static_cast(w->data)->*method) (); } @@ -491,99 +519,99 @@ (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 (); \ } \ @@ -602,23 +630,19 @@ }; 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 (); + freeze_guard freeze (this); ev_io_set (static_cast(this), fd, events); - if (active) start (); } - void set (int events) throw () + void set (int events) EV_NOEXCEPT { - int active = is_active (); - if (active) stop (); - ev_io_set (static_cast(this), fd, events); - if (active) start (); + freeze_guard freeze (this); + ev_io_modify (static_cast(this), events); } - void start (int fd, int events) throw () + void start (int fd, int events) EV_NOEXCEPT { set (fd, events); start (); @@ -626,128 +650,131 @@ 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 (); + freeze_guard freeze (this); ev_timer_set (static_cast(this), after, repeat); - 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 (); + freeze_guard freeze (this); ev_periodic_set (static_cast(this), at, interval, 0); - 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 (); + freeze_guard freeze (this); ev_signal_set (static_cast(this), signum); - 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, int trace = 0) throw () + void set (int pid, int trace = 0) EV_NOEXCEPT { - int active = is_active (); - if (active) stop (); + freeze_guard freeze (this); ev_child_set (static_cast(this), pid, trace); - if (active) start (); } - void start (int pid, int trace = 0) throw () + void start (int pid, int trace = 0) EV_NOEXCEPT { 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 (); + freeze_guard freeze (this); ev_stat_set (static_cast(this), path, interval); - 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 set (struct ev_loop *embedded_loop) throw () + void set_embed (struct ev_loop *embedded_loop) EV_NOEXCEPT { - int active = is_active (); - if (active) stop (); + freeze_guard freeze (this); ev_embed_set (static_cast(this), embedded_loop); - if (active) start (); } - void start (struct ev_loop *embedded_loop) throw () + void start (struct ev_loop *embedded_loop) EV_NOEXCEPT { set (embedded_loop); start (); @@ -762,20 +789,18 @@ #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 set () throw () { } - - void send () throw () + void send () EV_NOEXCEPT { ev_async_send (EV_A_ static_cast(this)); } - bool async_pending () throw () + bool async_pending () EV_NOEXCEPT { return ev_async_pending (static_cast(this)); }