fixes for ClockService::clock_type -> RestrictedInt change introduced by last commit

[senf.git] / senf / Scheduler / ClockService.cci

diff --git a/senf/Scheduler/ClockService.cci b/senf/Scheduler/ClockService.cci
index bf27401..e0a7b95 100644 (file)
--- a/senf/Scheduler/ClockService.cci
+++ b/senf/Scheduler/ClockService.cci
@@ -32,11 +32,16 @@
 #include <time.h>
 #include <boost/date_time/posix_time/posix_time_types.hpp>
 #include <senf/Utils/Exception.hh>
-#include <senf/Utils/ClockTypeMacros.hh>
 
 #define prefix_ inline
 //-/////////////////////////////////////////////////////////////////////////////////////////////////
 
+#ifdef SENF_DEBUG
+#   define SENF_CLOCKTYPEVAL(clock) (clock).value()
+#else
+#   define SENF_CLOCKTYPEVAL(clock) (clock)
+#endif
+
 //-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::ClockService
 
@@ -45,7 +50,7 @@ prefix_ senf::ClockService::clock_type senf::ClockService::now()
     struct timespec spec;
     if (clock_gettime(CLOCK_MONOTONIC, &spec) < 0)
         SENF_THROW_SYSTEM_EXCEPTION("clock_gettime()");
-    return SENF_INT2CLOCKTYPE(spec.tv_sec * 1000000000LL + spec.tv_nsec);
+    return clock_type(spec.tv_sec * 1000000000LL + spec.tv_nsec);
 }
 
 //-/////////////////////////////////////////////////////////////////////////////////////////////////
@@ -69,9 +74,11 @@ prefix_ senf::ClockService::abstime_type senf::ClockService::abstime_m(clock_typ
     if (scheduler::now() - baseClock_ > clock_type(1000000000ll))
         restart_m();
 #ifdef BOOST_DATE_TIME_POSIX_TIME_STD_CONFIG
-    return baseAbstime_ + boost::posix_time::nanoseconds(clock-baseClock_);
+    return baseAbstime_ + boost::posix_time::nanoseconds(
+            SENF_CLOCKTYPEVAL( clock-baseClock_));
 #else
-    return baseAbstime_ + boost::posix_time::microseconds((clock.value() - baseClock_.value() + 500 )/1000);
+    return baseAbstime_ + boost::posix_time::microseconds(
+            SENF_CLOCKTYPEVAL( (clock-baseClock_+clock_type(500))/1000));
 #endif
 }
 
@@ -96,9 +103,11 @@ prefix_ senf::ClockService::abstime_type senf::ClockService::abstime(clock_type
 prefix_ senf::ClockService::reltime_type senf::ClockService::reltime(clock_type clock)
 {
 #ifdef BOOST_DATE_TIME_POSIX_TIME_STD_CONFIG
-    return boost::posix_time::nanoseconds(clock);
+    return boost::posix_time::nanoseconds(
+            SENF_CLOCKTYPEVAL( clock));
 #else
-    return  boost::posix_time::microseconds((clock.value() + 500)/1000);
+    return  boost::posix_time::microseconds(
+            SENF_CLOCKTYPEVAL( (clock + clock_type(500))/1000));
 #endif
 }
 
@@ -114,72 +123,72 @@ prefix_ senf::ClockService::clock_type senf::ClockService::from_time_t(time_t co
 
 prefix_ senf::ClockService::clock_type senf::ClockService::nanoseconds(int64_type v)
 {
-    return SENF_INT2CLOCKTYPE(v);
+    return clock_type(v);
 }
 
 prefix_ senf::ClockService::clock_type senf::ClockService::microseconds(int64_type v)
 {
-    return SENF_INT2CLOCKTYPE(v * SENF_CLOCKTYPEVAL(nanoseconds(1000)));
+    return v * nanoseconds(1000);
 }
 
 prefix_ senf::ClockService::clock_type senf::ClockService::milliseconds(int64_type v)
 {
-    return SENF_INT2CLOCKTYPE(v * SENF_CLOCKTYPEVAL(microseconds(1000)));
+    return v * microseconds(1000);
 }
 
 prefix_ senf::ClockService::clock_type senf::ClockService::seconds(int64_type v)
 {
-    return SENF_INT2CLOCKTYPE(v * SENF_CLOCKTYPEVAL(milliseconds(1000)));
+    return v * milliseconds(1000);
 }
 
 prefix_ senf::ClockService::clock_type senf::ClockService::minutes(int64_type v)
 {
-    return SENF_INT2CLOCKTYPE(v * SENF_CLOCKTYPEVAL(seconds(60)));
+    return v * seconds(60);
 }
 
 prefix_ senf::ClockService::clock_type senf::ClockService::hours(int64_type v)
 {
-    return SENF_INT2CLOCKTYPE(v * SENF_CLOCKTYPEVAL(minutes(60)));
+    return v * minutes(60);
 }
 
 prefix_ senf::ClockService::clock_type senf::ClockService::days(int64_type v)
 {
-    return SENF_INT2CLOCKTYPE(v * SENF_CLOCKTYPEVAL(hours(24)));
+    return v * hours(24);
 }
 
 prefix_ senf::ClockService::int64_type senf::ClockService::in_nanoseconds(clock_type v)
 {
-    return SENF_CLOCKTYPEVAL(v);
+    return SENF_CLOCKTYPEVAL( v);
 }
 
 prefix_ senf::ClockService::int64_type senf::ClockService::in_microseconds(clock_type v)
 {
-    return (SENF_CLOCKTYPEVAL(v) / SENF_CLOCKTYPEVAL(nanoseconds(1000)));
+    return SENF_CLOCKTYPEVAL( v / nanoseconds(1000));
 }
 
 prefix_ senf::ClockService::int64_type senf::ClockService::in_milliseconds(clock_type v)
 {
-    return (SENF_CLOCKTYPEVAL(v) / SENF_CLOCKTYPEVAL(microseconds(1000)));
+    return SENF_CLOCKTYPEVAL( v / microseconds(1000));
 }
 
 prefix_ senf::ClockService::int64_type senf::ClockService::in_seconds(clock_type v)
 {
-    return (SENF_CLOCKTYPEVAL(v) / SENF_CLOCKTYPEVAL(milliseconds(1000)));
+    return SENF_CLOCKTYPEVAL( v / milliseconds(1000));
 }
 
 prefix_ senf::ClockService::int64_type senf::ClockService::in_minutes(clock_type v)
 {
-    return (SENF_CLOCKTYPEVAL(v) / SENF_CLOCKTYPEVAL(seconds(60)));
+    return SENF_CLOCKTYPEVAL( v / seconds(60));
 }
 
 prefix_ senf::ClockService::int64_type senf::ClockService::in_hours(clock_type v)
 {
-    return (SENF_CLOCKTYPEVAL(v) / SENF_CLOCKTYPEVAL(minutes(60))) ;
+    return SENF_CLOCKTYPEVAL( v / minutes(60));
 }
 
 prefix_ senf::ClockService::int64_type senf::ClockService::in_days(clock_type v)
 {
-    return (SENF_CLOCKTYPEVAL(v) / SENF_CLOCKTYPEVAL(hours(24))) ;
+    return SENF_CLOCKTYPEVAL( v / hours(24));
 }
 
 prefix_ senf::ClockService::clock_type senf::ClockService::from_timeval(timeval const & time)
@@ -192,6 +201,8 @@ prefix_ void senf::ClockService::restart()
     instance().restart_m();
 }
 
+#undef SENF_CLOCKTYPEVAL
+
 //-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_