X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Scheduler%2FSignalEvent.hh;h=cc4e98946afb438c7d2265448c9d0f249bc1aa0f;hb=fd3a0e8ac95d1158e9ea661ddf9187b67c70169f;hp=a21c460f324beee88cb1a50df42ceff2335270fb;hpb=925317c7f45c32b01ab9292023db3f372b74bf0f;p=senf.git

diff --git a/Scheduler/SignalEvent.hh b/Scheduler/SignalEvent.hh
index a21c460..cc4e989 100644
--- a/Scheduler/SignalEvent.hh
+++ b/Scheduler/SignalEvent.hh
@@ -23,8 +23,8 @@
 /** \file
     \brief SignalDispatcher public header */
 
-#ifndef HH_SignalDispatcher_
-#define HH_SignalDispatcher_ 1
+#ifndef HH_SENF_Scheduler_SignalEvent_
+#define HH_SENF_Scheduler_SignalEvent_ 1
 
 // Custom includes
 #include <signal.h>
@@ -60,7 +60,7 @@ namespace scheduler {
         callback is a member function it should be defined as a class member).
      */
     class SignalEvent
-        : public FIFORunner::TaskInfo,
+        : public detail::FIFORunner::TaskInfo,
           public detail::SignalSetBase 
     {
     public:
@@ -74,7 +74,7 @@ namespace scheduler {
         ///\name Structors and default members
         ///@{
 
-        SignalEvent(int signal, Callback cb, bool initiallyEnabled=true);
+        SignalEvent(int signal, Callback const & cb, bool initiallyEnabled=true);
                                         ///< Register a signal event
                                         /**< Registers \a cb as callback for the UNIX signal \a
                                              signal. If \a initiallyEnabled is set \c false, the
@@ -91,21 +91,21 @@ namespace scheduler {
 
         void disable();                 ///< Enable signal event registration
         void enable();                  ///< Disable the signal event registration
-        bool enabled() const;           ///< \c true, if event enabled, \c false otherwise
-        void action(Callback cb);       ///< Change signal event callback
+
+        void action(Callback const & cb); ///< Change signal event callback
 
     private:
-        virtual void run();
+        virtual void v_run();
+        virtual char const * v_type() const;
+        virtual std::string v_info() const;
         
         int signal_;
-        bool enabled_;
         Callback cb_;
         siginfo_t siginfo_;
 
         friend class detail::SignalSetCompare;
         friend class detail::FindNumericSignal;
         friend class detail::SignalDispatcher;
-        friend class senf::Scheduler;
     };