[ViewVC] Diff of: cvs/deliantra/server/include/cfperl.h

Comparing deliantra/server/include/cfperl.h (file contents):
Revision 1.90 by root, Thu Nov 8 19:43:24 2007 UTC vs.
Revision 1.91 by root, Wed Nov 14 08:09:46 2007 UTC

 #include <EXTERN.h>
 #include <perl.h>
 #include <XSUB.h>
-#include <EventAPI.h>
+#include <EVAPI.h>
 #include <CoroAPI.h>
 #include "util.h"
 #include "keyword.h"
 #include "dynbuf.h"
   static void wait_for_tick ();
   static void wait_for_tick_begin ();
 };
-struct watcher_base
+struct evapi
 {
-  static struct EventAPI *GEventAPI;
+  static struct EVAPI *GEVAPI;
 };
-template<class base>
-struct watcher : watcher_base
-{
-  base *pe;
-  void start   (bool repeat = false)        { GEventAPI->start   ((pe_watcher *)pe, repeat); }
-  void stop    (bool cancel_events = false) { GEventAPI->stop    ((pe_watcher *)pe, cancel_events); }
-  void now     ()                           { GEventAPI->now     ((pe_watcher *)pe); }
-  void suspend ()                           { GEventAPI->suspend ((pe_watcher *)pe); }
-  void resume  ()                           { GEventAPI->resume  ((pe_watcher *)pe); }
-  void prio    (int new_prio)               { ((pe_watcher *)pe)->prio = new_prio; }
-  ~watcher ()
-  {
-    cancel ();
-  }
-private:
-  void cancel  ()                           { GEventAPI->cancel  ((pe_watcher *)pe); } // private
-};
-struct iw : watcher<pe_idle>, callback<void (iw &)>
-{
-  template<class O, class M>
-  iw (O object, M method)
-  : callback<void (iw &)> (object, method)
-  {
-    alloc ();
-  }
-private:
-  void alloc ();
-};
-struct iow : watcher<pe_io>, callback<void (iow &, int)>
+struct iow : ev_io, evapi, callback<void (iow &, int)>
 {
+  static void thunk (struct ev_io *w_, int revents)
+  {
+    iow &w = *static_cast<iow *>(w_);
+    w (w, revents);
+  }
   template<class O, class M>
   iow (O object, M method)
   : callback<void (iow &, int)> (object, method)
   {
-    alloc ();
+    ev_init ((ev_io *)this, thunk);
   }
-  void fd (int fd);
+  void set (int fd, int events)
-  int poll ();
+  {
+    ev_io_set ((ev_io *)this, fd, events);
+  }
+  int poll () const { return events; }
   void poll (int events);
-private:
+  void start ()
-  void alloc ();
+  {
+    ev_io_start ((ev_io *)this);
+  }
+  void stop ()
+  {
+    ev_io_stop ((ev_io *)this);
+  }
+  ~iow ()
+  {
+    stop ();
+  }
 };
 #endif

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing deliantra/server/include/cfperl.h (file contents): Revision 1.90 by root, Thu Nov 8 19:43:24 2007 UTC vs. Revision 1.91 by root, Wed Nov 14 08:09:46 2007 UTC

Diff Legend

Comparing deliantra/server/include/cfperl.h (file contents):
Revision 1.90 by root, Thu Nov 8 19:43:24 2007 UTC vs.
Revision 1.91 by root, Wed Nov 14 08:09:46 2007 UTC