Fix integer/float/string read: keep value in definition structure

[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 163a198a98637700db18bf3bf307fb69e58ea3e4..b9340158995e6b35b857c477ba3edf38ce2f828a 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;
-       major = 1;
+       minor = 1;
        uuid = "2a6422d0-6cee-11e0-8c08-cb07d7b3a564";
-       word_size = 32;
+       byte_order = be;
+       packet.header := struct {
+               uint32_t magic;
+               uint8_t  trace_uuid[16];
+               uint32_t stream_id;
+       };
 };
 
-/* Architecture with 32-bit pointers, 32-bit integers, 32-bit longs */
-
-typealias integer { size = 1; align = 1; signedness = false; } : uint1_t;
-typealias integer { size = 63; align = 1; signedness = false; } : timestamp_t;
-
-typealias integer { size = 32; align = 32; signedness = false; } : uint32_t;
-typealias integer { size = 32; align = 32; signedness = false; } : void *;
-
 stream {
        id = 0;
        event.header := struct {
@@ -29,7 +34,7 @@ stream {
 event {
        name = func_enter;
        id = 0;
-       stream = 0;
+       stream_id = 0;
        fields := struct {
                void *func_called;
                void *called_from;
@@ -39,5 +44,5 @@ event {
 event {
        name = func_exit;
        id = 1;
-       stream = 0;
+       stream_id = 0;
 };