X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Scheduler%2FScheduler.hh;h=babc1997e4883d56c9c89d6fee7359649b84a9c8;hb=82ad2ed94c12c3e53097fef92978de8c28239fab;hp=3f6550cf580aad2f8b123131c5659201c3401b4e;hpb=3d16600678b948ff3bd0e4fd2a1a800fcc629a03;p=senf.git

diff --git a/Scheduler/Scheduler.hh b/Scheduler/Scheduler.hh
index 3f6550c..babc199 100644
--- a/Scheduler/Scheduler.hh
+++ b/Scheduler/Scheduler.hh
@@ -35,6 +35,7 @@
 #include <boost/call_traits.hpp>
 #include <boost/integer.hpp>
 #include "ClockService.hh"
+#include "../Utils/Logger/Target.hh"
 
 //#include "scheduler.mpp"
 ///////////////////////////////hh.p////////////////////////////////////////
@@ -151,9 +152,7 @@ namespace senf {
                                         ///< Add timeout event
                                         /**< \param[in] timeout timeout in nanoseconds
                                              \param[in] cb callback to call after \a timeout
-                                                 milliseconds
-                                             \todo Return some kind of handle/pointer and add
-                                                 support to update or revoke a timeout */
+                                                 milliseconds */
 
         void cancelTimeout(unsigned id);
 
@@ -175,8 +174,6 @@ namespace senf {
     private:
         typedef boost::function<void (EventId)> SimpleCallback;
 
-        static unsigned const MinTimeout = 1000;
-
         Scheduler();
 
         void do_add(int fd, SimpleCallback const & cb, int eventMask = EV_ALL);
@@ -211,7 +208,7 @@ namespace senf {
         };
 
         typedef std::map<int,EventSpec> FdTable;
-        typedef std::map<unsigned,TimerSpec> TimerMap;
+        typedef std::map<unsigned,TimerSpec> TimerMap; // sorted by id
 
         struct TimerSpecCompare
         {
@@ -223,7 +220,7 @@ namespace senf {
         };
 
         typedef std::priority_queue<TimerMap::iterator, std::vector<TimerMap::iterator>, 
-                                    TimerSpecCompare> TimerQueue;
+                                    TimerSpecCompare> TimerQueue; // sorted by time
 
         FdTable fdTable_;
         unsigned timerIdCounter_;
@@ -243,6 +240,17 @@ namespace senf {
      */
     int retrieve_filehandle(int fd);
 
+    /** \brief Scheduler specific time source for Utils/Logger framework
+
+        This time source may be used to provide timing information for log messages within the
+        Utils/Logger framework. This time source will use Scheduler::eventTime() to provide timing
+        information.
+     */
+    struct SchedulerLogTimeSource : public senf::log::TimeSource
+    {
+        boost::posix_time::ptime operator()() const;
+    };
+
 }
 
 ///////////////////////////////hh.e////////////////////////////////////////