update c++ if

[software/libev.git] / ev++.h

diff --git a/ev++.h b/ev++.h
index aa46fb422ac0425d2475da841771070cdf8505b7..9d0df26c9e1d74ea722d95daa9503cf912662ed5 100644 (file)
--- a/ev++.h
+++ b/ev++.h
@@ -1,7 +1,7 @@
 #ifndef EVPP_H__
 #define EVPP_H__
 
 #ifndef EVPP_H__
 #define EVPP_H__
 

-/* work in progress, don't use unless you know what you are doing */
+#include "ev.h"

 
 namespace ev {
 
 
 namespace ev {
 


@@ -44,8 +44,6 @@ namespace ev {
     }
   };
 
     }
   };
 

-  #include "ev.h"
-

   enum {
     UNDEF    = EV_UNDEF,
     NONE     = EV_NONE,
   enum {
     UNDEF    = EV_UNDEF,
     NONE     = EV_NONE,


@@ -93,15 +91,13 @@ namespace ev {
 
   /* using a template here would require quite a bit more lines,
    * so a macro solution was chosen */
 
   /* 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<cppstem>                                      \
   {                                                                                     \
     EV_CONSTRUCT (cppstem)                                                              \
     {                                                                                   \
                                                                                         \
   struct cppstem : ev_ ## cstem, callback<cppstem>                                      \
   {                                                                                     \
     EV_CONSTRUCT (cppstem)                                                              \
     {                                                                                   \

-      ev_init (static_cast<ev_ ## cstem *>(this), cb_ ## cppstem);                      \
+      ev_init (static_cast<ev_ ## cstem *>(this), thunk);                               \

     }                                                                                   \
                                                                                         \
     bool is_active () const                                                             \
     }                                                                                   \
                                                                                         \
     bool is_active () const                                                             \


@@ -129,16 +125,30 @@ namespace ev {
       return call (this, events);                                                       \
     }                                                                                   \
                                                                                         \
       return call (this, events);                                                       \
     }                                                                                   \
                                                                                         \

+    ~cppstem ()                                                                         \
+    {                                                                                   \
+      stop ();                                                                          \
+    }                                                                                   \
+                                                                                        \

   private:                                                                              \
                                                                                         \
     cppstem (const cppstem &o)                                                         \
     : callback<cppstem> (this, (void (cppstem::*)(cppstem &, int))0)                    \
     { /* disabled */ }                                                                 \
   private:                                                                              \
                                                                                         \
     cppstem (const cppstem &o)                                                         \
     : callback<cppstem> (this, (void (cppstem::*)(cppstem &, int))0)                    \
     { /* disabled */ }                                                                 \

+                                                                                        \

     void operator =(const cppstem &o) { /* disabled */ }                                \
                                                                                         \
     void operator =(const cppstem &o) { /* disabled */ }                                \
                                                                                         \

+    static void thunk (EV_P_ struct ev_ ## cstem *w, int revents)                       \
+    {                                                                                   \
+      (*static_cast<cppstem *>(w))(revents);                                            \
+    }                                                                                   \
+                                                                                        \

   public:
 
   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 ();
     void set (int fd, int events)
     {
       int active = is_active ();


@@ -160,9 +170,9 @@ namespace ev {
       set (fd, events);
       start ();
     }
       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 ();
     void set (ev_tstamp after, ev_tstamp repeat = 0.)
     {
       int active = is_active ();


@@ -181,9 +191,10 @@ namespace ev {
     {
       ev_timer_again (EV_A_ static_cast<ev_timer *>(this));
     }
     {
       ev_timer_again (EV_A_ static_cast<ev_timer *>(this));
     }

-  };
+  EV_END_WATCHER (timer, timer)

 
 

-  EV_DECLARE_WATCHER (periodic, periodic)
+  #if EV_PERIODIC_ENABLE
+  EV_BEGIN_WATCHER (periodic, periodic)

     void set (ev_tstamp at, ev_tstamp interval = 0.)
     {
       int active = is_active ();
     void set (ev_tstamp at, ev_tstamp interval = 0.)
     {
       int active = is_active ();


@@ -202,18 +213,10 @@ namespace ev {
     {
       ev_periodic_again (EV_A_ static_cast<ev_periodic *>(this));
     }
     {
       ev_periodic_again (EV_A_ static_cast<ev_periodic *>(this));
     }

-  };
-
-  EV_DECLARE_WATCHER (idle, idle)
-  };
-
-  EV_DECLARE_WATCHER (prepare, prepare)
-  };
-
-  EV_DECLARE_WATCHER (check, check)
-  };
+  EV_END_WATCHER (periodic, periodic)
+  #endif

 
 

-  EV_DECLARE_WATCHER (sig, signal)
+  EV_BEGIN_WATCHER (sig, signal)

     void set (int signum)
     {
       int active = is_active ();
     void set (int signum)
     {
       int active = is_active ();


@@ -227,9 +230,9 @@ namespace ev {
       set (signum);
       start ();
     }
       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 ();
     void set (int pid)
     {
       int active = is_active ();


@@ -243,10 +246,69 @@ namespace ev {
       set (pid);
       start ();
     }
       set (pid);
       start ();
     }

-  };
+  EV_END_WATCHER (child, child)
+
+  #if EV_STAT_ENABLE
+  EV_BEGIN_WATCHER (stat, stat)
+    void set (const char *path, ev_tstamp interval = 0.)
+    {
+      int active = is_active ();
+      if (active) stop ();
+      ev_stat_set (static_cast<ev_stat *>(this), path, interval);
+      if (active) start ();
+    }
+
+    void start (const char *path, ev_tstamp interval = 0.)
+    {
+      set (path, interval);
+      start ();
+    }
+
+    void update ()
+    {
+      ev_stat_stat (EV_A_ static_cast<ev_stat *>(this));
+    }
+  EV_END_WATCHER (stat, stat)
+  #endif
+
+  EV_BEGIN_WATCHER (idle, idle)
+    void set () { }
+  EV_END_WATCHER (idle, idle)
+
+  EV_BEGIN_WATCHER (prepare, prepare)
+    void set () { }
+  EV_END_WATCHER (prepare, prepare)
+
+  EV_BEGIN_WATCHER (check, check)
+    void set () { }
+  EV_END_WATCHER (check, check)
+
+  #if EV_EMBED_ENABLE
+  EV_BEGIN_WATCHER (embed, embed)
+    void set (struct ev_loop *loop)
+    {
+      int active = is_active ();
+      if (active) stop ();
+      ev_embed_set (static_cast<ev_embed *>(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<ev_embed *>(this));
+    }
+  EV_END_WATCHER (embed, embed)
+  #endif

 
   #undef EV_CONSTRUCT
 
   #undef EV_CONSTRUCT

-  #undef EV_DECLARE_WATCHER
+  #undef EV_BEGIN_WATCHER
+  #undef EV_END_WATCHER

 }
 
 #endif
 }
 
 #endif