X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Fltt%2Ftime.h;h=7cb7c8bb95914f303fd484eb7af5e8ff7ce75d07;hb=49f3c39e02a4f8a60a3656c2cbdeec23ef8f58ca;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..7cb7c8bb 100644
--- a/ltt/branches/poly/ltt/time.h
+++ b/ltt/branches/poly/ltt/time.h
@@ -207,11 +207,16 @@ 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)) {
+    res.tv_sec = t1/NANOSECONDS_PER_SECOND;
+    res.tv_nsec = (t1 - res.tv_sec*NANOSECONDS_PER_SECOND);
+  } else {
+    res.tv_sec = 0;
+    res.tv_nsec = (guint32)t1;
+  }
   return res;
 }