From 5a69756597a55db56efb61388060c535854f44e2 Mon Sep 17 00:00:00 2001 From: compudj Date: Fri, 16 Dec 2005 22:28:08 +0000 Subject: [PATCH] change header struct name for 0_6 git-svn-id: http://ltt.polymtl.ca/svn@1411 04897980-b3bd-0310-b5e0-8ef037075253 --- ltt/branches/poly/ltt/ltt-private.h | 25 ++----------------------- ltt/branches/poly/ltt/tracefile.c | 6 +++--- 2 files changed, 5 insertions(+), 26 deletions(-) diff --git a/ltt/branches/poly/ltt/ltt-private.h b/ltt/branches/poly/ltt/ltt-private.h index 5dde4632..8af6e3bf 100644 --- a/ltt/branches/poly/ltt/ltt-private.h +++ b/ltt/branches/poly/ltt/ltt-private.h @@ -179,30 +179,9 @@ struct ltt_trace_header_0_3 { uint8_t has_tsc; } LTT_PACKED_STRUCT; -/* For version 0.4 */ +/* For version 0.6 */ -struct ltt_trace_header_0_4 { - uint32_t magic_number; - uint32_t arch_type; - uint32_t arch_variant; - uint32_t float_word_order; - uint8_t arch_size; - uint8_t major_version; - uint8_t minor_version; - uint8_t flight_recorder; - uint8_t has_heartbeat; - uint8_t has_alignment; /* Event header alignment */ - uint8_t has_tsc; - uint64_t start_freq; - uint64_t start_tsc; - uint64_t start_monotonic; - struct timeval start_time; -} LTT_PACKED_STRUCT; - - -/* For version 0.5 */ - -struct ltt_trace_header_0_5 { +struct ltt_trace_header_0_6 { uint32_t magic_number; uint32_t arch_type; uint32_t arch_variant; diff --git a/ltt/branches/poly/ltt/tracefile.c b/ltt/branches/poly/ltt/tracefile.c index 37a7c035..5ddabdbd 100644 --- a/ltt/branches/poly/ltt/tracefile.c +++ b/ltt/branches/poly/ltt/tracefile.c @@ -252,11 +252,11 @@ int parse_trace_header(void *header, LttTracefile *tf, LttTrace *t) break; case 6: { - struct ltt_trace_header_0_5 *vheader = - (struct ltt_trace_header_0_5 *)header; + struct ltt_trace_header_0_6 *vheader = + (struct ltt_trace_header_0_6 *)header; tf->buffer_header_size = sizeof(struct ltt_block_start_header) - + sizeof(struct ltt_trace_header_0_5); + + sizeof(struct ltt_trace_header_0_6); if(t) { t->start_freq = ltt_get_uint64(LTT_GET_BO(tf), &vheader->start_freq); -- 2.34.1