X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FScheduler%2FScheduler.test.cc;h=32d6fdc15c76403ed83fbefd588a6d5c55692c4e;hb=refs%2Fheads%2Fmaster;hp=0dfbc996b4bcd258f37fa8b0a6cc7b0a7f79130c;hpb=767a76da8e5b96a69b620e44d32e0a1b04005679;p=senf.git

diff --git a/senf/Scheduler/Scheduler.test.cc b/senf/Scheduler/Scheduler.test.cc
index 0dfbc99..32d6fdc 100644
--- a/senf/Scheduler/Scheduler.test.cc
+++ b/senf/Scheduler/Scheduler.test.cc
@@ -2,23 +2,28 @@
 //
 // Copyright (C) 2006
 // 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 Scheduler unit tests */
@@ -44,7 +49,7 @@
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
-///////////////////////////////cc.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
 namespace {
 
@@ -74,7 +79,7 @@ namespace {
         int conn = accept(sock,0,0);
         if (conn < 0) fail("accept");
 
-        ///////////////////////////////////////////////////////////////////////////
+        //-/////////////////////////////////////////////////////////////////////////////////////////
 
         if (write(conn,"READ",4)<0) fail("write");
         char buffer[1024];
@@ -89,7 +94,7 @@ namespace {
         } else
             if (write(conn,"FAIL",4)<0) fail("write");
 
-        ///////////////////////////////////////////////////////////////////////////
+        //-/////////////////////////////////////////////////////////////////////////////////////////
 
         close(conn);
         close(sock);
@@ -189,7 +194,7 @@ namespace {
     {
         return (a<b ? b-a : a-b) < senf::ClockService::milliseconds(100);
     }
-    
+
     senf::ClockService::clock_type sigtime (0);
 
     void sigusr(siginfo_t const &)
@@ -243,7 +248,7 @@ void schedulerTest()
         BOOST_FAIL("connect");
     }
 
-    ///////////////////////////////////////////////////////////////////////////
+    //-/////////////////////////////////////////////////////////////////////////////////////////////
 
     senf::scheduler::EventHook evev ("eventCounter", eventeventhandler,
                                      senf::scheduler::EventHook::PRE);
@@ -276,13 +281,13 @@ void schedulerTest()
         buffer[size]=0;
         BOOST_CHECK_EQUAL( buffer, "OK" );
     }
-    
+
     {
-        senf::scheduler::TimerEvent timer1 ("testTimer1", &timeout, 
+        senf::scheduler::TimerEvent timer1 ("testTimer1", &timeout,
                                             senf::ClockService::now()+senf::ClockService::milliseconds(200));
         senf::scheduler::TimerEvent timer2 ("testTimer2", &timeout,
                                             senf::ClockService::now()+senf::ClockService::milliseconds(400));
-                                            
+
         event = senf::scheduler::FdEvent::EV_NONE;
         senf::ClockService::clock_type t (senf::ClockService::now());
         SENF_CHECK_NO_THROW( senf::scheduler::process() );
@@ -316,18 +321,18 @@ void schedulerTest()
         senf::ClockService::clock_type t = senf::ClockService::now();
         ::kill(::getpid(), SIGUSR1);
         delay(200);
-        SENF_CHECK_NO_THROW( senf::scheduler::process() ); 
+        SENF_CHECK_NO_THROW( senf::scheduler::process() );
         if (enabled) {
             BOOST_CHECK_PREDICATE( is_close, (senf::ClockService::now()) (t+senf::ClockService::milliseconds(200)) );
             BOOST_CHECK_PREDICATE( is_close, (sigtime) (t+senf::ClockService::milliseconds(200)) );
         }
-        SENF_CHECK_NO_THROW( senf::scheduler::process() ); 
-    } 
+        SENF_CHECK_NO_THROW( senf::scheduler::process() );
+    }
 
     BOOST_CHECK( eventCount >= 8u );
 
- 
-    ///////////////////////////////////////////////////////////////////////////
+
+    //-/////////////////////////////////////////////////////////////////////////////////////////////
 
     close(sock);
 
@@ -365,7 +370,7 @@ SENF_AUTO_UNIT_TEST(testSchedulerPOSIXTimers)
 }
 
 namespace {
-    
+
     void sigme()
     {
         senf::scheduler::BlockSignals signalBlocker;
@@ -390,21 +395,21 @@ SENF_AUTO_UNIT_TEST(blockSignals)
     senf::scheduler::TimerEvent timer (
         "testWatchdog", &timeout, senf::ClockService::now()+senf::ClockService::milliseconds(400));
     senf::scheduler::SignalEvent sig (SIGUSR1, &sigusr);
-    
+
     senf::ClockService::clock_type t = senf::ClockService::now();
-    SENF_CHECK_NO_THROW( senf::scheduler::process() ); 
+    SENF_CHECK_NO_THROW( senf::scheduler::process() );
 
     if (enabled) {
-        BOOST_CHECK_PREDICATE( is_close, 
-                               (senf::ClockService::now()) 
+        BOOST_CHECK_PREDICATE( is_close,
+                               (senf::ClockService::now())
                                (t+senf::ClockService::milliseconds(200)) );
         BOOST_CHECK_PREDICATE( is_close, (sigtime) (t+senf::ClockService::milliseconds(200)) );
     }
 
-    SENF_CHECK_NO_THROW( senf::scheduler::process() ); 
+    SENF_CHECK_NO_THROW( senf::scheduler::process() );
 }
 
-///////////////////////////////cc.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_