X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Fltt%2Fevent.c;h=9b3ff0d9984b63155baaf14ab3c6b54fa4c90c45;hb=cbd41522fece37839f38aaf3372b8a11fac9b267;hp=7ef6737728bbba7cbeebd9ee8cc58f81205fd019;hpb=80da81adfa88158bd3d4c26f89f96f8b58c77b4f;p=lttv.git

diff --git a/ltt/branches/poly/ltt/event.c b/ltt/branches/poly/ltt/event.c
index 7ef67377..9b3ff0d9 100644
--- a/ltt/branches/poly/ltt/event.c
+++ b/ltt/branches/poly/ltt/event.c
@@ -1,7 +1,6 @@
 #include <stdio.h>
 #include <asm/types.h>
 #include <linux/byteorder/swab.h>
-#include <ltt/LTTTypes.h> 
 #include "parser.h"
 #include <ltt/event.h>
 
@@ -196,8 +195,9 @@ void ltt_event_position(LttEvent *e, LttEventPosition *ep)
   ep->event_time        = e->event_time;
   ep->event_cycle_count = e->event_cycle_count;
   ep->heart_beat_number = e->tracefile->cur_heart_beat_number;
-  ep->old_position      = TRUE;
+  ep->old_position      = FALSE;
   ep->event_offset      = e->data - e->tracefile->buffer - EVENT_HEADER_SIZE ;
