X-Git-Url: https://git.llucax.com/software/libev.git/blobdiff_plain/d1d02ca0040b567cfc3081701b52b0361412a444..9ed25a080c823727fa23609c493b3f77585581e2:/ev%20%20.h/software/libev.git/blobdiff_plain/d1d02ca0040b567cfc3081701b52b0361412a444..9ed25a080c823727fa23609c493b3f77585581e2:/ev++.h?ds=sidebyside diff --git a/ev++.h b/ev++.h index 95d0a76..0f51bd5 100644 --- a/ev++.h +++ b/ev++.h @@ -1,7 +1,7 @@ #ifndef EVPP_H__ #define EVPP_H__ -/* work in progress, don't use unless you know what you are doing */ +#include "ev.h" namespace ev { @@ -44,7 +44,20 @@ namespace ev { } }; - #include "ev.h" + enum { + UNDEF = EV_UNDEF, + NONE = EV_NONE, + READ = EV_READ, + WRITE = EV_WRITE, + TIMEOUT = EV_TIMEOUT, + PERIODIC = EV_PERIODIC, + SIGNAL = EV_SIGNAL, + IDLE = EV_IDLE, + CHECK = EV_CHECK, + PREPARE = EV_PREPARE, + CHILD = EV_CHILD, + ERROR = EV_ERROR, + }; typedef ev_tstamp tstamp; @@ -78,15 +91,13 @@ namespace ev { /* using a template here would require quite a bit more lines, * so a macro solution was chosen */ - #define EV_DECLARE_WATCHER(cppstem,cstem) \ - \ - extern "C" void cb_ ## cppstem (struct ev_ ## cstem *w, int revents); \ + #define EV_BEGIN_WATCHER(cppstem,cstem) \ \ struct cppstem : ev_ ## cstem, callback \ { \ EV_CONSTRUCT (cppstem) \ { \ - ev_init (static_cast(this), cb_ ## cppstem); \ + ev_init (static_cast(this), thunk); \ } \ \ bool is_active () const \ @@ -114,16 +125,30 @@ namespace ev { return call (this, events); \ } \ \ + ~cppstem () \ + { \ + stop (); \ + } \ + \ private: \ \ cppstem (const cppstem &o) \ : callback (this, (void (cppstem::*)(cppstem &, int))0) \ { /* disabled */ } \ + \ void operator =(const cppstem &o) { /* disabled */ } \ \ + static void thunk (EV_P_ struct ev_ ## cstem *w, int revents) \ + { \ + (*static_cast(w))(revents); \ + } \ + \ public: - EV_DECLARE_WATCHER (io, io) + #define EV_END_WATCHER(cppstem,cstem) \ + }; + + EV_BEGIN_WATCHER (io, io) void set (int fd, int events) { int active = is_active (); @@ -145,9 +170,9 @@ namespace ev { set (fd, events); start (); } - }; + EV_END_WATCHER (io, io) - EV_DECLARE_WATCHER (timer, timer) + EV_BEGIN_WATCHER (timer, timer) void set (ev_tstamp after, ev_tstamp repeat = 0.) { int active = is_active (); @@ -166,9 +191,10 @@ namespace ev { { ev_timer_again (EV_A_ static_cast(this)); } - }; + EV_END_WATCHER (timer, timer) - EV_DECLARE_WATCHER (periodic, periodic) + #if EV_PERIODICS + EV_BEGIN_WATCHER (periodic, periodic) void set (ev_tstamp at, ev_tstamp interval = 0.) { int active = is_active (); @@ -187,18 +213,22 @@ namespace ev { { ev_periodic_again (EV_A_ static_cast(this)); } - }; + EV_END_WATCHER (periodic, periodic) + #endif - EV_DECLARE_WATCHER (idle, idle) - }; + EV_BEGIN_WATCHER (idle, idle) + void set () { } + EV_END_WATCHER (idle, idle) - EV_DECLARE_WATCHER (prepare, prepare) - }; + EV_BEGIN_WATCHER (prepare, prepare) + void set () { } + EV_END_WATCHER (prepare, prepare) - EV_DECLARE_WATCHER (check, check) - }; + EV_BEGIN_WATCHER (check, check) + void set () { } + EV_END_WATCHER (check, check) - EV_DECLARE_WATCHER (sig, signal) + EV_BEGIN_WATCHER (sig, signal) void set (int signum) { int active = is_active (); @@ -212,9 +242,9 @@ namespace ev { set (signum); start (); } - }; + EV_END_WATCHER (sig, signal) - EV_DECLARE_WATCHER (child, child) + EV_BEGIN_WATCHER (child, child) void set (int pid) { int active = is_active (); @@ -228,10 +258,36 @@ namespace ev { set (pid); start (); } - }; + EV_END_WATCHER (child, child) + + #if EV_MULTIPLICITY + + EV_BEGIN_WATCHER (embed, embed) + void set (struct ev_loop *loop) + { + int active = is_active (); + if (active) stop (); + ev_embed_set (static_cast(this), loop); + if (active) start (); + } + + void start (struct ev_loop *embedded_loop) + { + set (embedded_loop); + start (); + } + + void sweep () + { + ev_embed_sweep (EV_A_ static_cast(this)); + } + EV_END_WATCHER (embed, embed) + + #endif #undef EV_CONSTRUCT - #undef EV_DECLARE_WATCHER + #undef EV_BEGIN_WATCHER + #undef EV_END_WATCHER } #endif