create directories branches, tags, trunk

[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 33feff2824f39034f540c88f90924949bb3ae5d6..14c15d1d237c1d7d184033636750a510a63e8e16 100644 (file)
--- a/ltt/branches/poly/ltt/time.h
+++ b/ltt/branches/poly/ltt/time.h
@@ -1,5 +1,6 @@
 /* This file is part of the Linux Trace Toolkit trace reading library
  * Copyright (C) 2003-2004 Michel Dagenais
+ *               2005 Mathieu Desnoyers
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -21,6 +22,7 @@
 
 #include <glib.h>
 #include <ltt/compiler.h>
+#include <math.h>
 
 typedef struct _LttTime {
   unsigned long tv_sec;
@@ -115,9 +117,9 @@ static inline double ltt_time_to_double(LttTime t1)
   if(t1.tv_sec > MAX_TV_SEC_TO_DOUBLE)
     g_warning("Precision loss in conversion LttTime to double");
 #endif //EXTRA_CHECK
-  return round(((double)((guint64)t1.tv_sec<<DOUBLE_SHIFT)
+  return ((double)((guint64)t1.tv_sec<<DOUBLE_SHIFT)
                   * (double)DOUBLE_SHIFT_CONST_MUL)
-                  + (double)t1.tv_nsec);
+                  + (double)t1.tv_nsec;
 }
 
 
@@ -139,7 +141,7 @@ static inline LttTime ltt_time_from_double(double t1)
   LttTime res;
   //res.tv_sec = t1/(double)NANOSECONDS_PER_SECOND;
   res.tv_sec = (guint64)(t1 * DOUBLE_SHIFT_CONST_DIV) >> DOUBLE_SHIFT;
-  res.tv_nsec = (round(t1) - (((guint64)res.tv_sec<<LTT_TIME_UINT_SHIFT))
+  res.tv_nsec = (t1 - (((guint64)res.tv_sec<<LTT_TIME_UINT_SHIFT))
                                * LTT_TIME_UINT_SHIFT_CONST);
   return res;
 }
@@ -212,7 +214,7 @@ static inline LttTime ltt_time_div(LttTime t1, double d)
 
 static inline guint64 ltt_time_to_uint64(LttTime t1)
 {
-  return (guint64)((t1.tv_sec*LTT_TIME_UINT_SHIFT_CONST) >> LTT_TIME_UINT_SHIFT)
+  return (((guint64)t1.tv_sec*LTT_TIME_UINT_SHIFT_CONST) << LTT_TIME_UINT_SHIFT)
                        + (guint64)t1.tv_nsec;
 }