X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Finclude%2Fltt%2Fltt.h;h=74cbacebacbf6d3686e0117e179b421cb6d0473a;hb=b9f095dbe5986f50ca4665d976735bbb8c639c12;hp=17303a08922b1ef52ceabae27854f0a8ac786968;hpb=370dd87e2c9883b15999cab93d93762fec94b255;p=lttv.git

diff --git a/ltt/branches/poly/include/ltt/ltt.h b/ltt/branches/poly/include/ltt/ltt.h
index 17303a08..74cbaceb 100644
--- a/ltt/branches/poly/include/ltt/ltt.h
+++ b/ltt/branches/poly/include/ltt/ltt.h
@@ -75,10 +75,20 @@ typedef unsigned long LttChecksum;
    times per second) of the real time clock with their corresponding 
    cycle count values. */
 
-typedef struct timespec LttTime;
+typedef struct _LttTime {
+  unsigned long tv_sec;
+  unsigned long tv_nsec;
+} LttTime;
 
 typedef uint64_t LttCycleCount;
 
+#define NANSECOND_CONST       1000000000
+
+/* Event positions are used to seek within a tracefile based on
+   the block number and event position within the block. */
+
+typedef struct _LttEventPosition LttEventPosition;
+
 
 /* Differences between architectures include word sizes, endianess,
    alignment, floating point format and calling conventions. For a
@@ -100,11 +110,14 @@ typedef enum _LttArchEndian
 do \
 {\
   (T3).tv_sec  = (T2).tv_sec  - (T1).tv_sec;  \
-  (T3).tv_nsec = (T2).tv_nsec - (T1).tv_nsec; \
-  if((T3).tv_nsec < 0)\
+  if((T2).tv_nsec < (T1).tv_nsec)\
     {\
     (T3).tv_sec--;\
-    (T3).tv_nsec += 1000000000;\
+    (T3).tv_nsec = NANSECOND_CONST - (T1).tv_nsec + (T2).tv_nsec;\
+    }\
+  else\
+    {\
+    (T3).tv_nsec = (T2).tv_nsec - (T1).tv_nsec;\
     }\
 } while(0)
 
@@ -114,15 +127,32 @@ do \
 {\
   (T3).tv_sec  = (T2).tv_sec  + (T1).tv_sec;  \
   (T3).tv_nsec = (T2).tv_nsec + (T1).tv_nsec; \
-  if((T3).tv_nsec >= 1000000000)\
+  if((T3).tv_nsec >= NANSECOND_CONST)\
+    {\
+    (T3).tv_sec += (T3).tv_nsec / NANSECOND_CONST;\
+    (T3).tv_nsec = (T3).tv_nsec % NANSECOND_CONST;\
+    }\
+} while(0)
+
+/*  (T2 = T1 * FLOAT) */
+/* WARNING : use this multiplicator carefully : on 32 bits, multiplying
+ * by more than 4 could overflow the tv_nsec.
+ */
+#define TimeMul(T2, T1, FLOAT) \
+do \
+{\
+  (T2).tv_sec  = (T1).tv_sec  * (FLOAT);  \
+  (T2).tv_nsec = (T1).tv_nsec * (FLOAT);  \
+  if((T2).tv_nsec >= NANSECOND_CONST)\
     {\
-    (T3).tv_sec += (T3).tv_nsec / 1000000000;\
-    (T3).tv_nsec = (T3).tv_nsec % 1000000000;\
+    (T2).tv_sec += (T2).tv_nsec / NANSECOND_CONST;\
+    (T2).tv_nsec = (T2).tv_nsec % NANSECOND_CONST;\
     }\
 } while(0)
 
 
 
+
 #include <ltt/ltt-private.h>