X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Scheduler%2FTimerEvent.ih;h=fdb62f2888c3764df454803183b7c2742f9e05ff;hb=81f84badf27b66dbadec9890646ca1193e998505;hp=8bae8d17ab106b7e91c647d0cdfc6795057f5546;hpb=db007c39287e3c666dd6b53edc8c3404617c7dd5;p=senf.git

diff --git a/Scheduler/TimerEvent.ih b/Scheduler/TimerEvent.ih
index 8bae8d1..fdb62f2 100644
--- a/Scheduler/TimerEvent.ih
+++ b/Scheduler/TimerEvent.ih
@@ -23,19 +23,21 @@
 /** \file
     \brief TimerDispatcher internal header */
 
-#ifndef IH_TimerDispatcher_
-#define IH_TimerDispatcher_ 1
+#ifndef IH_SENF_Scheduler_TimerEvent_
+#define IH_SENF_Scheduler_TimerEvent_ 1
 
 // Custom includes
+#include <boost/scoped_ptr.hpp>
 #include "../boost/intrusive/iset.hpp"
+#include "TimerSource.hh"
 
 ///////////////////////////////ih.p////////////////////////////////////////
 
 namespace senf {
+namespace scheduler {
 
-    class Scheduler;
+    void restart();
 
-namespace scheduler {
 namespace detail {
 
     struct TimerSetCompare {
@@ -44,15 +46,10 @@ namespace detail {
     };
 
     class TimerDispatcher
-        : public FdManager::Event,
-          public singleton<TimerDispatcher>
+        : public singleton<TimerDispatcher>
     {
         SENF_LOG_CLASS_AREA();
         
-        typedef boost::intrusive::imultiset< TimerSetBase::value_traits<TimerEvent>,
-                                             TimerSetCompare,
-                                             false > TimerSet;
-
     public:
         using singleton<TimerDispatcher>::instance;
         using singleton<TimerDispatcher>::alive;
@@ -60,29 +57,32 @@ namespace detail {
         void add(TimerEvent & event);
         void remove(TimerEvent & event);
 
-        void unblockSignals();
-        void blockSignals();
-        
+        void enable();
+        void disable();
+
+        void prepareRun();
+        void reschedule();
+
         bool empty() const;
 
+        void timerSource(std::auto_ptr<TimerSource> timerSource);
+        TimerSource * timerSource();
+
     protected:
 
     private:
         TimerDispatcher();
         ~TimerDispatcher();
 
-        virtual void signal(int events);
-        static void sigHandler(int signal, ::siginfo_t * siginfo, void *);
-        void reschedule();
+        typedef boost::intrusive::imultiset< TimerSetBase::value_traits<TimerEvent>,
+                                             TimerSetCompare,
+                                             false > TimerSet;
 
         TimerSet timers_;
 
-        int timerPipe_[2];
-        sigset_t sigSet_;
-        bool blocked_;
-        timer_t timerId_;
+        boost::scoped_ptr<TimerSource> source_;
 
-        friend class senf::Scheduler;
+        friend void senf::scheduler::restart();
         friend class singleton<TimerDispatcher>;
     };