--- gvpe/src/iom.C	2003/03/28 05:40:54	1.7
+++ gvpe/src/iom.C	2003/04/04 05:26:45	1.10
@@ -26,15 +26,15 @@
 #include "slog.h"
 #include "iom.h"
 
-inline bool lowest_first (const time_watcher *a, const time_watcher *b)
+tstamp NOW;
+bool iom_valid;
+io_manager iom;
+
+inline bool earliest_first (const time_watcher *a, const time_watcher *b)
 {
   return a->at > b->at;
 }
 
-tstamp NOW;
-
-io_manager iom;
-
 void time_watcher::set (tstamp when)
 {
   at = when;
@@ -47,7 +47,7 @@
 
 void time_watcher::trigger ()
 {
-  call (at);
+  call (*this);
 
   if (registered)
     iom.reschedule_time_watchers ();
@@ -61,24 +61,37 @@
     iom.reg (this);
 }
 
-void io_manager::reg (int fd, short events, io_watcher *w)
+time_watcher::~time_watcher ()
 {
-  pollfd pfd;
+  if (iom_valid)
+    iom.unreg (this);
+}
+
+io_watcher::~io_watcher ()
+{
+  if (iom_valid)
+    iom.unreg (this);
+}
 
-  pfd.fd     = fd;
-  pfd.events = events;
+void io_manager::reg (io_watcher *w)
+{
+  pollfd pfd;
 
   pfs.push_back (pfd);
   iow.push_back (w);
+
+  w->p = &(*(pfs.end () - 1));
 }
 
 void io_manager::unreg (io_watcher *w)
 {
-  unsigned int sz = iow.size ();
-  unsigned int i = find (iow.begin (), iow.end (), w) - iow.begin ();
-
-  if (i != sz)
+  if (w->p)
     {
+      unsigned int sz = iow.size ();
+      unsigned int i = find (iow.begin (), iow.end (), w) - iow.begin ();
+
+      assert (i != sz);
+
       if (sz == 1)
         {
           pfs.clear ();
@@ -94,23 +107,22 @@
           iow[i] = iow[sz - 1]; iow.pop_back ();
           pfs[i] = pfs[sz - 1]; pfs.pop_back ();
         }
+
+      w->p = 0;
     }
 }
 
 void io_manager::reschedule_time_watchers ()
 {
-  make_heap (tw.begin (), tw.end (), lowest_first);
+  make_heap (tw.begin (), tw.end (), earliest_first);
 }
 
 void io_manager::reg (time_watcher *w)
 {
-  if (w->registered)
-    slog (L_CRIT, "FATAL: io_manager::reg(time_watcher) called on already-registered watcher");
-
   w->registered = true;
 
   tw.push_back (w);
-  push_heap (tw.begin (), tw.end (), lowest_first);
+  push_heap (tw.begin (), tw.end (), earliest_first);
 }
 
 void io_manager::unreg (time_watcher *w)
@@ -120,14 +132,13 @@
       unsigned int sz = tw.size ();
       unsigned int i = find (tw.begin (), tw.end (), w) - tw.begin ();
 
-      if (i != sz)
-        {
-          if (i != sz - 1)
-            tw[i] = tw[sz - 1];
+      assert (i != sz);
+      
+      if (i != sz - 1)
+        tw[i] = tw[sz - 1];
 
-          tw.pop_back ();
-          reschedule_time_watchers ();
-        }
+      tw.pop_back ();
+      reschedule_time_watchers ();
 
       w->registered = false;
     }
@@ -153,13 +164,13 @@
           // remove the first watcher
           time_watcher *w = tw[0];
 
-          pop_heap (tw.begin (), tw.end (), lowest_first);
+          pop_heap (tw.begin (), tw.end (), earliest_first);
           tw.pop_back ();
 
           w->registered = false;
 
           // call it
-          w->call (w->at);
+          w->call (*w);
 
           // re-add it if necessary
           if (w->at >= 0 && !w->registered)
@@ -172,22 +183,29 @@
 
       set_now ();
 
-      for (unsigned int i = iow.size (); fds > 0 && i--; )
-        if (pfs[i].revents)
+      vector<io_watcher *>::iterator w;
+      vector<pollfd>::iterator p;
+
+      for (w = iow.begin (), p = pfs.begin ();
+           fds > 0 && w < iow.end ();
+           ++w, ++p)
+        if (p->revents)
           {
             --fds;
-            iow[i]->call (pfs[i].revents);
+            (*w)->call (**w, p->revents);
           }
     }
 }
 
-void io_manager::idle_cb (tstamp &ts)
+void io_manager::idle_cb (time_watcher &w)
 {
-  ts = NOW + 86400; // wake up every day, for no good reason
+  w.at = NOW + 86400; // wake up every day, for no good reason
 }
 
 io_manager::io_manager ()
 {
+  iom_valid = true;
+
   set_now ();
   idle = new time_watcher (this, &io_manager::idle_cb);
   idle->start (0);
@@ -195,6 +213,6 @@
 
 io_manager::~io_manager ()
 {
-  //
+  iom_valid = false;
 }