accelerate double useage for time

[lttv.git] / ltt / branches / poly / ltt / time.h

diff --git a/ltt/branches/poly/ltt/time.h b/ltt/branches/poly/ltt/time.h
index e350cc998e8ae08ad5ac9527ddd670f971aaee37..642328e9001d9ac0c5ad08e5a98e4a16748e432d 100644 (file)
--- a/ltt/branches/poly/ltt/time.h
+++ b/ltt/branches/poly/ltt/time.h
@@ -40,12 +40,10 @@ static inline LttTime ltt_time_sub(LttTime t1, LttTime t2)
 {
   LttTime res;
   res.tv_sec  = t1.tv_sec  - t2.tv_sec;
+  res.tv_nsec = t1.tv_nsec - t2.tv_nsec;
   if(t1.tv_nsec < t2.tv_nsec) {
     res.tv_sec--;
-    res.tv_nsec = NANOSECONDS_PER_SECOND + t1.tv_nsec - t2.tv_nsec;
-  }
-  else {
-    res.tv_nsec = t1.tv_nsec - t2.tv_nsec;
+    res.tv_nsec += NANOSECONDS_PER_SECOND;
   }
   return res;
 }
@@ -54,8 +52,8 @@ static inline LttTime ltt_time_sub(LttTime t1, LttTime t2)
 static inline LttTime ltt_time_add(LttTime t1, LttTime t2) 
 {
   LttTime res;
-  res.tv_sec  = t1.tv_sec  + t2.tv_sec;
   res.tv_nsec = t1.tv_nsec + t2.tv_nsec;
+  res.tv_sec = t1.tv_sec + t2.tv_sec;
   if(res.tv_nsec >= NANOSECONDS_PER_SECOND) {
     res.tv_sec++;
     res.tv_nsec -= NANOSECONDS_PER_SECOND;
@@ -87,10 +85,12 @@ static inline double ltt_time_to_double(LttTime t1)
    *
    * So we have 53-30 = 23 bits left for tv_sec.
    * */
+#ifdef EXTRA_CHECK
   g_assert(t1.tv_sec <= MAX_TV_SEC_TO_DOUBLE);
   if(t1.tv_sec > MAX_TV_SEC_TO_DOUBLE)
     g_warning("Precision loss in conversion LttTime to double");
-  return (double)t1.tv_sec + (double)t1.tv_nsec / NANOSECONDS_PER_SECOND;
+#endif //EXTRA_CHECK
+  return ((double)t1.tv_sec * NANOSECONDS_PER_SECOND) + (double)t1.tv_nsec;
 }
 
 
@@ -104,12 +104,14 @@ static inline LttTime ltt_time_from_double(double t1)
    *
    * So we have 53-30 = 23 bits left for tv_sec.
    * */
+#ifdef EXTRA_CHECK
   g_assert(t1 <= MAX_TV_SEC_TO_DOUBLE);
   if(t1 > MAX_TV_SEC_TO_DOUBLE)
     g_warning("Conversion from non precise double to LttTime");
+#endif //EXTRA_CHECK
   LttTime res;
-  res.tv_sec = t1;
-  res.tv_nsec = (t1 - res.tv_sec) * NANOSECONDS_PER_SECOND;
+  res.tv_sec = t1/(double)NANOSECONDS_PER_SECOND;
+  res.tv_nsec = (t1 - (res.tv_sec*NANOSECONDS_PER_SECOND));
   return res;
 }
 
@@ -190,9 +192,11 @@ static inline LttTime ltt_time_from_uint64(guint64 t1)
 {
   /* We lose precision if tv_sec is > than (2^62)-1
    * */
+#ifdef EXTRA_CHECK
   g_assert(t1 <= MAX_TV_SEC_TO_UINT64);
   if(t1 > MAX_TV_SEC_TO_UINT64)
     g_warning("Conversion from non precise uint64 to LttTime");
+#endif //EXTRA_CHECK
   LttTime res;
   res.tv_sec = t1/NANOSECONDS_PER_SECOND;
   res.tv_nsec = (t1 - res.tv_sec*NANOSECONDS_PER_SECOND);