X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Fltt%2Ftime.h;h=ec4d134baf97d051ae2d3d7b87c29f837a5943b4;hb=f31675494449c73316cab60617f51a85e67291c1;hp=a151505cbf2c12418adb441303d78c4d5efd947a;hpb=8d1e6362a5e8b3086942948c0d5c79c0433dadcd;p=lttv.git

diff --git a/ltt/branches/poly/ltt/time.h b/ltt/branches/poly/ltt/time.h
index a151505c..ec4d134b 100644
--- 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;
@@ -178,5 +176,25 @@ 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
+   * */
+  g_assert(t1 <= MAX_TV_SEC_TO_UINT64);
+  if(t1 > MAX_TV_SEC_TO_UINT64)
+    g_warning("Conversion from non precise uint64 to LttTime");
+  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