X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FScheduler%2FFIFORunner.hh;h=733d05af444aa8b628935d5b06dc444acdb026df;hb=refs%2Fheads%2Fmaster;hp=7f9f65545c1b8f8d84011940b1aaf86616e1c5e6;hpb=26610f603ebdd465307b9621f532c1fe19fd5571;p=senf.git

diff --git a/senf/Scheduler/FIFORunner.hh b/senf/Scheduler/FIFORunner.hh
index 7f9f655..733d05a 100644
--- a/senf/Scheduler/FIFORunner.hh
+++ b/senf/Scheduler/FIFORunner.hh
@@ -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 FIFORunner public header */
@@ -29,15 +34,15 @@
 // Custom includes
 #include <signal.h>
 #include <boost/utility.hpp>
-#include <boost/intrusive/ilist.hpp>
-#include <boost/intrusive/ilist_hook.hpp>
+#include <senf/boost_intrusive/ilist.hpp>
+#include <senf/boost_intrusive/ilist_hook.hpp>
 #include <senf/Utils/singleton.hh>
 #include "EventManager.hh"
 
 //#include "FIFORunner.mpp"
-///////////////////////////////hh.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
-namespace senf { 
+namespace senf {
 namespace scheduler {
 
     void restart();
@@ -48,7 +53,7 @@ namespace detail {
         : public singleton<FIFORunner>
     {
     public:
-        struct TaskInfo;
+        class TaskInfo;
 
     private:
         struct TaskListTag;
@@ -56,8 +61,8 @@ namespace detail {
         typedef boost::intrusive::ilist<TaskListBase::value_traits<TaskInfo>, false> TaskList;
 
     public:
-        class TaskInfo 
-            : public Event, 
+        class TaskInfo
+            : public Event,
               public TaskListBase
         {
         public:
@@ -72,16 +77,14 @@ namespace detail {
 
         protected:
             void setRunnable();
-            
+
         private:
             virtual void v_run() = 0;
             virtual bool v_enabled() const;
 
             bool runnable_;
             Priority priority_;
-#       ifdef SENF_DEBUG
-            std::string backtrace_;
-#       endif
+            std::string backtrace_; // only used if SENF_BACKTRACE is defined.
 
             friend class FIFORunner;
         };
@@ -94,7 +97,7 @@ namespace detail {
 
         void enqueue(TaskInfo * task);
         void dequeue(TaskInfo * task);
-        
+
         void run();
 
         void taskTimeout(unsigned ms);
@@ -123,7 +126,7 @@ namespace detail {
 
         TaskList::iterator priorityEnd(TaskInfo::Priority p);
         void run(TaskList::iterator f, TaskList::iterator l);
-        
+
         struct NullTask : public TaskInfo
         {
             NullTask();
@@ -138,7 +141,7 @@ namespace detail {
 
         NullTask normalPriorityEnd_;
         NullTask highPriorityEnd_;
-        
+
         timer_t watchdogId_;
         bool watchdogRunning_;
         unsigned watchdogMs_;
@@ -157,7 +160,7 @@ namespace detail {
 
 }}}
 
-///////////////////////////////hh.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #include "FIFORunner.cci"
 //#include "FIFORunner.ct"
 //#include "FIFORunner.cti"