X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Fltt%2Ftime.h;h=d826e4ac93d54b5cdb5d4d71e6101a6462b6174b;hb=c4afd5d8cb744919d71f3a44b4743060905d28dc;hp=6ab53fcac3039310e11dae5c4593c91dee4be5f9;hpb=57df94dd8dd13258d6a5a83406f2f76a045a7cc3;p=lttv.git

diff --git a/ltt/branches/poly/ltt/time.h b/ltt/branches/poly/ltt/time.h
index 6ab53fca..d826e4ac 100644
--- a/ltt/branches/poly/ltt/time.h
+++ b/ltt/branches/poly/ltt/time.h
@@ -21,6 +21,7 @@
 
 #include <glib.h>
 #include <ltt/compiler.h>
+#include <math.h>
 
 typedef struct _LttTime {
   unsigned long tv_sec;
@@ -29,10 +30,17 @@ typedef struct _LttTime {
 
 
 #define NANOSECONDS_PER_SECOND 1000000000
+
+/* We give the DIV and MUL constants so we can always multiply, for a
+ * division as well as a multiplication of NANOSECONDS_PER_SECOND */
 /* 2^30/1.07374182400631629848 = 1000000000.0 */ 
-#define DOUBLE_SHIFT_CONST 1.07374182400631629848
+#define DOUBLE_SHIFT_CONST_DIV 1.07374182400631629848
 #define DOUBLE_SHIFT 30
 
+/* 2^30*0.93132257461547851562 = 1000000000.0000000000 */ 
+#define DOUBLE_SHIFT_CONST_MUL 0.93132257461547851562
+
+
 /* 1953125 * 2^9 = NANOSECONDS_PER_SECOND */
 #define LTT_TIME_UINT_SHIFT_CONST 1953125
 #define LTT_TIME_UINT_SHIFT 9
@@ -109,7 +117,7 @@ static inline double ltt_time_to_double(LttTime t1)
     g_warning("Precision loss in conversion LttTime to double");
 #endif //EXTRA_CHECK
   return ((double)((guint64)t1.tv_sec<<DOUBLE_SHIFT)
-                  / (double)DOUBLE_SHIFT_CONST)
+                  * (double)DOUBLE_SHIFT_CONST_MUL)
                   + (double)t1.tv_nsec;
 }
 
@@ -131,7 +139,7 @@ static inline LttTime ltt_time_from_double(double t1)
 #endif //EXTRA_CHECK
   LttTime res;
   //res.tv_sec = t1/(double)NANOSECONDS_PER_SECOND;
-  res.tv_sec = (guint64)(t1 * DOUBLE_SHIFT_CONST) >> DOUBLE_SHIFT;
+  res.tv_sec = (guint64)(t1 * DOUBLE_SHIFT_CONST_DIV) >> DOUBLE_SHIFT;
   res.tv_nsec = (t1 - (((guint64)res.tv_sec<<LTT_TIME_UINT_SHIFT))
                                * LTT_TIME_UINT_SHIFT_CONST);
   return res;
@@ -205,7 +213,7 @@ static inline LttTime ltt_time_div(LttTime t1, double d)
 
 static inline guint64 ltt_time_to_uint64(LttTime t1)
 {
-  return (guint64)((t1.tv_sec*LTT_TIME_UINT_SHIFT_CONST) >> LTT_TIME_UINT_SHIFT)
+  return (((guint64)t1.tv_sec*LTT_TIME_UINT_SHIFT_CONST) << LTT_TIME_UINT_SHIFT)
                        + (guint64)t1.tv_nsec;
 }