Added additional operators to RestrictedInt and made

[senf.git] / senf / Scheduler / TimerEvent.test.cc

diff --git a/senf/Scheduler/TimerEvent.test.cc b/senf/Scheduler/TimerEvent.test.cc
index 04a2e43..88e2f34 100644 (file)
--- a/senf/Scheduler/TimerEvent.test.cc
+++ b/senf/Scheduler/TimerEvent.test.cc
@@ -1,24 +1,29 @@
 // $Id$
 //
-// Copyright (C) 2008 
+// Copyright (C) 2008
 // 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
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
-// (at your option) any later version.
+// The contents of this file are subject to the Fraunhofer FOKUS Public License
+// Version 1.0 (the "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at 
+// http://senf.berlios.de/license.html
 //
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
+// The Fraunhofer FOKUS Public License Version 1.0 is based on, 
+// but modifies the Mozilla Public License Version 1.1.
+// See the full license text for the amendments.
 //
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the
-// Free Software Foundation, Inc.,
-// 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+// Software distributed under the License is distributed on an "AS IS" basis, 
+// WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License 
+// for the specific language governing rights and limitations under the License.
+//
+// The Original Code is Fraunhofer FOKUS code.
+//
+// The Initial Developer of the Original Code is Fraunhofer-Gesellschaft e.V. 
+// (registered association), Hansastraße 27 c, 80686 Munich, Germany.
+// All Rights Reserved.
+//
+// Contributor(s):
+//   Stefan Bund <g0dil@berlios.de>
 
 /** \file
     \brief TimerEvent unit tests */
@@ -36,7 +41,7 @@
 #include <boost/random.hpp>
 
 #define prefix_
-///////////////////////////////cc.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
 namespace {
 
@@ -44,7 +49,7 @@ namespace {
     {
         return (a<b ? b-a : a-b) < senf::ClockService::milliseconds(50);
     }
-    
+
     bool called = false;
     void handler()
     {
@@ -62,7 +67,7 @@ SENF_AUTO_UNIT_TEST(timerDispatcher)
 
     senf::ClockService::clock_type t (senf::ClockService::now());
     {
-        senf::scheduler::TimerEvent timer ("testTimer", &handler, 
+        senf::scheduler::TimerEvent timer ("testTimer", &handler,
                                            t + senf::ClockService::milliseconds(500));
         SENF_CHECK_NO_THROW( timer.disable() );
         SENF_CHECK_NO_THROW( timer.enable() );
@@ -107,31 +112,31 @@ namespace {
     {
         //std::cerr << "diff:" << senf::ClockService::in_microseconds( senf::scheduler::now() - tm.timeout()) << '\n';
         count ++;
-        delay += senf::ClockService::in_microseconds( senf::scheduler::now() - tm.timeout());
+        delay += SENF_INT2CLOCKTYPE(senf::ClockService::in_microseconds( senf::scheduler::now() - tm.timeout()));
         haveCb = true;
         tm.timeout(randomDelay());
     }
 
-    void preCb()
-    {
-        haveCb = false;
-    }
-
-    void postCb()
-    {
-        if (! haveCb)
-            std::cerr << senf::scheduler::now() << '\n';
-    }
-
-    void idleCb(senf::scheduler::TimerEvent & tm)
-    {
-        tm.timeout( senf::scheduler::now());
-    }
+//    void preCb()
+//    {
+//        haveCb = false;
+//    }
+//
+//    void postCb()
+//    {
+//        if (! haveCb)
+//            std::cerr << senf::scheduler::now() << '\n';
+//    }
+//
+//    void idleCb(senf::scheduler::TimerEvent & tm)
+//    {
+//        tm.timeout( senf::scheduler::now());
+//    }
 
     void jitterTest()
     {
         count = 0;
-        delay = 0;
+        delay = senf::ClockService::clock_type(0);
 //        senf::scheduler::EventHook pre ("jitterTest::preCb", &preCb,
 //                                        senf::scheduler::EventHook::PRE);
 //        senf::scheduler::EventHook post ("jitterTest::postCb", &postCb,
@@ -143,7 +148,7 @@ namespace {
                 "jitterTest::tm2", boost::bind(&jitterCb, boost::ref(tm2)), randomDelay());
         senf::scheduler::TimerEvent tm3 (
                 "jitterTest::tm3", boost::bind(&jitterCb, boost::ref(tm3)), randomDelay());
-        
+
         // enabled "Idle"-Event will degrade scheduling delay
         //senf::scheduler::TimerEvent idle (
         //        "jitterTest::idle", boost::bind(&idleCb, boost::ref(idle)), senf::scheduler::now());
@@ -153,7 +158,7 @@ namespace {
 
         senf::scheduler::process();
 
-        std::cerr << "Average scheduling delay: " << delay/count << " microseconds\n";
+        std::cerr << "Average scheduling delay: " << SENF_CLOCKTYPEVAL(delay)/count << " microseconds\n";
     }
 
 }
@@ -169,9 +174,10 @@ SENF_AUTO_UNIT_TEST(timerJitter)
     jitterTest();
     senf::scheduler::loresTimers();
     senf::scheduler::watchdogTimeout(1000);
+    BOOST_CHECK( true );
 }
 
-///////////////////////////////cc.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_
 
 \f