keep current process : y position shorter to find

[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 a151505cbf2c12418adb441303d78c4d5efd947a..83c2fb6cd68f8c59e47e3a8adb1b684f4aa5b040 100644 (file)
--- a/ltt/branches/poly/ltt/time.h
+++ b/ltt/branches/poly/ltt/time.h
@@ -29,6 +29,7 @@ typedef struct _LttTime {
 
 
 #define NANOSECONDS_PER_SECOND 1000000000
+#define SHIFT_CONST 1.07374182400631629848
 
 static const LttTime ltt_time_zero = { 0, 0 };
 
@@ -40,12 +41,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 +53,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 +86,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 * (double)NANOSECONDS_PER_SECOND) + (double)t1.tv_nsec;
 }
 
 
@@ -104,12 +105,15 @@ 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_sec = (guint64)(t1 * SHIFT_CONST) >> 30;
+  res.tv_nsec = (t1 - (res.tv_sec*NANOSECONDS_PER_SECOND));
   return res;
 }
 
@@ -178,5 +182,27 @@ 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;
+}
+
+
+#define MAX_TV_SEC_TO_UINT64 0x3FFFFFFFFFFFFFFFULL
+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);
+  return res;
+}
 
 #endif // LTT_TIME_H