--- gvpe/src/iom.h	2003/03/21 23:17:01	1.4
+++ gvpe/src/iom.h	2003/04/02 21:02:25	1.10
@@ -23,13 +23,13 @@
 
 #include <sys/poll.h>
 
+#include "callback.h"
 #include "slog.h"
 
 typedef double tstamp;
 
 extern tstamp NOW;
 
-template<class R, class A> class callback;
 struct io_watcher;
 struct time_watcher;
 
@@ -38,11 +38,13 @@
   vector<io_watcher *> iow;
   vector<time_watcher *> tw; // actually a heap
 
-  void idle_cb (tstamp &ts); time_watcher *idle;
+  void idle_cb (time_watcher &w); time_watcher *idle;
 public:
 
+  void reschedule_time_watchers ();
+
   // register a watcher
-  void reg (int fd, short events, io_watcher *w);
+  void reg (io_watcher *w);
   void unreg (io_watcher *w);
   void reg (time_watcher *w);
   void unreg (time_watcher *w);
@@ -55,58 +57,25 @@
 
 extern io_manager iom;
 
-template<class R, class A>
-class callback {
-  struct object { };
-
-  void *obj;
-  R (object::*meth)(A arg);
-
-  // a proxy is a kind of recipe on how to call a specific class method
-  struct proxy_base {
-    virtual R call (void *obj, void (object::*meth)(A), A arg) = 0;
-  };
-  template<class O1, class O2>
-  struct proxy : proxy_base {
-    virtual R call (void *obj, void (object::*meth)(A), A arg)
-      {
-        ((reinterpret_cast<O1 *>(obj)) ->* (reinterpret_cast<void (O2::*)(A)>(meth)))
-          (arg);
-      }
-  };
-
-  proxy_base *prxy;
+struct io_watcher : callback2<void, io_watcher &, short> {
+  int fd;
+  short events;
 
-public:
   template<class O1, class O2>
-  callback (O1 *object, void (O2::*method)(A))
-    {
-      static proxy<O1,O2> p;
-      obj  = reinterpret_cast<void *>(object);
-      meth = reinterpret_cast<void (object::*)(A)>(method);
-      prxy = &p;
-    }
-
-  R call(A arg)
-    {
-      return prxy->call (obj, meth, arg);
-    }
+  io_watcher (O1 *object, void (O2::*method)(io_watcher &, short))
+    : callback2<void, io_watcher &, short>(object,method)
+    { }
 
-  R operator ()(A arg)
+  ~io_watcher ()
     {
-      return call (arg);
+      iom.unreg (this);
     }
-};
-
-struct io_watcher : callback<void, short> {
-  template<class O1, class O2>
-  io_watcher (O1 *object, void (O2::*method)(short revents))
-    : callback<void, short>(object,method)
-    { }
 
-  void start (int fd, short events)
+  void start (int fd_, short events_)
     {
-      iom.reg (fd, events, this);
+      fd = fd_;
+      events = events_;
+      iom.reg (this);
     }
 
   void stop ()
@@ -117,14 +86,21 @@
 
 #define TSTAMP_CANCEL -1.
 
-struct time_watcher : callback<void, tstamp &> {
+struct time_watcher : callback1<void, time_watcher &> {
+  bool registered; // already registered?
   tstamp at;
 
   template<class O1, class O2>
-  time_watcher (O1 *object, void (O2::*method)(tstamp &))
-    : callback<void, tstamp &>(object,method)
+  time_watcher (O1 *object, void (O2::*method)(time_watcher &))
+    : callback1<void, time_watcher &>(object,method)
+    , registered(false)
     { }
 
+  ~time_watcher ()
+    {
+      iom.unreg (this);
+    }
+
   void set (tstamp when);
   void trigger ();