X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FScheduler%2FTimerEventProxy.ct;h=a1c744a6344804af01ae2ad2e613241a829cc30d;hb=78a6e233083efa63a9cd0684a92abc64202a9ee7;hp=cb665b69c2c05f997330d79dbcdd10523c94fec6;hpb=acce6d54436fa760c0f4770ea3a6c76ae40e0bb8;p=senf.git

diff --git a/senf/Scheduler/TimerEventProxy.ct b/senf/Scheduler/TimerEventProxy.ct
index cb665b6..a1c744a 100644
--- a/senf/Scheduler/TimerEventProxy.ct
+++ b/senf/Scheduler/TimerEventProxy.ct
@@ -4,6 +4,7 @@
 // Fraunhofer Institute for Open Communication Systems (FOKUS)
 // Competence Center NETwork research (NET), St. Augustin, GERMANY
 //     Mathias Kretschmer <mtk@berlios.de>
+//     Jens Moedeker <jens.moedeker@fokus.fraunhofer.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
@@ -21,94 +22,93 @@
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 /** \file
- \brief TimerEventProxy public header */
+    \brief TimerEventProxy non-inline template implementation */
 
-#define prefix_ 
+// Custom includes
 
-template<class T>
-prefix_ senf::scheduler::TimerEventProxy<T>::TimerEventProxy() :
-    timer("timer", senf::membind(&TimerEventProxy<T>::timerEvent, this), 0,
-            false), entrySetById(entrySet.template get<Id> ()),
-            entrySetByTimeout(entrySet.template get<Timeout> ())
-{
+#define prefix_
+///////////////////////////////ct.p////////////////////////////////////////
 
-}
+template<typename IdType>
+prefix_ senf::scheduler::TimerEventProxy<IdType>::TimerEventProxy(std::string const & description)
+    : entrySetById( entrySet.template get<Id>()),
+      entrySetByTimeout( entrySet.template get<Timeout> ()),
+      timer( "TimerEventProxy " + description,
+              membind(&TimerEventProxy<IdType>::timerEvent, this), 0, false)
+{ }
 
-template<class T>
-prefix_ senf::scheduler::TimerEventProxy<T>::TimerEventProxy( std::string const & name,
-        senf::console::DirectoryNode & node) :
-    timer("timer", senf::membind(&TimerEventProxy<T>::timerEvent, this), 0,
-            false), entrySetById(entrySet.template get<Id> ()),
-            entrySetByTimeout(entrySet.template get<Timeout> ())
+template<typename IdType>
+prefix_ void senf::scheduler::TimerEventProxy<IdType>::timerEvent()
 {
-    node.add(name, senf::console::factory::Command(
-            &TimerEventProxy<T>::listTimers, this) .doc("List active Timers"));
-}
-
-template<class T>
-prefix_ void senf::scheduler::TimerEventProxy<T>::timerEvent() {
-
-    senf::ClockService::clock_type actual = senf::ClockService::now();
-    typename EntrySetByTimeout_t::iterator it;
-
-    // execute the timer callbacks first
-
-    it = entrySetByTimeout.begin();
-    while (it != entrySetByTimeout.end() && it->timeout <= actual) {
-        Entry<T> item(*it);
+    ClockService::clock_type now = senf::scheduler::now();
+    typename EntrySetByTimeout_t::iterator it = entrySetByTimeout.begin();
+    while (it != entrySetByTimeout.end() && it->timeout <= now) {
+        Entry item (*it);
         // remove due entry from set
         entrySetByTimeout.erase(it);
         // call callback
-        item.fkt(actual, item.id);
-
+        item.cb(now, item.id);
         it = entrySetByTimeout.begin();
     }
-
-    if (entrySet.size() > 0) {
+    if (entrySet.size() > 0)
         timer.timeout(entrySetByTimeout.begin()->timeout);
-    }
 }
 
-template<class T>
-prefix_ void senf::scheduler::TimerEventProxy<T>::add(
-        senf::ClockService::clock_type timeout, T const & id, Callback fkt)
+template<typename IdType>
+prefix_ void senf::scheduler::TimerEventProxy<IdType>::add(
+        ClockService::clock_type timeout, IdType const & id, Callback cb)
 {
     // insert new entry
-    entrySetByTimeout.insert(Entry<T> (timeout, id, fkt));
-
+    entrySetByTimeout.insert( Entry(timeout, id, cb));
     // the scheduler time to the first earliest timeout (ordered index)
-    timer.timeout(entrySetByTimeout.begin()->timeout);
-
-    //  // if map was empty before, hence we need to activate the time event object
-    //  if( entrySetByTimeout.size() >= 1){
-    //      timer.enable();
-    //  }
+    timer.timeout( entrySetByTimeout.begin()->timeout);
 }
 
-template<class T>
-prefix_ bool senf::scheduler::TimerEventProxy<T>::del(T const & id)
+template<typename IdType>
+prefix_ bool senf::scheduler::TimerEventProxy<IdType>::remove(IdType const & id)
 {
-    typename EntrySetById_t::iterator it(entrySetById.find(Entry<T> (0, id, NULL)));
+    bool removed (entrySetById.erase( id) > 0);
+    if (entrySet.size() > 0)
+        timer.timeout(entrySetByTimeout.begin()->timeout);
+    else
+        timer.disable();
+    return removed;
+}
 
-    if (it != entrySetById.end()) {
-        entrySetById.erase(it);
-        return true;
-    }
-    return false;
+template<typename IdType>
+prefix_ senf::ClockService::clock_type senf::scheduler::TimerEventProxy<IdType>::timeout(IdType const & id)
+    const
+{
+    typename EntrySetById_t::const_iterator i ( entrySetById.find( id));
+    return i == entrySetById.end() ? 0 : i->timeout;
 }
 
-template<class T>
-prefix_ std::vector<std::pair<senf::ClockService::clock_type, T> > senf::scheduler::TimerEventProxy<T>::list()
+
+template<typename IdType>
+prefix_ std::vector<std::pair<senf::ClockService::clock_type, IdType> > senf::scheduler::TimerEventProxy<IdType>::list()
+    const
 {
-    std::vector<std::pair<senf::ClockService::clock_type, T> > tmp;
+    std::vector<std::pair<ClockService::clock_type, IdType> > tmp;
 
-    typename EntrySetByTimeout_t::iterator it;
+    typename EntrySetByTimeout_t::const_iterator it;
     for (it = entrySetByTimeout.begin(); it != entrySetByTimeout.end(); ++it) {
-        tmp.push_back(std::make_pair<senf::ClockService::clock_type, T>( it->timeout, it->id));
+        tmp.push_back(std::make_pair<ClockService::clock_type, IdType>( it->timeout, it->id));
     }
-
     return tmp;
 }
 
+///////////////////////////////ct.e////////////////////////////////////////
 #undef prefix_
 
+
+// Local Variables:
+// mode: c++
+// fill-column: 100
+// c-file-style: "senf"
+// indent-tabs-mode: nil
+// ispell-local-dictionary: "american"
+// compile-command: "scons -u test"
+// comment-column: 40
+// End:
+
+