X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Scheduler%2FScheduler.cci;h=27f463e39f27c57e99761180e41b12548a5a1d53;hb=09010bdcf81888480d4d481a523f9714a89f2625;hp=cda14cab57738bdf2cc180890dff42df7b13bea8;hpb=85ab07d100a382467a42e19d741d403a7a96c951;p=senf.git

diff --git a/Scheduler/Scheduler.cci b/Scheduler/Scheduler.cci
index cda14ca..27f463e 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,13 +27,39 @@
 //#include "Scheduler.ih"
 
 // Custom includes
+#include <boost/format.hpp>
 
 #define prefix_ inline
 ///////////////////////////////cci.p///////////////////////////////////////
 
-prefix_ void senf::Scheduler::terminate()
+// private members
+
+prefix_ void senf::Scheduler::do_add(int fd, FdCallback const & cb, int eventMask)
 {
-    terminate_ = true;
+    do_add((boost::format("<anon fd %d>") % fd).str(), fd, cb, eventMask);
+}
+
+prefix_ void senf::Scheduler::do_add(std::string const & name, int fd, FdCallback const & cb,
+                                     int eventMask)
+{
+    if (! fdDispatcher_.add(name, fd, cb, eventMask))
+        fileDispatcher_.add(name, fd, cb, eventMask);
+}
+
+prefix_ void senf::Scheduler::do_remove(int fd, int eventMask)
+{
+    // We don't know, where the descriptor is registered. However, this is no problem since removing
+    // a non-registered fd is a no-opp
+    fdDispatcher_.remove(fd, eventMask);
+    fileDispatcher_.remove(fd, eventMask);
+}
+
+// public members
+
+prefix_ senf::Scheduler::Scheduler & senf::Scheduler::instance()
+{
+    static Scheduler instance;
+    return instance;
 }
 
 prefix_ int senf::retrieve_filehandle(int fd)
@@ -41,6 +67,40 @@ prefix_ int senf::retrieve_filehandle(int fd)
     return fd;
 }
 
+prefix_ void senf::Scheduler::terminate()
+{
+    terminate_ = true;
+}
+
+prefix_ senf::ClockService::clock_type senf::Scheduler::eventTime()
+    const
+{
+    return scheduler::FdManager::instance().eventTime();
+}
+
+prefix_ void senf::Scheduler::taskTimeout(unsigned ms)
+{
+    scheduler::FIFORunner::instance().taskTimeout(ms);
+}
+
+prefix_ unsigned senf::Scheduler::taskTimeout()
+    const
+{
+    return scheduler::FIFORunner::instance().taskTimeout();
+}
+
+prefix_ unsigned senf::Scheduler::hangCount()
+    const
+{
+    return scheduler::FIFORunner::instance().hangCount();
+}
+
+prefix_ senf::Scheduler::Scheduler()
+    : terminate_ (false), 
+      fdDispatcher_ (scheduler::FdManager::instance(), scheduler::FIFORunner::instance()),
+      fileDispatcher_ (scheduler::FdManager::instance(), scheduler::FIFORunner::instance())
+{}
+
 ///////////////////////////////cci.e///////////////////////////////////////
 #undef prefix_
 
@@ -51,4 +111,6 @@ prefix_ int senf::retrieve_filehandle(int fd)
 // c-file-style: "senf"
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
+// compile-command: "scons -u test"
+// comment-column: 40
 // End: