X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Fltt%2Ftime.h;h=14c15d1d237c1d7d184033636750a510a63e8e16;hb=0526b61f03dbbac0164f9f4e21fd531a1d048119;hp=fe7641dfbbf49fdcc871e37ac3d55e1994a36b40;hpb=1d1df11d0582bef07ef2b33e8e82a75b08f32be4;p=lttv.git

diff --git a/ltt/branches/poly/ltt/time.h b/ltt/branches/poly/ltt/time.h
index fe7641df..14c15d1d 100644
--- a/ltt/branches/poly/ltt/time.h
+++ b/ltt/branches/poly/ltt/time.h
@@ -1,5 +1,6 @@
 /* This file is part of the Linux Trace Toolkit trace reading library
  * Copyright (C) 2003-2004 Michel Dagenais
+ *               2005 Mathieu Desnoyers
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -21,6 +22,7 @@
 
 #include <glib.h>
 #include <ltt/compiler.h>
+#include <math.h>
 
 typedef struct _LttTime {
   unsigned long tv_sec;
@@ -29,7 +31,21 @@ typedef struct _LttTime {
 
 
 #define NANOSECONDS_PER_SECOND 1000000000
-#define SHIFT_CONST 1.07374182400631629848
+
+/* 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_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
+
 
 static const LttTime ltt_time_zero = { 0, 0 };
 
@@ -101,7 +117,9 @@ static inline double ltt_time_to_double(LttTime t1)
   if(t1.tv_sec > MAX_TV_SEC_TO_DOUBLE)
     g_warning("Precision loss in conversion LttTime to double");
 #endif //EXTRA_CHECK
-  return ((double)t1.tv_sec * (double)NANOSECONDS_PER_SECOND) + (double)t1.tv_nsec;
+  return ((double)((guint64)t1.tv_sec<<DOUBLE_SHIFT)
+                  * (double)DOUBLE_SHIFT_CONST_MUL)
+                  + (double)t1.tv_nsec;
 }
 
 
@@ -122,8 +140,9 @@ 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 * SHIFT_CONST) >> 30;
-  res.tv_nsec = (t1 - (res.tv_sec*NANOSECONDS_PER_SECOND));
+  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;
 }
 
@@ -192,14 +211,19 @@ static inline LttTime ltt_time_div(LttTime t1, double d)
 #endif //0
 }
 
+
 static inline guint64 ltt_time_to_uint64(LttTime t1)
 {
-  return (guint64)t1.tv_sec*NANOSECONDS_PER_SECOND
-            + (guint64)t1.tv_nsec;
+  return (((guint64)t1.tv_sec*LTT_TIME_UINT_SHIFT_CONST) << LTT_TIME_UINT_SHIFT)
+                       + (guint64)t1.tv_nsec;
 }
 
 
 #define MAX_TV_SEC_TO_UINT64 0x3FFFFFFFFFFFFFFFULL
+
+/* The likely branch is with sec != 0, because most events in a bloc
+ * will be over 1s from the block start. (see tracefile.c)
+ */
 static inline LttTime ltt_time_from_uint64(guint64 t1)
 {
   /* We lose precision if tv_sec is > than (2^62)-1
@@ -207,11 +231,19 @@ static inline LttTime ltt_time_from_uint64(guint64 t1)
 #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");
+    g_warning("Conversion from uint64 to non precise LttTime");
 #endif //EXTRA_CHECK
   LttTime res;
-  res.tv_sec = t1/NANOSECONDS_PER_SECOND;
-  res.tv_nsec = (t1 - res.tv_sec*NANOSECONDS_PER_SECOND);
+  //if(unlikely(t1 >= NANOSECONDS_PER_SECOND)) {
+  if(likely(t1>>LTT_TIME_UINT_SHIFT >= LTT_TIME_UINT_SHIFT_CONST)) {
+    //res.tv_sec = t1/NANOSECONDS_PER_SECOND;
+    res.tv_sec = (t1>>LTT_TIME_UINT_SHIFT)
+                         /LTT_TIME_UINT_SHIFT_CONST; // acceleration
+    res.tv_nsec = (t1 - res.tv_sec*NANOSECONDS_PER_SECOND);
+  } else {
+    res.tv_sec = 0;
+    res.tv_nsec = (guint32)t1;
+  }
   return res;
 }