--- rxvt-unicode/src/iom.C	2003/12/19 06:17:03	1.7
+++ rxvt-unicode/src/iom.C	2004/04/02 14:30:06	1.16
@@ -1,6 +1,6 @@
 /*
     iom.C -- generic I/O multiplexor
-    Copyright (C) 2003 Marc Lehmann <pcg@goof.com>
+    Copyright (C) 2003, 2004 Marc Lehmann <pcg@goof.com>
  
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -17,51 +17,83 @@
     Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#include "../config.h"
-
 #include <cstdio>
+#include <cstdlib>
+#include <cerrno>
 
-#include <sys/select.h>
 #include <sys/time.h>
 
+#include <assert.h>
+
+#if 1 // older unices need these includes for select (2)
+# include <unistd.h>
+# include <sys/types.h>
+#endif
+
+// if the BSDs would at least be marginally POSIX-compatible.. *sigh*
+// until that happens, sys/select.h must come last
+#include <sys/select.h>
+
+// for IOM_SIG
+#include <signal.h>
+
 #include "iom.h"
 
+// TSTAMP_MAX must still fit into a positive struct timeval
+#define TSTAMP_MAX (double)(1UL<<31)
+
+// this is a dummy time watcher to ensure that the first
+// time watcher is _always_ valid, this gets rid of a lot
+// of null-pointer-checks
+// (must come _before_ iom is being defined)
+static struct tw0 : time_watcher
+  {
+    void cb (time_watcher &w)
+    {
+      // should never get called
+      // reached end-of-time, or tstamp has a bogus definition,
+      // or compiler initilization order broken, or somethine else :)
+      abort ();
+    }
+
+    tw0 ()
+        : time_watcher (this, &tw0::cb)
+    { }
+  } tw0;
+
 tstamp NOW;
-bool iom_valid;
+static bool iom_valid;
 io_manager iom;
 
 template<class watcher>
-void io_manager::reg (watcher *w, simplevec<watcher *> &queue)
+void io_manager::reg (watcher *w, io_manager_vec<watcher> &queue)
 {
-  if (find (queue.begin (), queue.end (), w) == queue.end ())
-    queue.push_back (w);
-}
+  if (!iom_valid)
+    abort ();
 
-template<class watcher>
-void io_manager::unreg (watcher *w, simplevec<watcher *> &queue)
-{
-  queue.erase (find (queue.begin (), queue.end (), w));
-}
-
-#if IOM_IO
-io_watcher::~io_watcher ()
-{
-  if (iom_valid)
-    iom.unreg (this);
+  if (!w->active)
+    {
+#if IOM_CHECK
+      queue.activity = true;
+#endif
+      queue.push_back (w);
+      w->active = queue.size ();
+    }
 }
 
-void io_manager::reg (io_watcher *w)
+template<class watcher>
+void io_manager::unreg (watcher *w, io_manager_vec<watcher> &queue)
 {
-  reg (w, iow);
-}
+  if (!iom_valid)
+    return;
 
-void io_manager::unreg (io_watcher *w)
-{
-  unreg (w, iow);
+  if (w->active)
+    {
+      queue [w->active - 1] = 0;
+      w->active = 0;
+    }
 }
 
-#endif
-
 #if IOM_TIME
 void time_watcher::trigger ()
 {
@@ -70,72 +102,94 @@
   iom.reg (this);
 }
 
-time_watcher::~time_watcher ()
-{
-  if (iom_valid)
-    iom.unreg (this);
+void io_manager::reg (time_watcher *w) { reg (w, tw); }
+void io_manager::unreg (time_watcher *w) { unreg (w, tw); }
+#endif
 
-  at = TSTAMP_CANCEL;
-}
+#if IOM_IO
+void io_manager::reg (io_watcher *w) { reg (w, iow); }
+void io_manager::unreg (io_watcher *w) { unreg (w, iow); }
+#endif
 
-void io_manager::reg (time_watcher *w)
-{
-  reg (w, tw);
-}
+#if IOM_CHECK
+void io_manager::reg (check_watcher *w) { reg (w, cw); }
+void io_manager::unreg (check_watcher *w) { unreg (w, cw); }
+#endif
 
-void io_manager::unreg (time_watcher *w)
-{
-  unreg (w, tw);
-}
+#if IOM_IDLE
+void io_manager::reg (idle_watcher *w) { reg (w, iw); }
+void io_manager::unreg (idle_watcher *w) { unreg (w, iw); }
 #endif
 
-#if IOM_CHECK
-check_watcher::~check_watcher ()
+#if IOM_TIME
+inline void set_now (void)
 {
-  if (iom_valid)
-    iom.unreg (this);
-}
+  struct timeval tv;
 
-void io_manager::reg (check_watcher *w)
-{
-  reg (w, cw);
-}
+  gettimeofday (&tv, 0);
 
-void io_manager::unreg (check_watcher *w)
-{
-  unreg (w, cw);
+  NOW = (tstamp)tv.tv_sec + (tstamp)tv.tv_usec / 1000000;
 }
 #endif
 
-#if IOM_IDLE
-idle_watcher::~idle_watcher ()
+#if IOM_SIG
+// race conditions galore
+
+void io_manager::sighandler (int signum)
 {
-  if (iom_valid)
-    iom.unreg (this);
+  assert (0 < signum && signum <= iom.sw.size ());
+
+  sig_vec &sv = *iom.sw [signum - 1];
+
+  for (int i = sv.size (); i--; )
+    if (!sv[i])
+      sv.erase_unordered (i);
+    else
+      sv[i]->call (*sv[i]);
 }
 
-void io_manager::reg (idle_watcher *w)
+void io_manager::reg (sig_watcher *w)
 {
-  reg (w, iw);
+  assert (0 < w->signum);
+
+  sw.reserve (w->signum);
+
+  sig_vec *&sv = sw [w->signum - 1];
+
+  if (!sv)
+    {
+      sv = new sig_vec;
+
+      struct sigaction sa;
+      sa.sa_handler = io_manager::sighandler;
+      sigfillset (&sa.sa_mask);
+      sa.sa_flags = 0;
+
+      if (sigaction (w->signum, &sa, 0))
+        {
+          perror ("Error while installing signal handler");
+          abort ();
+        }
+    }
+
+  reg (w, *sv);
 }
 
-void io_manager::unreg (idle_watcher *w)
+void io_manager::unreg (sig_watcher *w)
 {
-  unreg (w, iw);
+  assert (0 < w->signum && w->signum <= sw.size ());
+  
+  unreg (w, *sw [w->signum - 1]);
 }
-#endif
 
-#if IOM_TIME
-inline void set_now (void)
+void sig_watcher::start (int signum)
 {
-  struct timeval tv;
-
-  gettimeofday (&tv, 0);
-
-  NOW = (tstamp)tv.tv_sec + (tstamp)tv.tv_usec / 1000000;
-#endif
+  stop ();
+  this->signum = signum;
+  iom.reg (this);
 }
-
+#endif
+  
 void io_manager::loop ()
 {
 #if IOM_TIME
@@ -156,37 +210,57 @@
         }
       else
 #endif
+
         {
 #if IOM_TIME
-          time_watcher *w;
+          time_watcher *next;
 
-          for (;tw.size ();)
+          for (;;)
             {
-              w = tw[0];
+              next = tw[0]; // the first time-watcher must exist at ALL times
 
-              for (time_watcher **i = tw.begin (); i < tw.end (); ++i)
-                if ((*i)->at < w->at)
-                  w = *i;
+              for (int i = tw.size (); i--; )
+                if (!tw[i])
+                  tw.erase_unordered (i);
+                else if (tw[i]->at < next->at)
+                  next = tw[i];
 
-              if (w->at > NOW)
+              if (next->at > NOW)
                 {
-                  double diff = w->at - NOW;
-                  tval.tv_sec  = (int)diff;
-                  tval.tv_usec = (int)((diff - tval.tv_sec) * 1000000);
-                  to = &tval;
+                  if (next != tw[0])
+                    {
+                      double diff = next->at - NOW;
+                      tval.tv_sec  = (int)diff;
+                      tval.tv_usec = (int) ((diff - tval.tv_sec) * 1000000);
+                      to = &tval;
+                    }
                   break;
                 }
-              else if (w->at >= 0)
-                w->call (*w);
               else
-                unreg (w);
+                {
+                  unreg (next);
+                  next->call (*next);
+                }
             }
 #endif
+
         }
 
 #if IOM_CHECK
-      for (int i = 0; i < cw.size (); ++i)
-        cw[i]->call (*cw[i]);
+      tw.activity = false;
+
+      for (int i = cw.size (); i--; )
+        if (!cw[i])
+          cw.erase_unordered (i);
+        else
+          cw[i]->call (*cw[i]);
+
+      if (tw.activity)
+        {
+          tval.tv_sec  = 0;
+          tval.tv_usec = 0;
+          to = &tval;
+        }
 #endif
 
 #if IOM_IO
@@ -197,39 +271,49 @@
 
       int fds = 0;
 
-      for (io_watcher **w = iow.begin (); w < iow.end (); ++w)
-        {
-          if ((*w)->events & EVENT_READ ) FD_SET ((*w)->fd, &rfd);
-          if ((*w)->events & EVENT_WRITE) FD_SET ((*w)->fd, &wfd);
+      for (io_manager_vec<io_watcher>::iterator i = iow.end (); i-- > iow.begin (); )
+        if (*i)
+          {
+            if ((*i)->events & EVENT_READ ) FD_SET ((*i)->fd, &rfd);
+            if ((*i)->events & EVENT_WRITE) FD_SET ((*i)->fd, &wfd);
 
-          if ((*w)->fd >= fds) fds = (*w)->fd + 1;
-        }
+            if ((*i)->fd >= fds) fds = (*i)->fd + 1;
+          }
 
-      if (!to && !fds)
+      if (!to && !fds) //TODO: also check idle_watchers and check_watchers
         break; // no events
 
-      fds = select (fds, &rfd, &wfd, 0, to);
+      fds = select (fds, &rfd, &wfd, NULL, to);
 # if IOM_TIME
       set_now ();
 # endif
 
       if (fds > 0)
-        for (int i = 0; i < iow.size (); ++i)
-          {
-            io_watcher *w = iow[i];
-
-            short revents = w->events;
+        for (int i = iow.size (); i--; )
+          if (!iow[i])
+            iow.erase_unordered (i);
+          else
+            {
+              short revents = iow[i]->events;
 
-            if (!FD_ISSET (w->fd, &rfd)) revents &= ~EVENT_READ;
-            if (!FD_ISSET (w->fd, &wfd)) revents &= ~EVENT_WRITE;
+              if (!FD_ISSET (iow[i]->fd, &rfd)) revents &= ~EVENT_READ;
+              if (!FD_ISSET (iow[i]->fd, &wfd)) revents &= ~EVENT_WRITE;
 
-            if (revents)
-              w->call (*w, revents);
-          }
+              if (revents)
+                iow[i]->call (*iow[i], revents);
+            }
+      else if (fds < 0 && errno != EINTR)
+        {
+          perror ("Error while waiting for I/O or time event");
+          abort ();
+        }
 #if IOM_IDLE
-      else if (iw.size ())
-        for (int i = 0; i < iw.size (); ++i)
-          iw[i]->call (*iw[i]);
+      else
+        for (int i = iw.size (); i--; )
+          if (!iw[i])
+            iw.erase_unordered (i);
+          else
+            iw[i]->call (*iw[i]);
 #endif
 
 #elif IOM_TIME
@@ -241,16 +325,19 @@
 #else
       break;
 #endif
+
     }
 }
 
 io_manager::io_manager ()
 {
+  iom_valid = true;
+
 #if IOM_TIME
   set_now ();
-#endif
 
-  iom_valid = true;
+  tw0.start (TSTAMP_MAX);
+#endif
 }
 
 io_manager::~io_manager ()