trace_uuid -> uuid and add packet metadata support

[babeltrace.git] / formats / ctf / metadata / ctf-test / succeed / ctf-embedded-2.txt

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 127cceadc8c82d2b57e38bf544980dd36acd3b04..859df66223c757a6835c2e2dc830c347cdad4512 100644 (file)
--- a/formats/ctf/metadata/ctf-test/succeed/ctf-embedded-2.txt
+++ b/formats/ctf/metadata/ctf-test/succeed/ctf-embedded-2.txt
@@ -1,19 +1,24 @@
+/* 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";
-       word_size = 32;
+       byte_order = be;
+       packet.header := struct {
+               uint32_t magic;
+               uint8_t  uuid[16];
+               uint32_t stream_id;
+       };
 };
 
-/* Architecture with 32-bit pointers, 32-bit integers, 32-bit longs */
-
-typealias integer { size = 1; align = 1; signed = false; } : uint1_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 *;
-
 stream {
        id = 0;
        event.header := struct {