--- gvpe/src/iom.h	2003/03/21 23:17:01	1.4
+++ gvpe/src/iom.h	2003/03/28 04:05:10	1.6
@@ -35,17 +35,19 @@
 
 class io_manager {
   vector<pollfd> pfs;
-  vector<io_watcher *> iow;
+  vector<const io_watcher *> iow;
   vector<time_watcher *> tw; // actually a heap
 
   void idle_cb (tstamp &ts); time_watcher *idle;
 public:
 
+  void reschedule_time_watchers ();
+
   // register a watcher
   void reg (int fd, short events, io_watcher *w);
-  void unreg (io_watcher *w);
+  void unreg (const io_watcher *w);
   void reg (time_watcher *w);
-  void unreg (time_watcher *w);
+  void unreg (const time_watcher *w);
   
   void loop ();
 
@@ -64,13 +66,13 @@
 
   // 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;
+    virtual R call (void *obj, R (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)
+    virtual R call (void *obj, R (object::*meth)(A), A arg)
       {
-        ((reinterpret_cast<O1 *>(obj)) ->* (reinterpret_cast<void (O2::*)(A)>(meth)))
+        ((reinterpret_cast<O1 *>(obj)) ->* (reinterpret_cast<R (O2::*)(A)>(meth)))
           (arg);
       }
   };
@@ -79,20 +81,20 @@
 
 public:
   template<class O1, class O2>
-  callback (O1 *object, void (O2::*method)(A))
+  callback (O1 *object, R (O2::*method)(A))
     {
       static proxy<O1,O2> p;
       obj  = reinterpret_cast<void *>(object);
-      meth = reinterpret_cast<void (object::*)(A)>(method);
+      meth = reinterpret_cast<R (object::*)(A)>(method);
       prxy = &p;
     }
 
-  R call(A arg)
+  R call(A arg) const
     {
       return prxy->call (obj, meth, arg);
     }
 
-  R operator ()(A arg)
+  R operator ()(A arg) const
     {
       return call (arg);
     }
@@ -104,12 +106,17 @@
     : callback<void, short>(object,method)
     { }
 
+  ~io_watcher ()
+    {
+      iom.unreg (this);
+    }
+
   void start (int fd, short events)
     {
       iom.reg (fd, events, this);
     }
 
-  void stop ()
+  void stop () const
     {
       iom.unreg (this);
     }
@@ -118,13 +125,20 @@
 #define TSTAMP_CANCEL -1.
 
 struct time_watcher : callback<void, tstamp &> {
+  bool registered; // already registered?
   tstamp at;
 
   template<class O1, class O2>
   time_watcher (O1 *object, void (O2::*method)(tstamp &))
     : callback<void, tstamp &>(object,method)
+    , registered(false)
     { }
 
+  ~time_watcher ()
+    {
+      iom.unreg (this);
+    }
+
   void set (tstamp when);
   void trigger ();
 
@@ -139,7 +153,7 @@
       set (when);
     }
 
-  void stop ()
+  void stop () const
     {
       iom.unreg (this);
     }