X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Scheduler%2FClockService.test.cc;h=21b9288f9e38825af5cad83a8bf16c6218e65af8;hb=532240d72e09e19e57fac9bb55c2560b9c9e5b97;hp=88c68e9658f20cb2592a6ad8a2b6d52f003bca94;hpb=4ec38ecb3c79f853e9ebc92e30735e6fc62ac0c9;p=senf.git

diff --git a/Scheduler/ClockService.test.cc b/Scheduler/ClockService.test.cc
index 88c68e9..21b9288 100644
--- a/Scheduler/ClockService.test.cc
+++ b/Scheduler/ClockService.test.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
@@ -21,7 +21,7 @@
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 /** \file
-    \brief ClockService.test unit tests */
+    \brief ClockService unit tests */
 
 //#include "ClockService.test.hh"
 //#include "ClockService.test.ih"
@@ -30,35 +30,16 @@
 #include "ClockService.hh"
 #include <errno.h>
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
 ///////////////////////////////cc.p////////////////////////////////////////
 
-namespace senf {
-namespace detail {
-
-    struct ClockServiceTest
-    {
-        static boost::posix_time::ptime & base() 
-            { return senf::ClockService::instance().base_; }
-        static boost::posix_time::ptime & heartbeat()
-            { return senf::ClockService::instance().heartbeat_; }
-    };
-
-}}
-
 namespace {
 
     bool is_close_clock(senf::ClockService::clock_type a, senf::ClockService::clock_type b, 
-                        unsigned long delta = 50000000ul)
-    {
-        return (a<b ? b-a : a-b ) < delta;
-    }
-
-    bool is_close_pt(boost::posix_time::ptime a, boost::posix_time::ptime b,
-                     boost::posix_time::time_duration delta = boost::posix_time::milliseconds(50) )
+                        senf::ClockService::clock_type delta)
     {
         return (a<b ? b-a : a-b ) < delta;
     }
@@ -82,45 +63,35 @@ BOOST_AUTO_UNIT_TEST(clockService)
     senf::ClockService::clock_type t2 (senf::ClockService::now());
     BOOST_CHECK_PREDICATE( is_close_clock,
                            (t1 + senf::ClockService::milliseconds(200)) 
-                           (t2) );
+                           (t2)
+                           (senf::ClockService::milliseconds(100)) );
 
     t1 = t2;
-    // We shift both heartbeat() and base() back 1 minute. This is the same as
-    // moving the current time forward 1 minute.
-    boost::posix_time::ptime b (senf::detail::ClockServiceTest::base());
-    boost::posix_time::ptime h (senf::detail::ClockServiceTest::heartbeat());
-    senf::detail::ClockServiceTest::heartbeat() -= boost::posix_time::minutes(1);
-    senf::detail::ClockServiceTest::base() -= boost::posix_time::minutes(1);
 
     // Wait for SIGALRM and let the signal handler do the clock-skew detection
-    delay(senf::ClockService::CheckInterval*1000);
-
-    BOOST_CHECK_PREDICATE( is_close_pt,
-                           (b)
-                           (senf::detail::ClockServiceTest::base()) );
-    BOOST_CHECK_PREDICATE( is_close_pt,
-                           (h+boost::posix_time::seconds(senf::ClockService::CheckInterval))
-                           (senf::detail::ClockServiceTest::heartbeat()) );
+    delay(1*1000);
 
     t2 = senf::ClockService::now();
     BOOST_CHECK_PREDICATE( is_close_clock,
-                           (t1 + senf::ClockService::seconds(senf::ClockService::CheckInterval))
-                           (t2) );
+                           (t1 + senf::ClockService::seconds(1))
+                           (t2)
+                           (senf::ClockService::milliseconds(500)) );
 
     t1 = t2;
 
-    senf::detail::ClockServiceTest::heartbeat() -= boost::posix_time::minutes(1);
-    senf::detail::ClockServiceTest::base() -= boost::posix_time::minutes(1);
-
-    // Let now() do the clock skew detection using getitimer() ...
     delay(200);
     BOOST_CHECK_PREDICATE( is_close_clock,
                            (t1 + senf::ClockService::milliseconds(200))
-                           (senf::ClockService::now()) );
-    
-    // We need restart the clock-service here to fix up the bad heartbeat value. That's faster
-    // than waiting another CheckInterval seconds for SIGALRM
-    senf::ClockService::restart();
+                           (senf::ClockService::now())
+                           (senf::ClockService::milliseconds(100)) );
+
+    // The next check validates that the clock service itimer/heartbeat_ is correctly reset after a
+    // clock-skew is detected
+
+    BOOST_CHECK_PREDICATE( is_close_clock,
+                           (t1 + senf::ClockService::milliseconds(200))
+                           (senf::ClockService::now()) 
+                           (senf::ClockService::milliseconds(100)) );
 }
 
 ///////////////////////////////cc.e////////////////////////////////////////