X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FScheduler%2FTimerEventProxy.hh;h=75c4f8cebb283424998c6a4d120f45c36f1af92d;hb=ff4249b4a9c23236b2e56dcd593c91a5c58f7b75;hp=cea7f03b0b768ab118beac28859c2181620a22b4;hpb=0fa85877856e23116f8ee0dd0103ee7078282cdb;p=senf.git diff --git a/senf/Scheduler/TimerEventProxy.hh b/senf/Scheduler/TimerEventProxy.hh index cea7f03..75c4f8c 100644 --- a/senf/Scheduler/TimerEventProxy.hh +++ b/senf/Scheduler/TimerEventProxy.hh @@ -27,12 +27,7 @@ #ifndef HH_SENF_Scheduler_TimerEventProxy_ #define HH_SENF_Scheduler_TimerEventProxy_ 1 -#ifdef SENF_DEBUG -# define BOOST_MULTI_INDEX_ENABLE_INVARIANT_CHECKING -# define BOOST_MULTI_INDEX_ENABLE_SAFE_MODE -#endif - -#include +// Custom includes #include #include #include @@ -41,6 +36,7 @@ #include #include +///////////////////////////////hh.p//////////////////////////////////////// namespace senf { namespace scheduler { @@ -54,59 +50,53 @@ namespace scheduler { host a big count of timers. */ template - class TimerEventProxy + class TimerEventProxy { public: - /////////////////////////////////////////////////////////////////////////// - // Types - typedef boost::function Callback; - - TimerEventProxy(); - ///< Instantiate a TimerEventProxy - - TimerEventProxy(std::string const & name, senf::console::DirectoryNode & node); - ///< Instantiate a TimerEventProxy and add the list command to the give DirectoryNode - - void add(senf::ClockService::clock_type timeout, IdType const &id, Callback cb); - ///< Add new deadline timer - bool remove(IdType const & id); - ///< Remove timer by given \a id. - std::vector > list(); - ///< Returns a vector of all active timers with timeout and id. - + typedef boost::function Callback; + + TimerEventProxy(std::string const & description = ""); + ///< Instantiate a TimerEventProxy + /**< \param[in] description Descriptive name (purely informational) */ + + void add(ClockService::clock_type timeout, IdType const & id, Callback cb); + ///< Add new deadline timer + + bool remove(IdType const & id); ///< Remove timer by given \a id. + + std::vector > list() const; + ///< Returns a vector of all active timers with timeout and id. + + ClockService::clock_type timeout(IdType const & id) const; + ///< Returns timeout for given id + /**< if no timer for this id is registered \a 0 is returned. */ private: #ifndef DOXYGEN struct Entry { - senf::ClockService::clock_type timeout; + ClockService::clock_type timeout; IdType id; Callback cb; - Entry(senf::ClockService::clock_type _timeout, IdType _id, Callback _cb) + Entry(ClockService::clock_type _timeout, IdType _id, Callback _cb) : timeout(_timeout), id(_id), cb(_cb) { } }; - - senf::scheduler::TimerEvent timer; - - // - // data structure to hold active timers - // struct Timeout {}; struct Id {}; #endif + // data structure to hold active timers typedef boost::multi_index_container< Entry, boost::multi_index::indexed_by< boost::multi_index::ordered_non_unique< boost::multi_index::tag, - boost::multi_index::member + boost::multi_index::member >, boost::multi_index::ordered_unique< boost::multi_index::tag, - boost::multi_index::member + boost::multi_index::member > > > EntrySet_t; - typedef typename EntrySet_t::template index::type EntrySetByTimeout_t; typedef typename EntrySet_t::template index::type EntrySetById_t; @@ -114,12 +104,26 @@ namespace scheduler { EntrySetById_t & entrySetById; EntrySetByTimeout_t & entrySetByTimeout; - // callback for the Scheduler timer event - void timerEvent(); + scheduler::TimerEvent timer; + + void timerEvent(); // callback for the Scheduler timer event }; -} -} -#include "TimerEventProxy.ct" +}} +///////////////////////////////hh.e//////////////////////////////////////// +//#include "TimerEventProxy.cci" +#include "TimerEventProxy.ct" +//#include "TimerEventProxy.cti" #endif + + +// Local Variables: +// mode: c++ +// fill-column: 100 +// comment-column: 40 +// c-file-style: "senf" +// indent-tabs-mode: nil +// ispell-local-dictionary: "american" +// compile-command: "scons -u test" +// End: