//
// Copyright (C) 2010
// 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
-// the Free Software Foundation; either version 2 of the License, or
-// (at your option) any later version.
+// The contents of this file are subject to the Fraunhofer FOKUS Public License
+// Version 1.0 (the "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+// http://senf.berlios.de/license.html
//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
+// The Fraunhofer FOKUS Public License Version 1.0 is based on,
+// but modifies the Mozilla Public License Version 1.1.
+// See the full license text for the amendments.
//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the
-// Free Software Foundation, Inc.,
-// 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+// Software distributed under the License is distributed on an "AS IS" basis,
+// WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+// for the specific language governing rights and limitations under the License.
+//
+// The Original Code is Fraunhofer FOKUS code.
+//
+// The Initial Developer of the Original Code is Fraunhofer-Gesellschaft e.V.
+// (registered association), Hansastraße 27 c, 80686 Munich, Germany.
+// All Rights Reserved.
+//
+// Contributor(s):
+// Mathias Kretschmer <mtk@berlios.de>
+// Jens Moedeker <jmo@berlios.de>
/** \file
\brief TimerEventProxy non-inline template implementation */
// Custom includes
+#include <senf/Utils/membind.hh>
#define prefix_
-///////////////////////////////ct.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
template<typename IdType>
-prefix_ senf::scheduler::TimerEventProxy<IdType>::TimerEventProxy()
+prefix_ senf::scheduler::TimerEventProxy<IdType>::TimerEventProxy(std::string const & description)
: entrySetById( entrySet.template get<Id>()),
entrySetByTimeout( entrySet.template get<Timeout> ()),
- timer( "TimerEventProxy", membind(&TimerEventProxy<IdType>::timerEvent, this), 0, false)
+ timer( "TimerEventProxy " + description,
+ membind(&TimerEventProxy<IdType>::timerEvent, this), SENF_INT2CLOCKTYPE(0), false)
{ }
template<typename IdType>
-prefix_ senf::scheduler::TimerEventProxy<IdType>::TimerEventProxy(std::string const & name, console::DirectoryNode & node)
- : entrySetById( entrySet.template get<Id>()),
- entrySetByTimeout( entrySet.template get<Timeout> ()),
- timer( "TimerEventProxy", membind(&TimerEventProxy<IdType>::timerEvent, this), 0, false)
-{
- node.add(name, console::factory::Command(
- &TimerEventProxy<IdType>::list, this) .doc("List active Timers"));
-}
-
-template<typename IdType>
prefix_ void senf::scheduler::TimerEventProxy<IdType>::timerEvent()
{
- ClockService::clock_type actual = ClockService::now();
+ ClockService::clock_type now = senf::scheduler::now();
typename EntrySetByTimeout_t::iterator it = entrySetByTimeout.begin();
- while (it != entrySetByTimeout.end() && it->timeout <= actual) {
+ while (it != entrySetByTimeout.end() && it->timeout <= now) {
Entry item (*it);
// remove due entry from set
entrySetByTimeout.erase(it);
// call callback
- item.cb(actual, item.id);
+ item.cb(now, item.id);
it = entrySetByTimeout.begin();
}
if (entrySet.size() > 0)
prefix_ void senf::scheduler::TimerEventProxy<IdType>::add(
ClockService::clock_type timeout, IdType const & id, Callback cb)
{
- // insert new entry
- entrySetByTimeout.insert( Entry(timeout, id, cb));
+ // insert new entry or replace the timeout of an entry already indexed
+ typename EntrySetById_t::iterator i = entrySetById.find(id);
+ if (i == entrySetById.end())
+ entrySetByTimeout.insert( Entry(timeout, id, cb));
+ else {
+ Entry tmp = *i;
+ tmp.timeout = timeout;
+ entrySetById.replace(i,tmp);
+ }
// the scheduler time to the first earliest timeout (ordered index)
timer.timeout( entrySetByTimeout.begin()->timeout);
}
template<typename IdType>
prefix_ bool senf::scheduler::TimerEventProxy<IdType>::remove(IdType const & id)
{
- return entrySetById.erase( id) > 0;
+ bool removed (entrySetById.erase( id) > 0);
+ if (entrySet.size() > 0)
+ timer.timeout(entrySetByTimeout.begin()->timeout);
+ else
+ timer.disable();
+ return removed;
}
template<typename IdType>
const
{
typename EntrySetById_t::const_iterator i ( entrySetById.find( id));
- return i == entrySetById.end() ? 0 : i->timeout;
+ return i == entrySetById.end() ? SENF_INT2CLOCKTYPE(0) : i->timeout;
}
return tmp;
}
-///////////////////////////////ct.e////////////////////////////////////////
+template<typename IdType>
+prefix_ unsigned senf::scheduler::TimerEventProxy<IdType>::numEvents()
+ const
+{
+ return entrySetByTimeout.size();
+}
+
+template<typename IdType>
+prefix_ void senf::scheduler::TimerEventProxy<IdType>::clear()
+{
+ entrySetByTimeout.clear();
+}
+
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
#undef prefix_
\f
projects / senf.git / blobdiff