X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Scheduler%2FScheduler.cci;h=b638dcd2584f11389040f987b40f77984ed08017;hb=034f9bec0a66d26314fb6ebc83dedf1618a2c19d;hp=1c1e7ef4f73d58b52ae471fc85ed65c748e64fb4;hpb=914af680a37d303da51e3877972ca9bd68d6190b;p=senf.git

diff --git a/Scheduler/Scheduler.cci b/Scheduler/Scheduler.cci
index 1c1e7ef..b638dcd 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
@@ -31,18 +31,39 @@
 #define prefix_ inline
 ///////////////////////////////cci.p///////////////////////////////////////
 
+prefix_ senf::Scheduler::Scheduler & senf::Scheduler::instance()
+{
+    static Scheduler instance;
+    return instance;
+}
+
+prefix_ unsigned senf::Scheduler::timeout(ClockService::clock_type timeout,
+                                          SimpleCallback const & cb)
+{
+    ++ timerIdCounter_;
+    TimerMap::iterator i (
+        timerMap_.insert(std::make_pair(timerIdCounter_, 
+                                        TimerSpec(timeout,cb,timerIdCounter_))).first);
+    timerQueue_.push(i);
+    return timerIdCounter_;
+}
+
+prefix_ void senf::Scheduler::cancelTimeout(unsigned id)
+{
+    TimerMap::iterator i (timerMap_.find(id));
+    if (i != timerMap_.end())
+        i->second.canceled = true;
+}
+
 prefix_ void senf::Scheduler::terminate()
 {
     terminate_ = true;
 }
 
-prefix_ senf::Scheduler::sched_time senf::Scheduler::now()
+prefix_ senf::ClockService::clock_type senf::Scheduler::eventTime()
     const
 {
-    boost::posix_time::time_duration delta (
-        boost::posix_time::microsec_clock::universal_time() - epoch_);
-    return sched_time( delta.ticks() )
-        * sched_time( 1000000000UL / boost::posix_time::time_duration::ticks_per_second() );
+    return eventTime_;
 }
 
 prefix_ int senf::retrieve_filehandle(int fd)
@@ -50,6 +71,12 @@ prefix_ int senf::retrieve_filehandle(int fd)
     return fd;
 }
 
+prefix_ senf::Scheduler::TimerSpecCompare::result_type
+senf::Scheduler::TimerSpecCompare::operator()(first_argument_type a, second_argument_type b)
+{
+    return a->second < b->second;
+}
+
 ///////////////////////////////cci.e///////////////////////////////////////
 #undef prefix_