+  ep->tf                = e->tracefile;
 }
 
 /*****************************************************************************
@@ -210,10 +210,11 @@ void ltt_event_position(LttEvent *e, LttEventPosition *ep)
  ****************************************************************************/
 
 void ltt_event_position_get(LttEventPosition *ep,
-    unsigned *block_number, unsigned *index_in_block)
+    unsigned *block_number, unsigned *index_in_block, LttTracefile ** tf)
 {
   *block_number   = ep->block_num;
   *index_in_block = ep->event_num;
+  *tf             = ep->tf;
 }
 
 /*****************************************************************************
@@ -229,7 +230,7 @@ void ltt_event_position_set(LttEventPosition *ep,
     unsigned block_number, unsigned index_in_block)
 {
   ep->block_num = block_number;
-  ep->event_num = index_in_block;
+  ep->event_num = index_in_block;  
 }
 
 /*****************************************************************************
@@ -335,17 +336,26 @@ unsigned ltt_event_get_unsigned(LttEvent *e, LttField *f)
     g_error("The type of the field is not unsigned int\n");
 
   if(f->field_size == 1){
-    uint8_t x = *(uint8_t*)(e->data + f->offset_root);
+    guint8 x = *(guint8 *)(e->data + f->offset_root);
     return (unsigned int) x;    
   }else if(f->field_size == 2){
-    uint16_t x = *(uint16_t*)(e->data + f->offset_root);
-    return (unsigned int) (revFlag ? BREV16(x): x);    
+    guint16 x = *(guint16 *)(e->data + f->offset_root);
+    if(e->tracefile->trace->my_arch_endian == LTT_LITTLE_ENDIAN)
+      return (unsigned int) (revFlag ? GUINT16_FROM_BE(x): x);    
+    else
+      return (unsigned int) (revFlag ? GUINT16_FROM_LE(x): x);          
   }else if(f->field_size == 4){
-    uint32_t x = *(uint32_t*)(e->data + f->offset_root);
-    return (unsigned int) (revFlag ? BREV32(x): x);    
+    guint32 x = *(guint32 *)(e->data + f->offset_root);
+    if(e->tracefile->trace->my_arch_endian == LTT_LITTLE_ENDIAN)
+      return (unsigned int) (revFlag ? GUINT32_FROM_BE(x): x);    
+    else
+      return (unsigned int) (revFlag ? GUINT32_FROM_LE(x): x);    
   }else if(f->field_size == 8){
-    uint64_t x = *(uint64_t*)(e->data + f->offset_root);
-    return (unsigned int) (revFlag ? BREV64(x): x);    
+    guint64 x = *(guint64 *)(e->data + f->offset_root);
+    if(e->tracefile->trace->my_arch_endian == LTT_LITTLE_ENDIAN)
+      return (unsigned int) (revFlag ? GUINT64_FROM_BE(x): x);    
+    else
+      return (unsigned int) (revFlag ? GUINT64_FROM_LE(x): x);    
   }
 }
 
@@ -358,17 +368,26 @@ int ltt_event_get_int(LttEvent *e, LttField *f)
     g_error("The type of the field is not int\n");
 
   if(f->field_size == 1){
-    int8_t x = *(int8_t*)(e->data + f->offset_root);
+    gint8 x = *(gint8 *)(e->data + f->offset_root);
     return (int) x;    
   }else if(f->field_size == 2){
-    int16_t x = *(int16_t*)(e->data + f->offset_root);
-    return (int) (revFlag ? BREV16(x): x);    
+    gint16 x = *(gint16 *)(e->data + f->offset_root);
+    if(e->tracefile->trace->my_arch_endian == LTT_LITTLE_ENDIAN)
+      return (int) (revFlag ? GINT16_FROM_BE(x): x);    
+    else
+      return (int) (revFlag ? GINT16_FROM_LE(x): x);    
   }else if(f->field_size == 4){
-    int32_t x = *(int32_t*)(e->data + f->offset_root);
-    return (int) (revFlag ? BREV32(x): x);    
+    gint32 x = *(gint32 *)(e->data + f->offset_root);
+    if(e->tracefile->trace->my_arch_endian == LTT_LITTLE_ENDIAN)
+      return (int) (revFlag ? GINT32_FROM_BE(x): x);    
+    else
+      return (int) (revFlag ? GINT32_FROM_LE(x): x);    
   }else if(f->field_size == 8){
-    int64_t x = *(int64_t*)(e->data + f->offset_root);
-    return (int) (revFlag ? BREV64(x): x);    
+    gint64 x = *(gint64 *)(e->data + f->offset_root);
+    if(e->tracefile->trace->my_arch_endian == LTT_LITTLE_ENDIAN)
+      return (int) (revFlag ? GINT64_FROM_BE(x): x);    
+    else
+      return (int) (revFlag ? GINT64_FROM_LE(x): x);    
   }
 }
 
@@ -382,17 +401,26 @@ unsigned long ltt_event_get_long_unsigned(LttEvent *e, LttField *f)
     g_error("The type of the field is not unsigned long\n");
 
   if(f->field_size == 1){
-    uint8_t x = *(uint8_t*)(e->data + f->offset_root);
+    guint8 x = *(guint8 *)(e->data + f->offset_root);
     return (unsigned long) x;    
   }else if(f->field_size == 2){
-    uint16_t x = *(uint16_t*)(e->data + f->offset_root);
-    return (unsigned long) (revFlag ? BREV16(x): x);    
+    guint16 x = *(guint16 *)(e->data + f->offset_root);
+    if(e->tracefile->trace->my_arch_endian == LTT_LITTLE_ENDIAN)
+      return (unsigned long) (revFlag ? GUINT16_FROM_BE(x): x);  
+    else
+      return (unsigned long) (revFlag ? GUINT16_FROM_LE(x): x);    
   }else if(f->field_size == 4){
-    uint32_t x = *(uint32_t*)(e->data + f->offset_root);
-    return (unsigned long) (revFlag ? BREV32(x): x);    
+    guint32 x = *(guint32 *)(e->data + f->offset_root);
+    if(e->tracefile->trace->my_arch_endian == LTT_LITTLE_ENDIAN)
+      return (unsigned long) (revFlag ? GUINT32_FROM_BE(x): x);    
+    else
+      return (unsigned long) (revFlag ? GUINT32_FROM_LE(x): x);    
   }else if(f->field_size == 8){
-    uint64_t x = *(uint64_t*)(e->data + f->offset_root);
-    return (unsigned long) (revFlag ? BREV64(x): x);    
+    guint64 x = *(guint64 *)(e->data + f->offset_root);
+    if(e->tracefile->trace->my_arch_endian == LTT_LITTLE_ENDIAN)
+      return (unsigned long) (revFlag ? GUINT64_FROM_BE(x): x);    
+    else
+      return (unsigned long) (revFlag ? GUINT64_FROM_LE(x): x);    
   }
 }
 
@@ -405,17 +433,26 @@ long int ltt_event_get_long_int(LttEvent *e, LttField *f)
     g_error("The type of the field is not long int\n");
 
   if(f->field_size == 1){
-    int8_t x = *(int8_t*)(e->data + f->offset_root);
+    gint8 x = *(gint8 *)(e->data + f->offset_root);
     return (long) x;    
   }else if(f->field_size == 2){
-    int16_t x = *(int16_t*)(e->data + f->offset_root);
-    return (long) (revFlag ? BREV16(x): x);    
+    gint16 x = *(gint16 *)(e->data + f->offset_root);
+    if(e->tracefile->trace->my_arch_endian == LTT_LITTLE_ENDIAN)
+      return (long) (revFlag ? GINT16_FROM_BE(x): x);    
+    else
+      return (long) (revFlag ? GINT16_FROM_LE(x): x);    
   }else if(f->field_size == 4){
-    int32_t x = *(int32_t*)(e->data + f->offset_root);
-    return (long) (revFlag ? BREV32(x): x);    
+    gint32 x = *(gint32 *)(e->data + f->offset_root);
+    if(e->tracefile->trace->my_arch_endian == LTT_LITTLE_ENDIAN)
+      return (long) (revFlag ? GINT32_FROM_BE(x): x);    
+    else
+      return (long) (revFlag ? GINT32_FROM_LE(x): x);    
   }else if(f->field_size == 8){
-    int64_t x = *(int64_t*)(e->data + f->offset_root);
-    return (long) (revFlag ? BREV64(x): x);    
+    gint64 x = *(gint64 *)(e->data + f->offset_root);
+    if(e->tracefile->trace->my_arch_endian == LTT_LITTLE_ENDIAN)
+      return (long) (revFlag ? GINT64_FROM_BE(x): x);    
+    else
+      return (long) (revFlag ? GINT64_FROM_LE(x): x);    
   }
 }
 
@@ -430,7 +467,7 @@ float ltt_event_get_float(LttEvent *e, LttField *f)
 
   if(revFlag == 0) return *(float *)(e->data + f->offset_root);
   else{
-    uint32_t aInt;
+    guint32 aInt;
     memcpy((void*)&aInt, e->data + f->offset_root, 4);
     aInt = ___swab32(aInt);
     return *((float*)&aInt);
@@ -448,7 +485,7 @@ double ltt_event_get_double(LttEvent *e, LttField *f)
 
   if(revFlag == 0) return *(double *)(e->data + f->offset_root);
   else{
-    uint64_t aInt;
+    guint64 aInt;
     memcpy((void*)&aInt, e->data + f->offset_root, 8);
     aInt = ___swab64(aInt);
     return *((double *)&aInt);