X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=trunk%2Flttv%2Fltt%2Ftracefile.c;h=b4d20cc23d84beed08a03fdb2d87a77538567f9f;hb=9aa806f6154cd8e8ab9a028902b382731f65730d;hp=cb7d5e80ffd7bb29908c3683d443727bc14a819b;hpb=2fc874ab26ee6c66eb4c2b9480bb418240d24b03;p=lttv.git

diff --git a/trunk/lttv/ltt/tracefile.c b/trunk/lttv/ltt/tracefile.c
index cb7d5e80..b4d20cc2 100644
--- a/trunk/lttv/ltt/tracefile.c
+++ b/trunk/lttv/ltt/tracefile.c
@@ -165,7 +165,7 @@ static int parse_trace_header(void *header, LttTracefile *tf, LttTrace *t)
           (struct ltt_trace_header_2_0 *)header;
         tf->buffer_header_size =
          sizeof(struct ltt_block_start_header) 
-            + sizeof(struct ltt_trace_header_1_0);
+            + sizeof(struct ltt_trace_header_2_0);
         tf->tscbits = vheader->tscbits;
         tf->eventbits = vheader->eventbits;
         tf->tsc_mask = ((1ULL << tf->tscbits) - 1);
@@ -1256,7 +1256,7 @@ int ltt_tracefile_read_update_event(LttTracefile *tf)
   
   event->timestamp = ltt_get_uint32(LTT_GET_BO(tf), pos);
   event->event_id = event->timestamp >> tf->tscbits;
-  event->timestamp = event->timestamp & tsc_mask;
+  event->timestamp = event->timestamp & tf->tsc_mask;
   pos += sizeof(guint32);
 
   switch (event->event_id) {
@@ -1495,7 +1495,7 @@ void ltt_update_event_size(LttTracefile *tf)
    */
   if (likely(info && info->fields)) {
     /* alignment */
-    event->data += ltt_align((off_t)event->data, info->largest_align,
+    tf->event.data += ltt_align((off_t)tf->event.data, info->largest_align,
                              info->alignment);
     /* size, dynamically computed */
     if (info->size != -1)