X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FScheduler%2FTimerEventProxy.ct;h=b851ba11985c43c7294517748f9dba65de8e518d;hb=refs%2Fheads%2Fmaster;hp=32098e267cd9bcdcf5780a6ed5301a1ea10bbc37;hpb=958ff33fd589fa7e7ef41810391be91353ee30f9;p=senf.git diff --git a/senf/Scheduler/TimerEventProxy.ct b/senf/Scheduler/TimerEventProxy.ct index 32098e2..b851ba1 100644 --- a/senf/Scheduler/TimerEventProxy.ct +++ b/senf/Scheduler/TimerEventProxy.ct @@ -2,101 +2,139 @@ // // Copyright (C) 2010 // Fraunhofer Institute for Open Communication Systems (FOKUS) -// Competence Center NETwork research (NET), St. Augustin, GERMANY -// Mathias Kretschmer -// Jens Moedeker // -// 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 +// Jens Moedeker /** \file - \brief TimerEventProxy public header */ + \brief TimerEventProxy non-inline template implementation */ + +// Custom includes +#include -#define prefix_ +#define prefix_ +//-///////////////////////////////////////////////////////////////////////////////////////////////// -template -prefix_ senf::scheduler::TimerEventProxy::TimerEventProxy() - : timer("TimerEventProxy", senf::membind(&TimerEventProxy::timerEvent, this), 0, false), - entrySetById(entrySet.template get ()), - entrySetByTimeout(entrySet.template get ()) +template +prefix_ senf::scheduler::TimerEventProxy::TimerEventProxy(std::string const & description) + : entrySetById( entrySet.template get()), + entrySetByTimeout( entrySet.template get ()), + timer( "TimerEventProxy " + description, + membind(&TimerEventProxy::timerEvent, this), ClockService::clock_type(0), false) { } -template -prefix_ senf::scheduler::TimerEventProxy::TimerEventProxy( std::string const & name, - senf::console::DirectoryNode & node) - : timer("TimerEventProxy", senf::membind(&TimerEventProxy::timerEvent, this), 0, false), - entrySetById(entrySet.template get ()), - entrySetByTimeout(entrySet.template get ()) +template +prefix_ void senf::scheduler::TimerEventProxy::timerEvent() { - node.add(name, senf::console::factory::Command( - &TimerEventProxy::list, this) .doc("List active Timers")); -} - -template -prefix_ void senf::scheduler::TimerEventProxy::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) { + 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.cb(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 +template prefix_ void senf::scheduler::TimerEventProxy::add( - senf::ClockService::clock_type timeout, IdType const & id, Callback cb) + 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 +template prefix_ bool senf::scheduler::TimerEventProxy::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 +template +prefix_ senf::ClockService::clock_type senf::scheduler::TimerEventProxy::timeout(IdType const & id) + const +{ + typename EntrySetById_t::const_iterator i ( entrySetById.find( id)); + return i == entrySetById.end() ? ClockService::clock_type(0) : i->timeout; +} + + +template prefix_ std::vector > senf::scheduler::TimerEventProxy::list() + const { - std::vector > tmp; + std::vector > 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( it->timeout, it->id)); + tmp.push_back(std::make_pair( it->timeout, it->id)); } - return tmp; } +template +prefix_ unsigned senf::scheduler::TimerEventProxy::numEvents() + const +{ + return entrySetByTimeout.size(); +} + +template +prefix_ void senf::scheduler::TimerEventProxy::clear() +{ + entrySetByTimeout.clear(); +} + +//-///////////////////////////////////////////////////////////////////////////////////////////////// #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: + +