From 5eda3dc244a6ad68c74a3bd22fac233182aad0fb Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Sun, 31 Jul 2011 13:52:42 -0400 Subject: [PATCH] Add text-based metadata header: /* TSDL Signed-off-by: Mathieu Desnoyers --- formats/ctf/metadata/ctf-test/development/ctf-embedded-1.txt | 1 + formats/ctf/metadata/ctf-test/fail/array-negative-len.txt | 2 ++ .../metadata/ctf-test/fail/array-unexisting-elem-type.txt | 1 + .../metadata/ctf-test/fail/enum-with-non-numeric-range.txt | 1 + .../ctf/metadata/ctf-test/fail/event-with-non-text-left.txt | 1 + .../metadata/ctf-test/fail/sequence-incorrect-elem-type.txt | 1 + .../ctf-test/fail/sequence-incorrect-len-type-signedness.txt | 1 + .../metadata/ctf-test/fail/sequence-incorrect-len-type.txt | 1 + .../ctf/metadata/ctf-test/fail/stream-with-non-text-left.txt | 1 + .../metadata/ctf-test/fail/struct-unexisting-field-type.txt | 1 + .../ctf-test/fail/struct-with-duplicate-field-name.txt | 1 + .../metadata/ctf-test/fail/struct-with-non-text-left-2.txt | 1 + .../metadata/ctf-test/fail/struct-with-non-text-left-3.txt | 1 + .../metadata/ctf-test/fail/struct-with-non-text-left-4.txt | 1 + .../metadata/ctf-test/fail/struct-with-non-text-left-5.txt | 1 + .../ctf/metadata/ctf-test/fail/struct-with-non-text-left.txt | 1 + .../ctf/metadata/ctf-test/fail/struct-with-right-range.txt | 1 + .../ctf/metadata/ctf-test/fail/trace-with-non-text-left.txt | 1 + .../metadata/ctf-test/fail/typealias-left-abstract-array.txt | 1 + .../ctf/metadata/ctf-test/fail/typealias-no-array-alias.txt | 1 + .../ctf/metadata/ctf-test/fail/typedef-untagged-variant.txt | 1 + .../metadata/ctf-test/fail/variant-unexisting-field-type.txt | 1 + .../ctf-test/fail/variant-with-duplicate-field-name.txt | 1 + .../metadata/ctf-test/fail/variant-with-non-text-left.txt | 1 + formats/ctf/metadata/ctf-test/succeed/ctf-embedded-1.txt | 2 ++ formats/ctf/metadata/ctf-test/succeed/ctf-embedded-2.txt | 2 ++ .../succeed/ctf-single-stream-with-packet-context.txt | 2 ++ formats/ctf/metadata/ctf-test/succeed/ctf-single-stream.txt | 2 ++ .../metadata/ctf-test/succeed/ctf-test-align-attribute.txt | 5 ++++- formats/ctf/metadata/ctf-test/succeed/ctf-test-seq.txt | 5 ++++- formats/ctf/metadata/ctf-test/succeed/ctf-test.txt | 1 + formats/ctf/metadata/ctf-test/tofix/ctf-path.txt | 1 + formats/ctf/metadata/ctf-test/tofix/ctf-redefine-type.txt | 1 + .../ctf/metadata/ctf-test/tofix/ctf-typedef-ambiguity.txt | 1 + tests/ctf-traces/fail/fail1/metadata | 5 ++++- tests/ctf-traces/succeed/succeed1/metadata | 1 + tests/ctf-traces/succeed/succeed2/metadata | 1 + 37 files changed, 51 insertions(+), 3 deletions(-) diff --git a/formats/ctf/metadata/ctf-test/development/ctf-embedded-1.txt b/formats/ctf/metadata/ctf-test/development/ctf-embedded-1.txt index 27af72332..bf57de675 100644 --- a/formats/ctf/metadata/ctf-test/development/ctf-embedded-1.txt +++ b/formats/ctf/metadata/ctf-test/development/ctf-embedded-1.txt @@ -1,3 +1,4 @@ +/* TSDL */ trace { major = 0; minor = 1; diff --git a/formats/ctf/metadata/ctf-test/fail/array-negative-len.txt b/formats/ctf/metadata/ctf-test/fail/array-negative-len.txt index fbbf4bea5..484b3b71d 100644 --- a/formats/ctf/metadata/ctf-test/fail/array-negative-len.txt +++ b/formats/ctf/metadata/ctf-test/fail/array-negative-len.txt @@ -1,2 +1,4 @@ +/* TSDL */ + typealias integer { size = 32; align = 32; signed = false; } := uint; typedef uint myarray[-10]; diff --git a/formats/ctf/metadata/ctf-test/fail/array-unexisting-elem-type.txt b/formats/ctf/metadata/ctf-test/fail/array-unexisting-elem-type.txt index cd93c7753..3506a76f0 100644 --- a/formats/ctf/metadata/ctf-test/fail/array-unexisting-elem-type.txt +++ b/formats/ctf/metadata/ctf-test/fail/array-unexisting-elem-type.txt @@ -1 +1,2 @@ +/* TSDL */ typedef nonexist myarray[10]; diff --git a/formats/ctf/metadata/ctf-test/fail/enum-with-non-numeric-range.txt b/formats/ctf/metadata/ctf-test/fail/enum-with-non-numeric-range.txt index a5fa99002..e96090e8e 100644 --- a/formats/ctf/metadata/ctf-test/fail/enum-with-non-numeric-range.txt +++ b/formats/ctf/metadata/ctf-test/fail/enum-with-non-numeric-range.txt @@ -1 +1,2 @@ +/* TSDL */ enum test {X = array[2].N ... 1, }; diff --git a/formats/ctf/metadata/ctf-test/fail/event-with-non-text-left.txt b/formats/ctf/metadata/ctf-test/fail/event-with-non-text-left.txt index 54128f4e0..a4b340d88 100644 --- a/formats/ctf/metadata/ctf-test/fail/event-with-non-text-left.txt +++ b/formats/ctf/metadata/ctf-test/fail/event-with-non-text-left.txt @@ -1 +1,2 @@ +/* TSDL */ event { 42 = test; }; diff --git a/formats/ctf/metadata/ctf-test/fail/sequence-incorrect-elem-type.txt b/formats/ctf/metadata/ctf-test/fail/sequence-incorrect-elem-type.txt index 0c9eb4f65..66b8a72e9 100644 --- a/formats/ctf/metadata/ctf-test/fail/sequence-incorrect-elem-type.txt +++ b/formats/ctf/metadata/ctf-test/fail/sequence-incorrect-elem-type.txt @@ -1,2 +1,3 @@ +/* TSDL */ typealias integer { size = 32; align = 32; signed = false; } := uint; typedef nonexist testseq[uint]; diff --git a/formats/ctf/metadata/ctf-test/fail/sequence-incorrect-len-type-signedness.txt b/formats/ctf/metadata/ctf-test/fail/sequence-incorrect-len-type-signedness.txt index 90d07a58d..98adf5af0 100644 --- a/formats/ctf/metadata/ctf-test/fail/sequence-incorrect-len-type-signedness.txt +++ b/formats/ctf/metadata/ctf-test/fail/sequence-incorrect-len-type-signedness.txt @@ -1,3 +1,4 @@ +/* TSDL */ typealias integer { size = 32; align = 32; signed = false; } := uint; typealias integer { size = 32; align = 32; signed = true; } := int; typedef uint testseq[int]; diff --git a/formats/ctf/metadata/ctf-test/fail/sequence-incorrect-len-type.txt b/formats/ctf/metadata/ctf-test/fail/sequence-incorrect-len-type.txt index 1f657f621..6e0f17e8c 100644 --- a/formats/ctf/metadata/ctf-test/fail/sequence-incorrect-len-type.txt +++ b/formats/ctf/metadata/ctf-test/fail/sequence-incorrect-len-type.txt @@ -1,3 +1,4 @@ +/* TSDL */ struct name {}; typealias integer { size = 32; align = 32; signed = false; } := uint; typedef uint testseq[struct name]; diff --git a/formats/ctf/metadata/ctf-test/fail/stream-with-non-text-left.txt b/formats/ctf/metadata/ctf-test/fail/stream-with-non-text-left.txt index 63d44dd4d..510ec62f1 100644 --- a/formats/ctf/metadata/ctf-test/fail/stream-with-non-text-left.txt +++ b/formats/ctf/metadata/ctf-test/fail/stream-with-non-text-left.txt @@ -1 +1,2 @@ +/* TSDL */ stream { 42 = test; }; diff --git a/formats/ctf/metadata/ctf-test/fail/struct-unexisting-field-type.txt b/formats/ctf/metadata/ctf-test/fail/struct-unexisting-field-type.txt index ef63fb79f..d8ebdd106 100644 --- a/formats/ctf/metadata/ctf-test/fail/struct-unexisting-field-type.txt +++ b/formats/ctf/metadata/ctf-test/fail/struct-unexisting-field-type.txt @@ -1,3 +1,4 @@ +/* TSDL */ struct test { int a; int b; diff --git a/formats/ctf/metadata/ctf-test/fail/struct-with-duplicate-field-name.txt b/formats/ctf/metadata/ctf-test/fail/struct-with-duplicate-field-name.txt index d5795596d..2f9c87f44 100644 --- a/formats/ctf/metadata/ctf-test/fail/struct-with-duplicate-field-name.txt +++ b/formats/ctf/metadata/ctf-test/fail/struct-with-duplicate-field-name.txt @@ -1,3 +1,4 @@ +/* TSDL */ typealias integer { size = 32; align = 32; signed = true; } := int; struct { diff --git a/formats/ctf/metadata/ctf-test/fail/struct-with-non-text-left-2.txt b/formats/ctf/metadata/ctf-test/fail/struct-with-non-text-left-2.txt index 5c964a184..8c45fd317 100644 --- a/formats/ctf/metadata/ctf-test/fail/struct-with-non-text-left-2.txt +++ b/formats/ctf/metadata/ctf-test/fail/struct-with-non-text-left-2.txt @@ -1 +1,2 @@ +/* TSDL */ struct test { int a.array[3].N; }; diff --git a/formats/ctf/metadata/ctf-test/fail/struct-with-non-text-left-3.txt b/formats/ctf/metadata/ctf-test/fail/struct-with-non-text-left-3.txt index 2d78cd893..9634616f3 100644 --- a/formats/ctf/metadata/ctf-test/fail/struct-with-non-text-left-3.txt +++ b/formats/ctf/metadata/ctf-test/fail/struct-with-non-text-left-3.txt @@ -1 +1,2 @@ +/* TSDL */ struct test { a->array[3].N test; }; diff --git a/formats/ctf/metadata/ctf-test/fail/struct-with-non-text-left-4.txt b/formats/ctf/metadata/ctf-test/fail/struct-with-non-text-left-4.txt index 1691a2e83..bead2ba24 100644 --- a/formats/ctf/metadata/ctf-test/fail/struct-with-non-text-left-4.txt +++ b/formats/ctf/metadata/ctf-test/fail/struct-with-non-text-left-4.txt @@ -1 +1,2 @@ +/* TSDL */ struct test { array[1] blah; }; diff --git a/formats/ctf/metadata/ctf-test/fail/struct-with-non-text-left-5.txt b/formats/ctf/metadata/ctf-test/fail/struct-with-non-text-left-5.txt index a3733be50..d986e7d61 100644 --- a/formats/ctf/metadata/ctf-test/fail/struct-with-non-text-left-5.txt +++ b/formats/ctf/metadata/ctf-test/fail/struct-with-non-text-left-5.txt @@ -1 +1,2 @@ +/* TSDL */ struct test { 42 = test; }; diff --git a/formats/ctf/metadata/ctf-test/fail/struct-with-non-text-left.txt b/formats/ctf/metadata/ctf-test/fail/struct-with-non-text-left.txt index 17b46ca5a..c0189c049 100644 --- a/formats/ctf/metadata/ctf-test/fail/struct-with-non-text-left.txt +++ b/formats/ctf/metadata/ctf-test/fail/struct-with-non-text-left.txt @@ -1 +1,2 @@ +/* TSDL */ struct test { array[3].N = test; }; diff --git a/formats/ctf/metadata/ctf-test/fail/struct-with-right-range.txt b/formats/ctf/metadata/ctf-test/fail/struct-with-right-range.txt index 072d9b46d..77cd4f0f8 100644 --- a/formats/ctf/metadata/ctf-test/fail/struct-with-right-range.txt +++ b/formats/ctf/metadata/ctf-test/fail/struct-with-right-range.txt @@ -1 +1,2 @@ +/* TSDL */ struct test { test = 444 ... 555; }; diff --git a/formats/ctf/metadata/ctf-test/fail/trace-with-non-text-left.txt b/formats/ctf/metadata/ctf-test/fail/trace-with-non-text-left.txt index b076af5d6..af7cd4876 100644 --- a/formats/ctf/metadata/ctf-test/fail/trace-with-non-text-left.txt +++ b/formats/ctf/metadata/ctf-test/fail/trace-with-non-text-left.txt @@ -1 +1,2 @@ +/* TSDL */ trace { 42 = test; }; diff --git a/formats/ctf/metadata/ctf-test/fail/typealias-left-abstract-array.txt b/formats/ctf/metadata/ctf-test/fail/typealias-left-abstract-array.txt index aced772bc..678133fb7 100644 --- a/formats/ctf/metadata/ctf-test/fail/typealias-left-abstract-array.txt +++ b/formats/ctf/metadata/ctf-test/fail/typealias-left-abstract-array.txt @@ -1,3 +1,4 @@ +/* TSDL */ typealias integer { size = 8; align = 8; signed = false; } := uint8_t; typealias uint8_t [] := puint8_t; diff --git a/formats/ctf/metadata/ctf-test/fail/typealias-no-array-alias.txt b/formats/ctf/metadata/ctf-test/fail/typealias-no-array-alias.txt index 35cea7a65..1cb4892c3 100644 --- a/formats/ctf/metadata/ctf-test/fail/typealias-no-array-alias.txt +++ b/formats/ctf/metadata/ctf-test/fail/typealias-no-array-alias.txt @@ -1 +1,2 @@ +/* TSDL */ typealias integer { size = 32; align = 32; signed = false; } : unsigned const long []; diff --git a/formats/ctf/metadata/ctf-test/fail/typedef-untagged-variant.txt b/formats/ctf/metadata/ctf-test/fail/typedef-untagged-variant.txt index 6ca403198..c13d97931 100644 --- a/formats/ctf/metadata/ctf-test/fail/typedef-untagged-variant.txt +++ b/formats/ctf/metadata/ctf-test/fail/typedef-untagged-variant.txt @@ -1,3 +1,4 @@ +/* TSDL */ typealias integer { size = 32; align = 32; signed = true; } := int; typedef variant { diff --git a/formats/ctf/metadata/ctf-test/fail/variant-unexisting-field-type.txt b/formats/ctf/metadata/ctf-test/fail/variant-unexisting-field-type.txt index 10d615570..568c6fd6c 100644 --- a/formats/ctf/metadata/ctf-test/fail/variant-unexisting-field-type.txt +++ b/formats/ctf/metadata/ctf-test/fail/variant-unexisting-field-type.txt @@ -1,3 +1,4 @@ +/* TSDL */ variant test { int a; int b; diff --git a/formats/ctf/metadata/ctf-test/fail/variant-with-duplicate-field-name.txt b/formats/ctf/metadata/ctf-test/fail/variant-with-duplicate-field-name.txt index 1dde066cd..3959b4876 100644 --- a/formats/ctf/metadata/ctf-test/fail/variant-with-duplicate-field-name.txt +++ b/formats/ctf/metadata/ctf-test/fail/variant-with-duplicate-field-name.txt @@ -1,3 +1,4 @@ +/* TSDL */ typealias integer { size = 32; align = 32; signed = true; } := int; variant { diff --git a/formats/ctf/metadata/ctf-test/fail/variant-with-non-text-left.txt b/formats/ctf/metadata/ctf-test/fail/variant-with-non-text-left.txt index 71e692e14..0b7169bf6 100644 --- a/formats/ctf/metadata/ctf-test/fail/variant-with-non-text-left.txt +++ b/formats/ctf/metadata/ctf-test/fail/variant-with-non-text-left.txt @@ -1 +1,2 @@ +/* TSDL */ variant test { 555 = test }; 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 1de882322..aae081e92 100644 --- a/formats/ctf/metadata/ctf-test/succeed/ctf-embedded-1.txt +++ b/formats/ctf/metadata/ctf-test/succeed/ctf-embedded-1.txt @@ -1,3 +1,5 @@ +/* TSDL */ + trace { major = 0; minor = 1; 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 859df6622..166ff0b43 100644 --- a/formats/ctf/metadata/ctf-test/succeed/ctf-embedded-2.txt +++ b/formats/ctf/metadata/ctf-test/succeed/ctf-embedded-2.txt @@ -1,3 +1,5 @@ +/* TSDL */ + /* Architecture with 32-bit pointers, 32-bit integers, 32-bit longs */ typealias integer { size = 1; align = 1; signed = false; } := uint1_t; diff --git a/formats/ctf/metadata/ctf-test/succeed/ctf-single-stream-with-packet-context.txt b/formats/ctf/metadata/ctf-test/succeed/ctf-single-stream-with-packet-context.txt index e7dae6798..1e807bfb5 100644 --- a/formats/ctf/metadata/ctf-test/succeed/ctf-single-stream-with-packet-context.txt +++ b/formats/ctf/metadata/ctf-test/succeed/ctf-single-stream-with-packet-context.txt @@ -1,3 +1,5 @@ +/* TSDL */ + typealias integer { size = 8; align = 8; signed = false; } := uint8_t; typealias integer { size = 32; align = 32; signed = false; } := uint32_t; diff --git a/formats/ctf/metadata/ctf-test/succeed/ctf-single-stream.txt b/formats/ctf/metadata/ctf-test/succeed/ctf-single-stream.txt index 73c8850e6..3140ea87d 100644 --- a/formats/ctf/metadata/ctf-test/succeed/ctf-single-stream.txt +++ b/formats/ctf/metadata/ctf-test/succeed/ctf-single-stream.txt @@ -1,3 +1,5 @@ +/* TSDL */ + typealias integer { size = 8; align = 8; signed = false; } := uint8_t; typealias integer { size = 32; align = 32; signed = false; } := uint32_t; diff --git a/formats/ctf/metadata/ctf-test/succeed/ctf-test-align-attribute.txt b/formats/ctf/metadata/ctf-test/succeed/ctf-test-align-attribute.txt index caf5cabb6..1db58cc41 100644 --- a/formats/ctf/metadata/ctf-test/succeed/ctf-test-align-attribute.txt +++ b/formats/ctf/metadata/ctf-test/succeed/ctf-test-align-attribute.txt @@ -1,4 +1,7 @@ -/* Architecture with 32-bit pointers, 32-bit integers, 32-bit longs */ +/* TSDL + * + * 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; diff --git a/formats/ctf/metadata/ctf-test/succeed/ctf-test-seq.txt b/formats/ctf/metadata/ctf-test/succeed/ctf-test-seq.txt index 135a3780d..a5298efb5 100644 --- a/formats/ctf/metadata/ctf-test/succeed/ctf-test-seq.txt +++ b/formats/ctf/metadata/ctf-test/succeed/ctf-test-seq.txt @@ -1,4 +1,7 @@ -/* Architecture with 32-bit pointers, 32-bit integers, 32-bit longs */ +/* TSDL + * + * 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; diff --git a/formats/ctf/metadata/ctf-test/succeed/ctf-test.txt b/formats/ctf/metadata/ctf-test/succeed/ctf-test.txt index 69e53851f..b6ff20a25 100644 --- a/formats/ctf/metadata/ctf-test/succeed/ctf-test.txt +++ b/formats/ctf/metadata/ctf-test/succeed/ctf-test.txt @@ -1,3 +1,4 @@ +/* TSDL */ typealias integer { size = 32; align = 32; signed = true; } := int; typealias integer { size = 32; align = 32; signed = false; } := uint; diff --git a/formats/ctf/metadata/ctf-test/tofix/ctf-path.txt b/formats/ctf/metadata/ctf-test/tofix/ctf-path.txt index ccfcbda18..86a78743b 100644 --- a/formats/ctf/metadata/ctf-test/tofix/ctf-path.txt +++ b/formats/ctf/metadata/ctf-test/tofix/ctf-path.txt @@ -1,3 +1,4 @@ +/* TSDL */ typealias integer { size = 8; align = 8; signed = false; base = hex; } := uint8_t; typealias integer { size = 32; align = 8; signed = false; base = hex; } := uint32_t; diff --git a/formats/ctf/metadata/ctf-test/tofix/ctf-redefine-type.txt b/formats/ctf/metadata/ctf-test/tofix/ctf-redefine-type.txt index f7a03d396..20e03b53d 100644 --- a/formats/ctf/metadata/ctf-test/tofix/ctf-redefine-type.txt +++ b/formats/ctf/metadata/ctf-test/tofix/ctf-redefine-type.txt @@ -1,3 +1,4 @@ +/* TSDL */ typealias integer { size = 8; align = 8; signed = false; } := uint8_t; typealias integer { size = 32; align = 8; signed = false; } := uint32_t; diff --git a/formats/ctf/metadata/ctf-test/tofix/ctf-typedef-ambiguity.txt b/formats/ctf/metadata/ctf-test/tofix/ctf-typedef-ambiguity.txt index a5dd3a726..445e4e97f 100644 --- a/formats/ctf/metadata/ctf-test/tofix/ctf-typedef-ambiguity.txt +++ b/formats/ctf/metadata/ctf-test/tofix/ctf-typedef-ambiguity.txt @@ -1,3 +1,4 @@ +/* TSDL */ // Define unsigned long typealias integer { ... } := unsigned long; diff --git a/tests/ctf-traces/fail/fail1/metadata b/tests/ctf-traces/fail/fail1/metadata index 3a14896ed..88e20d881 100644 --- a/tests/ctf-traces/fail/fail1/metadata +++ b/tests/ctf-traces/fail/fail1/metadata @@ -1,4 +1,7 @@ -/* Architecture with 32-bit pointers, 32-bit integers, 32-bit longs */ +/* TSDL + * + * 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; diff --git a/tests/ctf-traces/succeed/succeed1/metadata b/tests/ctf-traces/succeed/succeed1/metadata index e7dae6798..af1326cae 100644 --- a/tests/ctf-traces/succeed/succeed1/metadata +++ b/tests/ctf-traces/succeed/succeed1/metadata @@ -1,3 +1,4 @@ +/* TSDL */ typealias integer { size = 8; align = 8; signed = false; } := uint8_t; typealias integer { size = 32; align = 32; signed = false; } := uint32_t; diff --git a/tests/ctf-traces/succeed/succeed2/metadata b/tests/ctf-traces/succeed/succeed2/metadata index 8db3e5700..175e4f77f 100644 --- a/tests/ctf-traces/succeed/succeed2/metadata +++ b/tests/ctf-traces/succeed/succeed2/metadata @@ -1,3 +1,4 @@ +/* TSDL */ typealias integer { size = 8; align = 8; signed = false; base = 10; } := uint8_t; typealias integer { size = 32; align = 32; signed = false; base = hex; } := uint32_t; -- 2.34.1