X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Scheduler%2FScheduler.cci;h=7fe4f5315cf42c69f4332a163878e1e3b13169a1;hb=6159637c51fd562b2bf68a026a3946b2c84f4e0d;hp=a7274003a911f3384dcb1a0eb8ddb7b5f436179f;hpb=3d16600678b948ff3bd0e4fd2a1a800fcc629a03;p=senf.git

diff --git a/Scheduler/Scheduler.cci b/Scheduler/Scheduler.cci
index a727400..7fe4f53 100644
--- a/Scheduler/Scheduler.cci
+++ b/Scheduler/Scheduler.cci
@@ -1,9 +1,9 @@
 // $Id$
 //
 // Copyright (C) 2006
-// Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS)
-// Kompetenzzentrum fuer Satelitenkommunikation (SatCom)
-//     Stefan Bund <stefan.bund@fokus.fraunhofer.de>
+// 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
@@ -27,54 +27,50 @@
 //#include "Scheduler.ih"
 
 // Custom includes
+#include <boost/format.hpp>
 
 #define prefix_ inline
 ///////////////////////////////cci.p///////////////////////////////////////
 
+// public members
+
 prefix_ senf::Scheduler::Scheduler & senf::Scheduler::instance()
 {
     static Scheduler instance;
     return instance;
 }
 
-prefix_ unsigned senf::Scheduler::timeout(ClockService::clock_type timeout,
-                                          TimerCallback const & cb)
+prefix_ void senf::Scheduler::terminate()
 {
-    TimerMap::iterator i (
-        timerMap_.insert(std::make_pair(timerIdCounter_, 
-                                        TimerSpec(timeout,cb,timerIdCounter_))).first);
-    timerQueue_.push(i);
-    return timerIdCounter_++;
+    terminate_ = true;
 }
 
-prefix_ void senf::Scheduler::cancelTimeout(unsigned id)
+prefix_ senf::ClockService::clock_type senf::Scheduler::eventTime()
+    const
 {
-    TimerMap::iterator i (timerMap_.find(id));
-    if (i != timerMap_.end())
-        i->second.canceled = true;
+    return scheduler::FdManager::instance().eventTime();
 }
 
-prefix_ void senf::Scheduler::terminate()
+prefix_ void senf::Scheduler::taskTimeout(unsigned ms)
 {
-    terminate_ = true;
+    scheduler::FIFORunner::instance().taskTimeout(ms);
 }
 
-prefix_ senf::ClockService::clock_type senf::Scheduler::eventTime()
+prefix_ unsigned senf::Scheduler::taskTimeout()
     const
 {
-    return eventTime_;
+    return scheduler::FIFORunner::instance().taskTimeout();
 }
 
-prefix_ int senf::retrieve_filehandle(int fd)
+prefix_ unsigned senf::Scheduler::hangCount()
+    const
 {
-    return fd;
+    return scheduler::FIFORunner::instance().hangCount();
 }
 
-prefix_ senf::Scheduler::TimerSpecCompare::result_type
-senf::Scheduler::TimerSpecCompare::operator()(first_argument_type a, second_argument_type b)
-{
-    return a->second < b->second;
-}
+prefix_ senf::Scheduler::Scheduler()
+    : terminate_ (false)
+{}
 
 ///////////////////////////////cci.e///////////////////////////////////////
 #undef prefix_