Utils: Add singleton alive test member

[senf.git] / Utils / Daemon / Daemon.ih

diff --git a/Utils/Daemon/Daemon.ih b/Utils/Daemon/Daemon.ih
index ce8b7e3..3dec5e2 100644 (file)
--- a/Utils/Daemon/Daemon.ih
+++ b/Utils/Daemon/Daemon.ih
@@ -1,8 +1,8 @@
 // $Id$
 //
-// Copyright (C) 2007 
-// Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS)
-// Kompetenzzentrum fuer NETwork research (NET)
+// Copyright (C) 2007
+// Fraunhofer Institute for Open Communication Systems (FOKUS)
+// Competence Center NETwork research (NET), St. Augustin, GERMANY
 //     Stefan Bund <g0dil@berlios.de>
 //
 // This program is free software; you can redistribute it and/or modify
@@ -32,6 +32,7 @@
 #include <boost/utility.hpp>
 #include <boost/function.hpp>
 #include "../../Scheduler/Scheduler.hh"
+#include "../../Scheduler/SignalEvent.hh"
 
 ///////////////////////////////ih.p////////////////////////////////////////
 
@@ -70,8 +71,8 @@ namespace detail {
             };
             typedef std::list<Target> Targets;
 
-            void readData(Scheduler::EventId event);
-            void writeData(Scheduler::EventId event, Targets::iterator target);
+            void readData(int event);
+            void writeData(int event, Targets::iterator target);
 
             Buffer buffer_;
             int src_;
@@ -82,7 +83,7 @@ namespace detail {
         };
         
         void pipeClosed(int id);
-        void sigChld();
+        void sigChld(siginfo_t const &);
         void childDied();
         void childOk();
 
@@ -93,6 +94,7 @@ namespace detail {
         int stderr_;
         bool sigChld_;
 
+        scheduler::SignalEvent cldSignal_;
         Forwarder coutForwarder_;
         Forwarder cerrForwarder_;
     };