Missing changes from last commit

[senf.git] / Scheduler / ClockService.cci

diff --git a/Scheduler/ClockService.cci b/Scheduler/ClockService.cci
index 117e475..f536931 100644 (file)
--- a/Scheduler/ClockService.cci
+++ b/Scheduler/ClockService.cci
@@ -1,8 +1,8 @@
 // $Id$
 //
-// Copyright (C) 2007 
-// Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS)
-// Kompetenzzentrum fuer Satelitenkommunikation (SatCom)
+// Copyright (C) 2007
+// Fraunhofer Institute for Open Communication Systems (FOKUS)
+// Competence Center NETwork research (NET), St. Augustin, GERMANY
 //     Stefan Bund <g0dil@berlios.de>
 //
 // This program is free software; you can redistribute it and/or modify
@@ -24,7 +24,7 @@
     \brief ClockService inline non-template implementation */
 
 // Custom includes
-#include "boost/date_time/posix_time/posix_time_types.hpp"
+#include <boost/date_time/posix_time/posix_time_types.hpp>
 
 #define prefix_ inline
 ///////////////////////////////cci.p///////////////////////////////////////
@@ -47,41 +47,86 @@ prefix_ senf::ClockService::clock_type senf::ClockService::clock(abstime_type ti
     return instance().clock_m(time);
 }
 
-prefix_ senf::ClockService::clock_type senf::ClockService::nanoseconds(clock_type v)
+prefix_ senf::ClockService::clock_type senf::ClockService::from_time_t(time_t const & time)
+{
+    return clock( boost::posix_time::from_time_t(time) );
+}
+
+prefix_ senf::ClockService::clock_type senf::ClockService::from_timeval(timeval const & time)
+{
+    return from_time_t(time.tv_sec) + ClockService::microseconds(time.tv_usec);
+}
+
+prefix_ senf::ClockService::clock_type senf::ClockService::nanoseconds(int64_type v)
 {
     return v;
 }
 
-prefix_ senf::ClockService::clock_type senf::ClockService::microseconds(clock_type v)
+prefix_ senf::ClockService::clock_type senf::ClockService::microseconds(int64_type v)
 {
     return v * nanoseconds(1000);
 }
 
-prefix_ senf::ClockService::clock_type senf::ClockService::milliseconds(clock_type v)
+prefix_ senf::ClockService::clock_type senf::ClockService::milliseconds(int64_type v)
 {
     return v * microseconds(1000);
 }
 
-prefix_ senf::ClockService::clock_type senf::ClockService::seconds(clock_type v)
+prefix_ senf::ClockService::clock_type senf::ClockService::seconds(int64_type v)
 {
     return v * milliseconds(1000);
 }
 
-prefix_ senf::ClockService::clock_type senf::ClockService::minutes(clock_type v)
+prefix_ senf::ClockService::clock_type senf::ClockService::minutes(int64_type v)
 {
     return v * seconds(60);
 }
 
-prefix_ senf::ClockService::clock_type senf::ClockService::hours(clock_type v)
+prefix_ senf::ClockService::clock_type senf::ClockService::hours(int64_type v)
 {
     return v * minutes(60);
 }
 
-prefix_ senf::ClockService::clock_type senf::ClockService::days(clock_type v)
+prefix_ senf::ClockService::clock_type senf::ClockService::days(int64_type v)
 {
     return v * hours(24);
 }
 
+prefix_ senf::ClockService::clock_type senf::ClockService::in_nanoseconds(int64_type v)
+{
+    return v;
+}
+
+prefix_ senf::ClockService::clock_type senf::ClockService::in_microseconds(int64_type v)
+{
+    return v / nanoseconds(1000);
+}
+
+prefix_ senf::ClockService::clock_type senf::ClockService::in_milliseconds(int64_type v)
+{
+    return v / microseconds(1000);
+}
+
+prefix_ senf::ClockService::clock_type senf::ClockService::in_seconds(int64_type v)
+{
+    return v / milliseconds(1000);
+}
+
+prefix_ senf::ClockService::clock_type senf::ClockService::in_minutes(int64_type v)
+{
+    return v / seconds(60);
+}
+
+prefix_ senf::ClockService::clock_type senf::ClockService::in_hours(int64_type v)
+{
+    return v / minutes(60);
+}
+
+prefix_ senf::ClockService::clock_type senf::ClockService::in_days(int64_type v)
+{
+    return v / hours(24);
+}
+
 prefix_ void senf::ClockService::restart()
 {
     instance().restart_m();
@@ -118,6 +163,13 @@ prefix_ senf::ClockService::abstime_type senf::ClockService::abstime_m(clock_typ
 
 prefix_ senf::ClockService::clock_type senf::ClockService::clock_m(abstime_type time)
 {
+    ///\fixme What happens, if base_ is changed in SIGALRM while reading it here ?
+
+    // Idea: Have *two* base values: one is written by the SIGALRM handler, the other is only
+    // Written by synchronous code. If they differ, we block signals, copy over and continue.  If
+    // they transiently differ because we are reading the SIGALRM value while it is being changed
+    // this does not matter: We will then still copy it over.
+
     boost::posix_time::time_duration delta (time - base_);
     return clock_type( delta.ticks() )
         * clock_type( 1000000000UL / boost::posix_time::time_duration::ticks_per_second() );