optimisation of ltt_time_from_uint64

git-svn-id: http://ltt.polymtl.ca/svn@781 04897980-b3bd-0310-b5e0-8ef037075253

diff --git a/ltt/branches/poly/ltt/time.h b/ltt/branches/poly/ltt/time.h
index fe7641dfbbf49fdcc871e37ac3d55e1994a36b40..7cb7c8bb95914f303fd484eb7af5e8ff7ce75d07 100644 (file)
--- 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;
 }
 

diff --git a/ltt/branches/poly/ltt/tracefile.c b/ltt/branches/poly/ltt/tracefile.c
index 45ee588e6f69aafc86f9bb749efec85fbb41c1f7..2b8fc5783219723752c6389dcab35ab603ff06eb 100644 (file)
--- a/ltt/branches/poly/ltt/tracefile.c
+++ b/ltt/branches/poly/ltt/tracefile.c
@@ -1657,7 +1657,8 @@ int getFieldtypeSize(LttTracefile * t, LttEventType * evT, int offsetRoot,
   LttType * type = fld->field_type;
 
   if(likely(t)){
-    if(unlikely(evT->latest_block==t->which_block && evT->latest_event==t->which_event)){
+    if(unlikely(evT->latest_block==t->which_block &&
+                evT->latest_event==t->which_event)){
       return fld->field_size;
     } 
   }