From f0751d062283ebf3da261ff4d3aba653791d76fe Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Wed, 4 May 2011 16:00:05 -0400 Subject: [PATCH] Update tests to include new packet.header description Signed-off-by: Mathieu Desnoyers --- .../ctf-test/succeed/ctf-embedded-1.txt | 9 ++++----- .../ctf-test/succeed/ctf-embedded-2.txt | 19 ++++++++++++------- .../metadata/ctf-test/succeed/ctf-test.txt | 19 ++++++++++--------- 3 files changed, 26 insertions(+), 21 deletions(-) diff --git a/formats/ctf/metadata/ctf-test/succeed/ctf-embedded-1.txt b/formats/ctf/metadata/ctf-test/succeed/ctf-embedded-1.txt index e6cdd8e4..05b1c98a 100644 --- a/formats/ctf/metadata/ctf-test/succeed/ctf-embedded-1.txt +++ b/formats/ctf/metadata/ctf-test/succeed/ctf-embedded-1.txt @@ -1,8 +1,8 @@ - trace { major = 0; minor = 1; uuid = "f816d884-6cea-11e0-ac7a-8f5f4e9f7724"; + endian = big; /* Assuming big endian streams */ }; /* Architecture with 32-bit pointers, 32-bit integers, 32-bit longs */ @@ -12,7 +12,6 @@ typealias integer { size = 64; align = 64; signed = false; } := uint64_t; typealias integer { size = 32; align = 32; signed = false; } := void *; stream { - id = 0; event.header := struct { uint32_t id; uint64_t timestamp; @@ -31,6 +30,6 @@ stream { * layout). See ctf-embedded-2.txt for a more compact layout. */ -event { name = invalid; id = 0; stream_id = 0; }; -event { name = func_enter; id = 1; stream_id = 0; }; -event { name = func_exit; id = 2; stream_id = 0; }; +event { name = invalid; id = 0; }; +event { name = func_enter; id = 1; }; +event { name = func_exit; id = 2; }; diff --git a/formats/ctf/metadata/ctf-test/succeed/ctf-embedded-2.txt b/formats/ctf/metadata/ctf-test/succeed/ctf-embedded-2.txt index 8b76bcbe..db436ae3 100644 --- a/formats/ctf/metadata/ctf-test/succeed/ctf-embedded-2.txt +++ b/formats/ctf/metadata/ctf-test/succeed/ctf-embedded-2.txt @@ -1,18 +1,23 @@ - -trace { - major = 0; - minor = 1; - uuid = "2a6422d0-6cee-11e0-8c08-cb07d7b3a564"; -}; - /* Architecture with 32-bit pointers, 32-bit integers, 32-bit longs */ typealias integer { size = 1; align = 1; signed = false; } := uint1_t; +typealias integer { size = 8; align = 8; signed = false; } := uint8_t; typealias integer { size = 63; align = 1; signed = false; } := timestamp_t; typealias integer { size = 32; align = 32; signed = false; } := uint32_t; typealias integer { size = 32; align = 32; signed = false; } := void *; +trace { + major = 0; + minor = 1; + uuid = "2a6422d0-6cee-11e0-8c08-cb07d7b3a564"; + packet.header := struct { + uint32_t magic; + uint8_t trace_uuid[16]; + uint32_t stream_id; + }; +}; + stream { id = 0; event.header := struct { diff --git a/formats/ctf/metadata/ctf-test/succeed/ctf-test.txt b/formats/ctf/metadata/ctf-test/succeed/ctf-test.txt index ac25a4a8..260ac024 100644 --- a/formats/ctf/metadata/ctf-test/succeed/ctf-test.txt +++ b/formats/ctf/metadata/ctf-test/succeed/ctf-test.txt @@ -39,10 +39,20 @@ typealias integer { signed = false; } := struct page *; +struct event_packet_header { + typealias integer { size = 32; align = 32; signed = false; } := uint32_t; + typealias integer { size = 8; align = 8; signed = false; } := uint8_t; + + uint32_t magic; + uint8_t trace_uuid[16]; + uint32_t stream_id; +}; + trace { major = 66; minor = 2; uuid = "1123fcea-706e-11e0-a38b-f3c28a683a3d"; + packet.header := struct event_packet_header; }; stream { @@ -93,15 +103,6 @@ typealias integer { typealias string { encoding = UTF8; } := test; -struct event_packet_header { - typealias integer { size = 32; align = 32; signed = false; } := uint32_t; - typealias integer { size = 8; align = 8; signed = false; } := uint8_t; - - uint32_t magic; - uint8_t trace_uuid[16]; - uint32_t stream_id; -}; - struct event_packet_context { typealias integer { size = 64; align = 64; signed = false; } := uint64_t; typealias integer { size = 32; align = 32; signed = false; } := uint32_t; -- 2.34.1