[ViewVC] Diff of: cvs/gvpe/src/iom.C

Comparing gvpe/src/iom.C (file contents):
Revision 1.22 by pcg, Thu Nov 11 17:41:55 2004 UTC vs.
Revision 1.36 by pcg, Thu Dec 14 03:18:53 2006 UTC

 /*
-    iom.C -- generic I/O multiplexor
+    iom.C -- generic I/O multiplexer
-    Copyright (C) 2003, 2004 Marc Lehmann <pcg@goof.com>
+    Copyright (C) 2003-2006 Marc Lehmann <gvpe@schmorp.de>
+    This file is part of GVPE.
-    This program is free software; you can redistribute it and/or modify
+    GVPE is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
+    along with gvpe; if not, write to the Free Software
-    Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 #include "iom.h"
 #include <cstdio>
 #include <cstdlib>
 #include <cerrno>
+#include <cassert>
+#include <sys/types.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>
 # include <time.h>
 #endif
-// for IOM_SIG
+#if IOM_CHILD
+# include <sys/wait.h>
+#endif
 #if IOM_SIG
-# include <signal.h>
+# include <csignal>
 # include <fcntl.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>
-// TSTAMP_MAX must still fit into a positive struct timeval
-#define TSTAMP_MAX (double)(1UL<<31)
 #define TIMEVAL timeval
 #define TV_FRAC tv_usec
 #define TV_MULT 1000000L
     : pending (false)
     { }
 };
 static vector<sig_vec *> sw;
 #endif
+#if IOM_CHILD
+static io_manager_vec<child_watcher>  pw;
+#endif
 // 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)
   {
-    void cb (time_watcher &w)
-    {
-      // should never get called
+    // should never get called
-      // reached end-of-time, or tstamp has a bogus definition,
+    // reached end-of-time, or tstamp has a bogus definition,
-      // or compiler initialisation order broken, or something else :)
+    // or compiler initialisation order broken, or something else :)
-      abort ();
+    abort ();
-    }
+  }
-    tw0 ()
+  tw0 ()
-      : time_watcher (this, &tw0::cb)
+  : time_watcher (this, &tw0::cb)
-      { }
+  { }
-  } tw0;
+} tw0;
 tstamp NOW;
+#if IOM_CHILD
+// sig_watcher for child signal(s)
+static struct sw0 : sig_watcher
+{
+  void cb (sig_watcher &w)
+  {
+    // SIGCHLD, call corresponding watchera
+    pid_t pid;
+    int status;
+    while ((pid = waitpid (-1, &status, WNOHANG)) > 0)
+      for (int i = pw.size (); i--; )
+        {
+          child_watcher *w = pw[i];
+          if (!w)
+            pw.erase_unordered (i);
+          else if (w->pid == pid)
+            {
+              io_manager::unreg (*w);
+              w->call (*w, status);
+            }
+         }
+  }
+  sw0 ()
+  : sig_watcher (this, &sw0::cb)
+  { }
+} sw0;
+#endif
 #if IOM_TIME
-inline void set_now (void)
+tstamp io_manager::now ()
 {
   struct timeval tv;
   gettimeofday (&tv, 0);
-  NOW = (tstamp)tv.tv_sec + (tstamp)tv.tv_usec / 1000000.;
+  return (tstamp)tv.tv_sec + (tstamp)tv.tv_usec / 1000000.;
+}
+void io_manager::set_now ()
+{
+  NOW = now ();
 }
 #endif
 static bool iom_valid;
 // used for initialisation only
 static struct init {
   init ()
   {
+    iom_valid = true;
 #if IOM_SIG
     sigemptyset (&sigs);
     if (pipe (sigpipe))
       {
         perror ("io_manager: unable to create signal pipe, aborting.");
         abort ();
       }
-    fcntl (sigpipe[0], F_SETFL, O_NONBLOCK);
+    fcntl (sigpipe[0], F_SETFL, O_NONBLOCK); fcntl (sigpipe[0], F_SETFD, FD_CLOEXEC);
-    fcntl (sigpipe[1], F_SETFL, O_NONBLOCK);
+    fcntl (sigpipe[1], F_SETFL, O_NONBLOCK); fcntl (sigpipe[1], F_SETFD, FD_CLOEXEC);
 #endif
-    iom_valid = true;
+#if IOM_CHILD
+    sw0.start (SIGCHLD);
+#endif
 #if IOM_TIME
-    set_now ();
+    io_manager::set_now ();
     tw0.start (TSTAMP_MAX);
 #endif
+  }
+  ~init ()
+  {
+    iom_valid = false;
   }
   static void required ();
 } init;
   write (sigpipe[1], &ch, 1);
 }
 void io_manager::reg (sig_watcher &w)
 {
+  init::required ();
   assert (0 < w.signum);
   sw.reserve (w.signum);
   while (sw.size () < w.signum) // pathetic
   io_manager::reg (w, *sv);
 }
 void io_manager::unreg (sig_watcher &w)
 {
-  if (!w.active)
+  if (!w.active || !iom_valid)
     return;
   assert (0 < w.signum && w.signum <= sw.size ());
   io_manager::unreg (w, *sw[w.signum - 1]);
   this->signum = signum;
   io_manager::reg (*this);
 }
 #endif
+#if IOM_CHILD
+void io_manager::reg   (child_watcher &w) { io_manager::reg   (w, pw); }
+void io_manager::unreg (child_watcher &w) { io_manager::unreg (w, pw); }
+#endif
 void io_manager::loop ()
 {
   init::required ();
 #if IOM_TIME
             activity = false;
             for (int i = tw.size (); i--; )
               if (!tw[i])
                 tw.erase_unordered (i);
-              else if (tw[i]->at <= NOW + IOM_ACCURACY)
+              else if (tw[i]->at <= NOW)
                 {
                   time_watcher &w = *tw[i];
                   unreg (w);
                   w.call (w);
 # if IOM_SIG
       sigprocmask (SIG_BLOCK, &sigs, NULL);
 # endif
 # if IOM_TIME
+      {
+        // update time, try to compensate for gross non-monotonic time changes
+        tstamp diff = NOW;
-      set_now ();
+        set_now ();
+        diff = NOW - diff;
+        if (diff < 0)
+          for (io_manager_vec<time_watcher>::const_iterator i = tw.end (); i-- > tw.begin (); )
+            if (*i)
+              (*i)->at += diff;
+      }
 # endif
       if (fds > 0)
         {
 # if IOM_SIG
               char ch;
               while (read (sigpipe[0], &ch, 1) > 0)
                 ;
-              for (sig_vec **svp = sw.end (); svp-- > sw.begin (); )
+              for (vector<sig_vec *>::iterator svp = sw.end (); svp-- > sw.begin (); )
                 if (*svp && (*svp)->pending)
                   {
                     sig_vec &sv = **svp;
                     for (int i = sv.size (); i--; )
                       if (!sv[i])
           for (int i = iow.size (); i--; )
             if (!iow[i])
               iow.erase_unordered (i);
             else
               {
+                io_watcher &w = *iow[i];
-                short revents = iow[i]->events;
+                short revents = w.events;
-                if (!FD_ISSET (iow[i]->fd, &rfd)) revents &= ~EVENT_READ;
+                if (!FD_ISSET (w.fd, &rfd)) revents &= ~EVENT_READ;
-                if (!FD_ISSET (iow[i]->fd, &wfd)) revents &= ~EVENT_WRITE;
+                if (!FD_ISSET (w.fd, &wfd)) revents &= ~EVENT_WRITE;
                 if (revents)
-                  iow[i]->call (*iow[i], revents);
+                  w.call (w, revents);
               }
 #endif
         }
       else if (fds < 0 && errno != EINTR)
         {

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing gvpe/src/iom.C (file contents): Revision 1.22 by pcg, Thu Nov 11 17:41:55 2004 UTC vs. Revision 1.36 by pcg, Thu Dec 14 03:18:53 2006 UTC

Diff Legend

Comparing gvpe/src/iom.C (file contents):
Revision 1.22 by pcg, Thu Nov 11 17:41:55 2004 UTC vs.
Revision 1.36 by pcg, Thu Dec 14 03:18:53 2006 UTC