--- libev/ev++.h 2008/01/18 18:14:41 1.28 +++ libev/ev++.h 2008/11/05 14:36:18 1.43 @@ -1,7 +1,7 @@ /* * libev simple C++ wrapper classes * - * Copyright (c) 2007 Marc Alexander Lehmann + * Copyright (c) 2007,2008 Marc Alexander Lehmann * All rights reserved. * * Redistribution and use in source and binary forms, with or without modifica- @@ -46,11 +46,20 @@ # include "ev.h" #endif +#ifndef EV_USE_STDEXCEPT +# define EV_USE_STDEXCEPT 1 +#endif + +#if EV_USE_STDEXCEPT +# include +#endif + namespace ev { typedef ev_tstamp tstamp; - enum { + enum + { UNDEF = EV_UNDEF, NONE = EV_NONE, READ = EV_READ, @@ -64,27 +73,30 @@ CHECK = EV_CHECK, PREPARE = EV_PREPARE, FORK = EV_FORK, + ASYNC = EV_ASYNC, EMBED = EV_EMBED, +# 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 { NONBLOCK = EVLOOP_NONBLOCK, - ONESHOT = EVLOOP_ONESHOT + ONESHOT = EVLOOP_ONESHOT }; enum how_t @@ -93,6 +105,19 @@ ALL = EVUNLOOP_ALL }; + struct bad_loop +#if EV_USE_STDEXCEPT + : std::runtime_error +#endif + { +#if EV_USE_STDEXCEPT + bad_loop () + : std::runtime_error ("libev event loop cannot be initialized, bad value of LIBEV_FLAGS?") + { + } +#endif + }; + #ifdef EV_AX # undef EV_AX #endif @@ -111,24 +136,23 @@ struct loop_ref { - - loop_ref (EV_P) + loop_ref (EV_P) throw () #if EV_MULTIPLICITY - : EV_AX (EV_A) + : EV_AX (EV_A) #endif { } - bool operator== (const loop_ref &other) const + bool operator == (const loop_ref &other) const throw () { #if EV_MULTIPLICITY - return this->EV_AX == other.EV_AX; + return EV_AX == other.EV_AX; #else return true; #endif } - bool operator!= (const loop_ref &other) const + bool operator != (const loop_ref &other) const throw () { #if EV_MULTIPLICITY return ! (*this == other); @@ -138,37 +162,37 @@ } #if EV_MULTIPLICITY - bool operator== (struct ev_loop *other) const + bool operator == (struct ev_loop *other) const throw () { return this->EV_AX == other; } - bool operator!= (struct ev_loop *other) const + bool operator != (struct ev_loop *other) const throw () { return ! (*this == other); } - bool operator== (const struct ev_loop *other) const + bool operator == (const struct ev_loop *other) const throw () { return this->EV_AX == other; } - bool operator!= (const struct ev_loop *other) const + bool operator != (const struct ev_loop *other) const throw () { return (*this == other); } - operator struct ev_loop * () const + operator struct ev_loop * () const throw () { return EV_AX; } - operator const struct ev_loop * () const + operator const struct ev_loop * () const throw () { return EV_AX; } - bool is_default () const + bool is_default () const throw () { return EV_AX == ev_default_loop (0); } @@ -179,12 +203,12 @@ ev_loop (EV_AX_ flags); } - void unloop (how_t how = ONE) + void unloop (how_t how = ONE) throw () { ev_unloop (EV_AX_ how); } - void post_fork () + void post_fork () throw () { #if EV_MULTIPLICITY ev_loop_fork (EV_AX); @@ -193,50 +217,50 @@ #endif } - unsigned int count () const + unsigned int count () const throw () { return ev_loop_count (EV_AX); } - unsigned int backend () const + unsigned int backend () const throw () { return ev_backend (EV_AX); } - tstamp now () const + tstamp now () const throw () { return ev_now (EV_AX); } - void ref () + void ref () throw () { ev_ref (EV_AX); } - void unref () + void unref () throw () { ev_unref (EV_AX); } - void set_io_collect_interval (tstamp interval) + void set_io_collect_interval (tstamp interval) throw () { ev_set_io_collect_interval (EV_AX_ interval); } - void set_timeout_collect_interval (tstamp interval) + void set_timeout_collect_interval (tstamp interval) throw () { ev_set_timeout_collect_interval (EV_AX_ interval); } // function callback - void once (int fd, int events, tstamp timeout, void (*cb)(int, void *), void* arg = 0) + 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); } // method callback template - void once (int fd, int events, tstamp timeout, K *object) + void once (int fd, int events, tstamp timeout, K *object) throw () { once (fd, events, timeout, method_thunk, object); } @@ -250,7 +274,7 @@ // const method callback template - void once (int fd, int events, tstamp timeout, const K *object) + void once (int fd, int events, tstamp timeout, const K *object) throw () { once (fd, events, timeout, const_method_thunk, object); } @@ -264,7 +288,7 @@ // simple method callback template - void once (int fd, int events, tstamp timeout, K *object) + void once (int fd, int events, tstamp timeout, K *object) throw () { once (fd, events, timeout, method_noargs_thunk, object); } @@ -278,7 +302,7 @@ // simpler function callback template - void once (int fd, int events, tstamp timeout) + void once (int fd, int events, tstamp timeout) throw () { once (fd, events, timeout, simpler_func_thunk); } @@ -291,7 +315,7 @@ // simplest function callback template - void once (int fd, int events, tstamp timeout) + void once (int fd, int events, tstamp timeout) throw () { once (fd, events, timeout, simplest_func_thunk); } @@ -302,12 +326,12 @@ (*cb) (); } - void feed_fd_event (int fd, int revents) + void feed_fd_event (int fd, int revents) throw () { ev_feed_fd_event (EV_AX_ fd, revents); } - void feed_signal_event (int signum) + void feed_signal_event (int signum) throw () { ev_feed_signal_event (EV_AX_ signum); } @@ -319,15 +343,17 @@ }; #if EV_MULTIPLICITY - struct dynamic_loop: loop_ref + struct dynamic_loop : loop_ref { - dynamic_loop (unsigned int flags = AUTO) - : loop_ref (ev_loop_new (flags)) + dynamic_loop (unsigned int flags = AUTO) throw (bad_loop) + : loop_ref (ev_loop_new (flags)) { + if (!EV_AX) + throw bad_loop (); } - ~dynamic_loop () + ~dynamic_loop () throw () { ev_loop_destroy (EV_AX); EV_AX = 0; @@ -342,37 +368,34 @@ }; #endif - struct default_loop: loop_ref + struct default_loop : loop_ref { - - default_loop (unsigned int flags = AUTO) + default_loop (unsigned int flags = AUTO) throw (bad_loop) #if EV_MULTIPLICITY - : loop_ref (ev_default_loop (flags)) + : loop_ref (ev_default_loop (flags)) +#endif { - } + if ( +#if EV_MULTIPLICITY + !EV_AX #else - { - ev_default_loop (flags); - } + !ev_default_loop (flags) #endif + ) + throw bad_loop (); + } - ~default_loop () + ~default_loop () throw () { ev_default_destroy (); -#if EV_MULTIPLICITY - EV_AX = 0; -#endif } private: - default_loop (const default_loop &); - - default_loop & operator= (const default_loop &); - + default_loop &operator = (const default_loop &); }; - inline loop_ref get_default_loop () + inline loop_ref get_default_loop () throw () { #if EV_MULTIPLICITY return ev_default_loop (0); @@ -400,13 +423,13 @@ #if EV_MULTIPLICITY EV_PX; - void set (EV_PX) + void set (EV_PX) throw () { this->EV_A = EV_A; } #endif - base (EV_PX) + base (EV_PX) throw () #if EV_MULTIPLICITY : EV_A (EV_A) #endif @@ -414,7 +437,7 @@ ev_init (this, 0); } - void set_ (void *data, void (*cb)(EV_P_ ev_watcher *w, int revents)) + void set_ (void *data, void (*cb)(EV_P_ ev_watcher *w, int revents)) throw () { this->data = data; ev_set_cb (static_cast(this), cb); @@ -422,7 +445,7 @@ // method callback template - void set (K *object) + void set (K *object) throw () { set_ (object, method_thunk); } @@ -436,7 +459,7 @@ // const method callback template - void set (const K *object) + void set (const K *object) throw () { set_ (object, const_method_thunk); } @@ -450,7 +473,7 @@ // function callback template - void set (void *data = 0) + void set (void *data = 0) throw () { set_ (data, function_thunk); } @@ -463,7 +486,7 @@ // simple callback template - void set (K *object) + void set (K *object) throw () { set_ (object, method_noargs_thunk); } @@ -481,71 +504,76 @@ (static_cast(this), events); } - bool is_active () const + bool is_active () const throw () { return ev_is_active (static_cast(this)); } - bool is_pending () const + bool is_pending () const throw () { return ev_is_pending (static_cast(this)); } - void feed_event (int revents) + void feed_event (int revents) throw () { ev_feed_event (EV_A_ static_cast(this), revents); } }; - inline void delay (tstamp interval) + inline tstamp now () throw () + { + return ev_time (); + } + + inline void delay (tstamp interval) throw () { ev_sleep (interval); } - inline int version_major () + inline int version_major () throw () { return ev_version_major (); } - inline int version_minor () + inline int version_minor () throw () { return ev_version_minor (); } - inline unsigned int supported_backends () + inline unsigned int supported_backends () throw () { return ev_supported_backends (); } - inline unsigned int recommended_backends () + inline unsigned int recommended_backends () throw () { return ev_recommended_backends (); } - inline unsigned int embeddable_backends () + inline unsigned int embeddable_backends () throw () { return ev_embeddable_backends (); } - inline void set_allocator (void *(*cb)(void *ptr, long size)) + inline void set_allocator (void *(*cb)(void *ptr, long size)) throw () { ev_set_allocator (cb); } - inline void set_syserr_cb (void (*cb)(const char *msg)) + inline void set_syserr_cb (void (*cb)(const char *msg)) throw () { ev_set_syserr_cb (cb); } #if EV_MULTIPLICITY #define EV_CONSTRUCT(cppstem,cstem) \ - (EV_PX = get_default_loop ()) \ + (EV_PX = get_default_loop ()) throw () \ : base (EV_A) \ { \ } #else #define EV_CONSTRUCT(cppstem,cstem) \ - () \ + () throw () \ { \ } #endif @@ -556,19 +584,19 @@ \ struct cppstem : base \ { \ - void start () \ + void start () throw () \ { \ ev_ ## cstem ## _start (EV_A_ static_cast(this)); \ } \ \ - void stop () \ + void stop () throw () \ { \ ev_ ## cstem ## _stop (EV_A_ static_cast(this)); \ } \ \ cppstem EV_CONSTRUCT(cppstem,cstem) \ \ - ~cppstem () \ + ~cppstem () throw () \ { \ stop (); \ } \ @@ -579,7 +607,7 @@ \ cppstem (const cppstem &o); \ \ - cppstem & operator =(const cppstem &o); \ + cppstem &operator =(const cppstem &o); \ \ public: @@ -587,7 +615,7 @@ }; EV_BEGIN_WATCHER (io, io) - void set (int fd, int events) + void set (int fd, int events) throw () { int active = is_active (); if (active) stop (); @@ -595,7 +623,7 @@ if (active) start (); } - void set (int events) + void set (int events) throw () { int active = is_active (); if (active) stop (); @@ -603,7 +631,7 @@ if (active) start (); } - void start (int fd, int events) + void start (int fd, int events) throw () { set (fd, events); start (); @@ -611,7 +639,7 @@ EV_END_WATCHER (io, io) EV_BEGIN_WATCHER (timer, timer) - void set (ev_tstamp after, ev_tstamp repeat = 0.) + void set (ev_tstamp after, ev_tstamp repeat = 0.) throw () { int active = is_active (); if (active) stop (); @@ -619,13 +647,13 @@ if (active) start (); } - void start (ev_tstamp after, ev_tstamp repeat = 0.) + void start (ev_tstamp after, ev_tstamp repeat = 0.) throw () { set (after, repeat); start (); } - void again () + void again () throw () { ev_timer_again (EV_A_ static_cast(this)); } @@ -633,7 +661,7 @@ #if EV_PERIODIC_ENABLE EV_BEGIN_WATCHER (periodic, periodic) - void set (ev_tstamp at, ev_tstamp interval = 0.) + void set (ev_tstamp at, ev_tstamp interval = 0.) throw () { int active = is_active (); if (active) stop (); @@ -641,13 +669,13 @@ if (active) start (); } - void start (ev_tstamp at, ev_tstamp interval = 0.) + void start (ev_tstamp at, ev_tstamp interval = 0.) throw () { set (at, interval); start (); } - void again () + void again () throw () { ev_periodic_again (EV_A_ static_cast(this)); } @@ -655,7 +683,7 @@ #endif EV_BEGIN_WATCHER (sig, signal) - void set (int signum) + void set (int signum) throw () { int active = is_active (); if (active) stop (); @@ -663,7 +691,7 @@ if (active) start (); } - void start (int signum) + void start (int signum) throw () { set (signum); start (); @@ -671,24 +699,24 @@ EV_END_WATCHER (sig, signal) EV_BEGIN_WATCHER (child, child) - void set (int pid) + void set (int pid, int trace = 0) throw () { 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) + void start (int pid, int trace = 0) throw () { - set (pid); + set (pid, trace); start (); } EV_END_WATCHER (child, child) #if EV_STAT_ENABLE EV_BEGIN_WATCHER (stat, stat) - void set (const char *path, ev_tstamp interval = 0.) + void set (const char *path, ev_tstamp interval = 0.) throw () { int active = is_active (); if (active) stop (); @@ -696,14 +724,14 @@ if (active) start (); } - void start (const char *path, ev_tstamp interval = 0.) + void start (const char *path, ev_tstamp interval = 0.) throw () { stop (); set (path, interval); start (); } - void update () + void update () throw () { ev_stat_stat (EV_A_ static_cast(this)); } @@ -711,23 +739,30 @@ #endif EV_BEGIN_WATCHER (idle, idle) - void set () { } + void set () throw () { } EV_END_WATCHER (idle, idle) EV_BEGIN_WATCHER (prepare, prepare) - void set () { } + void set () throw () { } EV_END_WATCHER (prepare, prepare) EV_BEGIN_WATCHER (check, check) - void set () { } + void set () throw () { } EV_END_WATCHER (check, check) #if EV_EMBED_ENABLE EV_BEGIN_WATCHER (embed, embed) - void start (struct ev_loop *embedded_loop) + void set (struct ev_loop *embedded_loop) throw () { - 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) throw () + { + set (embedded_loop); start (); } @@ -740,16 +775,31 @@ #if EV_FORK_ENABLE EV_BEGIN_WATCHER (fork, fork) - void set () { } + void set () throw () { } EV_END_WATCHER (fork, fork) #endif + #if EV_ASYNC_ENABLE + EV_BEGIN_WATCHER (async, async) + void set () throw () { } + + void send () throw () + { + ev_async_send (EV_A_ static_cast(this)); + } + + bool async_pending () throw () + { + 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