X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=PPI%2FIntervalTimer.cc;h=e4dff937888dc4bbbbcd29179b5a91cda50f4082;hb=5443435c4c2b6e4386c5334b5b8358273f2bae93;hp=ecda76da448020ac815a494e79bf34b1faf4ef0c;hpb=b8a3977542aaf217ac472e5266abd0fcffb4f95f;p=senf.git

diff --git a/PPI/IntervalTimer.cc b/PPI/IntervalTimer.cc
index ecda76d..e4dff93 100644
--- a/PPI/IntervalTimer.cc
+++ b/PPI/IntervalTimer.cc
@@ -1,8 +1,8 @@
 // $Id$
 //
-// Copyright (C) 2007 
-// Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS)
-// Kompetenzzentrum fuer Satelitenkommunikation (SatCom)
+// 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
@@ -27,7 +27,8 @@
 //#include "IntervalTimer.ih"
 
 // Custom includes
-#include "Scheduler/Scheduler.hh"
+#include "../Scheduler/Scheduler.hh"
+#include "EventManager.hh"
 
 //#include "IntervalTimer.mpp"
 #define prefix_
@@ -41,25 +42,29 @@
 
 prefix_ void senf::ppi::IntervalTimer::v_enable()
 {
-    info_.intervalStart = ClockService::now();
+    if (eventsPerInterval_ <= 0)
+        return;
+    info_.intervalStart = manager().now();
     info_.number = 0;
     schedule();
 }
 
 prefix_ void senf::ppi::IntervalTimer::v_disable()
 {
-    Scheduler::instance().cancelTimeout(id_);
+    timer_.disable();
 }
 
 prefix_ void senf::ppi::IntervalTimer::schedule()
 {
     info_.expected = info_.intervalStart + ( interval_ * (info_.number+1) ) / eventsPerInterval_;
-    id_ = Scheduler::instance().timeout(info_.expected, boost::bind(&IntervalTimer::cb,this));
+    timer_.timeout(info_.expected);
 }
 
 prefix_ void senf::ppi::IntervalTimer::cb()
 {
     callback(info_, info_.expected);
+    if (! enabled())
+        return;
     ++ info_.number;
     if (info_.number >= eventsPerInterval_) {
         info_.number = 0;