Utils/Console: Fix singleton instantiation order (ServerManager / Scheduler)

[senf.git] / Scheduler / Scheduler.cci

diff --git a/Scheduler/Scheduler.cci b/Scheduler/Scheduler.cci
index 2308705..f8a565e 100644 (file)
--- 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,87 @@ prefix_ int senf::retrieve_filehandle(int fd)
     return fd;
 }
 
+prefix_ senf::Scheduler::timer_id senf::Scheduler::timeout(ClockService::clock_type timeout,
+                                                           SimpleCallback const & cb)
+{
+    return timerDispatcher_.add("<anon timer>", timeout, cb);
+}
+
+prefix_ senf::Scheduler::timer_id senf::Scheduler::timeout(std::string const & name,
+                                                           ClockService::clock_type timeout,
+                                                           SimpleCallback const & cb)
+{
+    return timerDispatcher_.add(name, timeout, cb);
+}
+
+prefix_ void senf::Scheduler::cancelTimeout(timer_id id)
+{
+    timerDispatcher_.remove(id);
+}
+
+prefix_ senf::ClockService::clock_type senf::Scheduler::timeoutEarly()
+    const
+{
+    SENF_LOG( (senf::log::IMPORTANT) 
+              ("timeoutEarly() is deprecated and a no-op. It will be removed") );
+    return 0;
+}
+
+prefix_ void senf::Scheduler::timeoutEarly(ClockService::clock_type v)
+{
+    SENF_LOG( (senf::log::IMPORTANT) 
+              ("timeoutEarly() is deprecated and a no-op. It will be removed") );
+}
+
+prefix_ senf::ClockService::clock_type senf::Scheduler::timeoutAdjust()
+    const
+{
+    SENF_LOG( (senf::log::IMPORTANT) 
+              ("timeoutAdjust() is deprecated and a no-op. It will be removed") );
+    return 0;
+}
+
+prefix_ void senf::Scheduler::timeoutAdjust(ClockService::clock_type v)
+{
+    SENF_LOG( (senf::log::IMPORTANT) 
+              ("timeoutAdjust() is deprecated and a no-op. It will be removed") );
+}
+
+prefix_ void senf::Scheduler::registerSignal(unsigned signal, SignalCallback const & cb)
+{
+    signalDispatcher_.add(signal, cb);
+}
+
+prefix_ void senf::Scheduler::unregisterSignal(unsigned signal)
+{
+    signalDispatcher_.remove(signal);
+}
+
+prefix_ void senf::Scheduler::terminate()
+{
+    terminate_ = true;
+}
+
+prefix_ senf::ClockService::clock_type senf::Scheduler::eventTime()
+    const
+{
+    return manager_.eventTime();
+}
+
+prefix_ unsigned senf::Scheduler::hangCount()
+    const
+{
+    return runner_.hangCount();
+}
+
+prefix_ senf::Scheduler::Scheduler()
+    : terminate_ (false), 
+      fdDispatcher_ (manager_, runner_),
+      timerDispatcher_ (manager_, runner_),
+      signalDispatcher_ (manager_, runner_),
+      fileDispatcher_ (manager_, runner_)
+{}
+
 ///////////////////////////////cci.e///////////////////////////////////////
 #undef prefix_