From: Mathieu Desnoyers Date: Wed, 10 Feb 2010 20:52:17 +0000 (-0500) Subject: Update trace format version to 2.6 X-Git-Tag: v0.12.30~1 X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=621ef26f3b0e024b29ba8e10bd2c632f6e325ee3;p=lttv.git Update trace format version to 2.6 Signed-off-by: Mathieu Desnoyers --- diff --git a/ltt/ltt-private.h b/ltt/ltt-private.h index e432dc5b..65d73d18 100644 --- a/ltt/ltt-private.h +++ b/ltt/ltt-private.h @@ -66,7 +66,7 @@ typedef guint32 uint32_t; typedef guint64 uint64_t; /* Subbuffer header */ -struct ltt_subbuffer_header_2_5 { +struct ltt_subbuffer_header_2_6 { uint64_t cycle_count_begin; /* Cycle count at subbuffer start */ uint64_t cycle_count_end; /* Cycle count at subbuffer end */ uint32_t magic_number; /* @@ -99,7 +99,7 @@ struct ltt_subbuffer_header_2_5 { char header_end[0]; /* End of header */ }; -typedef struct ltt_subbuffer_header_2_5 ltt_subbuffer_header_t; +typedef struct ltt_subbuffer_header_2_6 ltt_subbuffer_header_t; /* * Return header size without padding after the structure. Don't use packed diff --git a/ltt/tracefile.c b/ltt/tracefile.c index 2ac0fa58..c206b046 100644 --- a/ltt/tracefile.c +++ b/ltt/tracefile.c @@ -148,9 +148,9 @@ static int parse_trace_header(ltt_subbuffer_header_t *header, break; case 2: switch(header->minor_version) { - case 5: + case 6: { - struct ltt_subbuffer_header_2_5 *vheader = header; + struct ltt_subbuffer_header_2_6 *vheader = header; tf->buffer_header_size = ltt_subbuffer_header_size(); tf->tscbits = 27; tf->eventbits = 5;