X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Scheduler%2FScheduler.cci;h=b638dcd2584f11389040f987b40f77984ed08017;hb=84df23442e79b04a5c4e55a93f46a26b8abe4728;hp=fbae2219960d6f55b900ea56693b3f3e4bcb669f;hpb=b8a3977542aaf217ac472e5266abd0fcffb4f95f;p=senf.git

diff --git a/Scheduler/Scheduler.cci b/Scheduler/Scheduler.cci
index fbae221..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
@@ -38,13 +38,14 @@ prefix_ senf::Scheduler::Scheduler & senf::Scheduler::instance()
 }
 
 prefix_ unsigned senf::Scheduler::timeout(ClockService::clock_type timeout,
-                                          TimerCallback const & cb)
+                                          SimpleCallback const & cb)
 {
+    ++ timerIdCounter_;
     TimerMap::iterator i (
         timerMap_.insert(std::make_pair(timerIdCounter_, 
                                         TimerSpec(timeout,cb,timerIdCounter_))).first);
     timerQueue_.push(i);
-    return timerIdCounter_++;
+    return timerIdCounter_;
 }
 
 prefix_ void senf::Scheduler::cancelTimeout(unsigned id)
@@ -59,6 +60,12 @@ prefix_ void senf::Scheduler::terminate()
     terminate_ = true;
 }
 
+prefix_ senf::ClockService::clock_type senf::Scheduler::eventTime()
+    const
+{
+    return eventTime_;
+}
+
 prefix_ int senf::retrieve_filehandle(int fd)
 {
     return fd;