X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Scheduler%2FTimerEvent.test.cc;h=ff410e90cdfcbeadc5fa8b85530f85f36cc29367;hb=34068bcb37387d22d2df03cad4504dced2fa684f;hp=e4f2b9805ca21146c7a1e1b93b1382352a21e7a6;hpb=34fd4548b1877daa2a7798c4e2b0e7d2454f3050;p=senf.git

diff --git a/Scheduler/TimerEvent.test.cc b/Scheduler/TimerEvent.test.cc
index e4f2b98..ff410e9 100644
--- a/Scheduler/TimerEvent.test.cc
+++ b/Scheduler/TimerEvent.test.cc
@@ -21,7 +21,7 @@
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 /** \file
-    \brief TimerEvent.test unit tests */
+    \brief TimerEvent unit tests */
 
 //#include "TimerEvent.test.hh"
 //#include "TimerEvent.test.ih"
@@ -29,9 +29,11 @@
 // Custom includes
 #include "TimerEvent.hh"
 #include "Scheduler.hh"
+#include <boost/bind.hpp>
 
 #include "../Utils//auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
+#include <boost/random.hpp>
 
 #define prefix_
 ///////////////////////////////cc.p////////////////////////////////////////
@@ -83,6 +85,67 @@ BOOST_AUTO_UNIT_TEST(timerDispatcher)
     }
 }
 
+namespace {
+
+    senf::ClockService::clock_type randomDelay()
+    {
+        static boost::uniform_smallint<> random (100,300);
+        static boost::mt19937 generator;
+        return senf::scheduler::now() + senf::ClockService::milliseconds(random(generator));
+    }
+
+    unsigned count (0);
+    senf::ClockService::clock_type delay (0);
+
+    void jitterCb(senf::scheduler::TimerEvent & tm)
+    {
+        std::cerr << senf::scheduler::now() << ' ' << tm.timeout() << '\n';
+        count ++;
+        delay += senf::scheduler::now() - tm.timeout();
+        tm.timeout(randomDelay());
+    }
+
+    void logSchedulerTime()
+    {
+        std::cerr << senf::scheduler::now() << '\n';
+    }
+
+    void jitterTest()
+    {
+        count = 0;
+        delay = 0;
+        senf::scheduler::TimerEvent tm1 ("jitterTest::tm1", boost::bind(&jitterCb, boost::ref(tm1)),
+                                         randomDelay());
+        senf::scheduler::TimerEvent tm2 ("jitterTest::tm2", boost::bind(&jitterCb, boost::ref(tm2)),
+                                         randomDelay());
+        senf::scheduler::TimerEvent tm3 ("jitterTest::tm3", boost::bind(&jitterCb, boost::ref(tm3)),
+                                         randomDelay());
+        
+        senf::scheduler::TimerEvent timeout("jitterTest::timeout", &senf::scheduler::terminate,
+                                            senf::scheduler::now() + senf::ClockService::seconds(5));
+
+        senf::scheduler::EventHook timerCalled ("jitterTest::logSchedulerTime", &logSchedulerTime,
+                                                senf::scheduler::EventHook::PRE);
+
+        senf::scheduler::process();
+
+        std::cerr << "Average scheduling delay: " << delay/count << "\n";
+    }
+
+}
+
+BOOST_AUTO_UNIT_TEST(timerJitter)
+{
+    senf::scheduler::watchdogTimeout(0);
+    std::cerr << "Epoll timers\n";
+    senf::scheduler::loresTimers();
+    jitterTest();
+    std::cerr << "Hires timers\n";
+    senf::scheduler::hiresTimers();
+    jitterTest();
+    senf::scheduler::watchdogTimeout(1000);
+}
+
 ///////////////////////////////cc.e////////////////////////////////////////
 #undef prefix_