--- gvpe/src/iom.C	2003/03/28 04:05:10	1.6
+++ gvpe/src/iom.C	2003/04/02 21:02:25	1.9
@@ -26,7 +26,7 @@
 #include "slog.h"
 #include "iom.h"
 
-inline bool lowest_first (const time_watcher *a, const time_watcher *b)
+inline bool earliest_first (const time_watcher *a, const time_watcher *b)
 {
   return a->at > b->at;
 }
@@ -47,7 +47,7 @@
 
 void time_watcher::trigger ()
 {
-  call (at);
+  call (*this);
 
   if (registered)
     iom.reschedule_time_watchers ();
@@ -61,18 +61,18 @@
     iom.reg (this);
 }
 
-void io_manager::reg (int fd, short events, io_watcher *w)
+void io_manager::reg (io_watcher *w)
 {
   pollfd pfd;
 
-  pfd.fd     = fd;
-  pfd.events = events;
+  pfd.fd     = w->fd;
+  pfd.events = w->events;
 
   pfs.push_back (pfd);
   iow.push_back (w);
 }
 
-void io_manager::unreg (const io_watcher *w)
+void io_manager::unreg (io_watcher *w)
 {
   unsigned int sz = iow.size ();
   unsigned int i = find (iow.begin (), iow.end (), w) - iow.begin ();
@@ -99,7 +99,7 @@
 
 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)
@@ -107,22 +107,29 @@
   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 (const time_watcher *w)
+void io_manager::unreg (time_watcher *w)
 {
-  unsigned int sz = tw.size ();
-  unsigned int i = find (tw.begin (), tw.end (), w) - tw.begin ();
-
-  if (i != sz)
+  if (w->registered)
     {
-      if (i != sz - 1)
-        tw[i] = tw[sz - 1];
+      unsigned int sz = tw.size ();
+      unsigned int i = find (tw.begin (), tw.end (), w) - tw.begin ();
 
-      tw.pop_back ();
-      reschedule_time_watchers ();
+      if (i != sz)
+        {
+          if (i != sz - 1)
+            tw[i] = tw[sz - 1];
+
+          tw.pop_back ();
+          reschedule_time_watchers ();
+        }
+
+      w->registered = false;
     }
 }
 
@@ -143,17 +150,20 @@
     {
       while (tw[0]->at <= NOW)
         {
-          pop_heap (tw.begin (), tw.end (), lowest_first);
-          time_watcher *w = *(tw.end () - 1);
+          // remove the first watcher
+          time_watcher *w = tw[0];
+
+          pop_heap (tw.begin (), tw.end (), earliest_first);
           tw.pop_back ();
 
-          if (w->at >= 0)
-            {
-              w->call (w->at);
-
-              if (!w->registered)
-                reg (w);
-            }
+          w->registered = false;
+
+          // call it
+          w->call (*w);
+
+          // re-add it if necessary
+          if (w->at >= 0 && !w->registered)
+            reg (w);
         }
 
       int timeout = (int) ((tw[0]->at - NOW) * 1000);
@@ -162,18 +172,23 @@
 
       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 ()