From a90481657339f0f41aacf1da5a84975d7b7bc8ad Mon Sep 17 00:00:00 2001 From: compudj Date: Fri, 10 Oct 2008 20:42:36 +0000 Subject: [PATCH] build fix git-svn-id: http://ltt.polymtl.ca/svn@3088 04897980-b3bd-0310-b5e0-8ef037075253 --- trunk/lttv/ltt/event.h | 2 +- trunk/lttv/ltt/tracefile.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/trunk/lttv/ltt/event.h b/trunk/lttv/ltt/event.h index d737a469..31a49d36 100644 --- a/trunk/lttv/ltt/event.h +++ b/trunk/lttv/ltt/event.h @@ -1,4 +1,4 @@ - +#ifndef _LTT_EVENT_H #define _LTT_EVENT_H #include 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) -- 2.34.1