X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Fltt%2Ftime.h;h=a151505cbf2c12418adb441303d78c4d5efd947a;hb=51b5991eead370ec64ad5336d1e6126ba6b2cc10;hp=d961f3738ac0eb110c5248722edc07061c7358b0;hpb=0c5dbe3b7a45055b7ed07cd497b51801b3e8310e;p=lttv.git

diff --git a/ltt/branches/poly/ltt/time.h b/ltt/branches/poly/ltt/time.h
index d961f373..a151505c 100644
--- a/ltt/branches/poly/ltt/time.h
+++ b/ltt/branches/poly/ltt/time.h
@@ -28,13 +28,13 @@ typedef struct _LttTime {
 } LttTime;
 
 
-static const unsigned long NANOSECONDS_PER_SECOND = 1000000000;
+#define NANOSECONDS_PER_SECOND 1000000000
 
-static const LttTime ltt_time_zero = { 0, 0};
+static const LttTime ltt_time_zero = { 0, 0 };
 
 static const LttTime ltt_time_one = { 0, 1 };
 
-static const LttTime ltt_time_infinite = { G_MAXUINT, G_MAXUINT };
+static const LttTime ltt_time_infinite = { G_MAXUINT, NANOSECONDS_PER_SECOND };
 
 static inline LttTime ltt_time_sub(LttTime t1, LttTime t2) 
 {
@@ -64,43 +64,6 @@ static inline LttTime ltt_time_add(LttTime t1, LttTime t2)
 }
 
 
-static inline LttTime ltt_time_mul(LttTime t1, float f)
-{
-  LttTime res;
-  float d;
-  double sec;
-
-  if(f == 0.0){
-    res.tv_sec = 0;
-    res.tv_nsec = 0;
-  }else{
-    d = 1.0/f;
-    sec = t1.tv_sec / (double)d;
-    res.tv_sec = sec;
-    res.tv_nsec = t1.tv_nsec / (double)d + (sec - res.tv_sec) *
-                  NANOSECONDS_PER_SECOND;
-    res.tv_sec += res.tv_nsec / NANOSECONDS_PER_SECOND;
-    res.tv_nsec %= NANOSECONDS_PER_SECOND;
-  }
-  return res;
-}
-
-
-static inline LttTime ltt_time_div(LttTime t1, float f)
-{
-  double sec;
-  LttTime res;
-
-  sec = t1.tv_sec / (double)f;
-  res.tv_sec = sec;
-  res.tv_nsec = t1.tv_nsec / (double)f + (sec - res.tv_sec) *
-      NANOSECONDS_PER_SECOND;
-  res.tv_sec += res.tv_nsec / NANOSECONDS_PER_SECOND;
-  res.tv_nsec %= NANOSECONDS_PER_SECOND;
-  return res;
-}
-
-
 static inline int ltt_time_compare(LttTime t1, LttTime t2)
 {
   if(t1.tv_sec > t2.tv_sec) return 1;
@@ -110,6 +73,9 @@ static inline int ltt_time_compare(LttTime t1, LttTime t2)
   return 0;
 }
 
+#define LTT_TIME_MIN(a,b) ((ltt_time_compare((a),(b)) < 0) ? (a) : (b))
+#define LTT_TIME_MAX(a,b) ((ltt_time_compare((a),(b)) > 0) ? (a) : (b))
+
 #define MAX_TV_SEC_TO_DOUBLE 0x7FFFFF
 static inline double ltt_time_to_double(LttTime t1)
 {
@@ -147,4 +113,70 @@ static inline LttTime ltt_time_from_double(double t1)
   return res;
 }
 
+/* Use ltt_time_to_double and ltt_time_from_double to check for lack
+ * of precision.
+ */
+static inline LttTime ltt_time_mul(LttTime t1, double d)
+{
+  LttTime res;
+
+  double time_double = ltt_time_to_double(t1);
+
+  time_double = time_double * d;
+
+  res = ltt_time_from_double(time_double);
+
+  return res;
+
+#if 0
+  /* What is that ? (Mathieu) */
+  if(f == 0.0){
+    res.tv_sec = 0;
+    res.tv_nsec = 0;
+  }else{
+  double d;
+    d = 1.0/f;
+    sec = t1.tv_sec / (double)d;
+    res.tv_sec = sec;
+    res.tv_nsec = t1.tv_nsec / (double)d + (sec - res.tv_sec) *
+                  NANOSECONDS_PER_SECOND;
+    res.tv_sec += res.tv_nsec / NANOSECONDS_PER_SECOND;
+    res.tv_nsec %= NANOSECONDS_PER_SECOND;
+  }
+  return res;
+#endif //0
+}
+
+
+/* Use ltt_time_to_double and ltt_time_from_double to check for lack
+ * of precision.
+ */
+static inline LttTime ltt_time_div(LttTime t1, double d)
+{
+  LttTime res;
+
+  double time_double = ltt_time_to_double(t1);
+
+  time_double = time_double / d;
+
+  res = ltt_time_from_double(time_double);
+
+  return res;
+
+
+#if 0
+  double sec;
+  LttTime res;
+
+  sec = t1.tv_sec / (double)f;
+  res.tv_sec = sec;
+  res.tv_nsec = t1.tv_nsec / (double)f + (sec - res.tv_sec) *
+      NANOSECONDS_PER_SECOND;
+  res.tv_sec += res.tv_nsec / NANOSECONDS_PER_SECOND;
+  res.tv_nsec %= NANOSECONDS_PER_SECOND;
+  return res;
+#endif //0
+}
+
+
 #endif // LTT_TIME_H