X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=tests%2Flib%2Ftest_ctf_writer.c;h=2929d24e638167ccb43da1af2bff33ec2665be88;hp=4d2c468a378578a80febb4843f7f967fc253daa3;hb=61cf588beae752e5ddfc60b6b5310f769ac9e852;hpb=f60fde631cec36ea5c6ed7c6838d95f8808f4c15 diff --git a/tests/lib/test_ctf_writer.c b/tests/lib/test_ctf_writer.c index 4d2c468a..2929d24e 100644 --- a/tests/lib/test_ctf_writer.c +++ b/tests/lib/test_ctf_writer.c @@ -19,7 +19,6 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#define _GNU_SOURCE #include #include #include @@ -27,21 +26,24 @@ #include #include #include +#include #include -#include +#include #include -#include +#include #include #include #include +#include #include #include #include #include -#include +#include #include "tap/tap.h" #include #include +#include #define METADATA_LINE_SIZE 512 #define SEQUENCE_TEST_LENGTH 10 @@ -55,7 +57,9 @@ #define DEFAULT_CLOCK_IS_ABSOLUTE 0 #define DEFAULT_CLOCK_TIME 0 -static uint64_t current_time = 42; +#define NR_TESTS 597 + +static int64_t current_time = 42; /* Return 1 if uuids match, zero if different. */ int uuid_match(const unsigned char *uuid_a, const unsigned char *uuid_b) @@ -159,12 +163,12 @@ result: rewind(metadata_fp); /* Output the metadata and parser output as diagnostic */ - while (getline(&line, &len, metadata_fp) > 0) { + while (bt_getline(&line, &len, metadata_fp) > 0) { fprintf(stderr, "# %s", line); } rewind(parser_output_fp); - while (getline(&line, &len, parser_output_fp) > 0) { + while (bt_getline(&line, &len, parser_output_fp) > 0) { fprintf(stderr, "# %s", line); } @@ -256,7 +260,7 @@ result: diag("malloc error"); } rewind(babeltrace_output_fp); - while (getline(&line, &len, babeltrace_output_fp) > 0) { + while (bt_getline(&line, &len, babeltrace_output_fp) > 0) { diag("%s", line); } @@ -276,6 +280,89 @@ close_fp: } } +void event_copy_tests(struct bt_ctf_event *event) +{ + struct bt_ctf_event *copy; + struct bt_ctf_event_class *orig_event_class; + struct bt_ctf_event_class *copy_event_class; + struct bt_ctf_stream *orig_stream; + struct bt_ctf_stream *copy_stream; + struct bt_ctf_field *orig_field; + struct bt_ctf_field *copy_field; + + /* copy */ + ok(!bt_ctf_event_copy(NULL), + "bt_ctf_event_copy handles NULL correctly"); + copy = bt_ctf_event_copy(event); + ok(copy, "bt_ctf_event_copy returns a valid pointer"); + + /* validate event class */ + orig_event_class = bt_ctf_event_get_class(event); + assert(orig_event_class); + copy_event_class = bt_ctf_event_get_class(copy); + ok(orig_event_class == copy_event_class, + "original and copied events share the same event class pointer"); + bt_put(orig_event_class); + bt_put(copy_event_class); + + /* validate stream */ + orig_stream = bt_ctf_event_get_stream(event); + copy_stream = bt_ctf_event_get_stream(copy); + + if (!orig_stream) { + ok(!copy_stream, "original and copied events have no stream"); + } else { + ok(orig_stream == copy_stream, + "original and copied events share the same stream pointer"); + } + bt_put(orig_stream); + bt_put(copy_stream); + + /* header */ + orig_field = bt_ctf_event_get_header(event); + copy_field = bt_ctf_event_get_header(copy); + + if (!orig_field) { + ok(!copy_field, "original and copied events have no header"); + } else { + ok(orig_field != copy_field, + "original and copied events headers are different pointers"); + } + + bt_put(orig_field); + bt_put(copy_field); + + /* context */ + orig_field = bt_ctf_event_get_event_context(event); + copy_field = bt_ctf_event_get_event_context(copy); + + if (!orig_field) { + ok(!copy_field, "original and copied events have no context"); + } else { + ok(orig_field != copy_field, + "original and copied events contexts are different pointers"); + } + + bt_put(orig_field); + bt_put(copy_field); + + /* payload */ + orig_field = bt_ctf_event_get_payload_field(event); + copy_field = bt_ctf_event_get_payload_field(copy); + + if (!orig_field) { + ok(!copy_field, "original and copied events have no payload"); + } else { + ok(orig_field != copy_field, + "original and copied events payloads are different pointers"); + } + + bt_put(orig_field); + bt_put(copy_field); + + bt_put(copy); +} + void append_simple_event(struct bt_ctf_stream_class *stream_class, struct bt_ctf_stream *stream, struct bt_ctf_clock *clock) { @@ -328,7 +415,7 @@ void append_simple_event(struct bt_ctf_stream_class *stream_class, ok(!bt_ctf_field_type_enumeration_get_container_type(NULL), "bt_ctf_field_type_enumeration_get_container_type handles NULL correctly"); ok(!bt_ctf_field_type_enumeration_create(enum_type), "bt_ctf_field_enumeration_type_create rejects non-integer container field types"); - bt_ctf_field_type_put(returned_type); + bt_put(returned_type); bt_ctf_field_type_set_alignment(float_type, 32); ok(bt_ctf_field_type_get_alignment(NULL) < 0, @@ -476,7 +563,7 @@ void append_simple_event(struct bt_ctf_stream_class *stream_class, returned_type = bt_ctf_event_class_get_context_type(simple_event_class); ok(returned_type == event_context_type, "bt_ctf_event_class_get_context_type returns the appropriate type"); - bt_ctf_field_type_put(returned_type); + bt_put(returned_type); bt_ctf_stream_class_add_event_class(stream_class, simple_event_class); @@ -491,7 +578,7 @@ void append_simple_event(struct bt_ctf_stream_class *stream_class, ret_event_class = bt_ctf_stream_class_get_event_class(stream_class, 0); ok(ret_event_class == simple_event_class, "bt_ctf_stream_class_get_event_class returns the correct event class"); - bt_ctf_event_class_put(ret_event_class); + bt_put(ret_event_class); ok(!bt_ctf_stream_class_get_event_class_by_id(NULL, 0), "bt_ctf_stream_class_get_event_class_by_id handles NULL correctly"); ok(!bt_ctf_stream_class_get_event_class_by_id(stream_class, 2), @@ -500,7 +587,7 @@ void append_simple_event(struct bt_ctf_stream_class *stream_class, bt_ctf_stream_class_get_event_class_by_id(stream_class, 13); ok(ret_event_class == simple_event_class, "bt_ctf_stream_class_get_event_class_by_id returns a correct event class"); - bt_ctf_event_class_put(ret_event_class); + bt_put(ret_event_class); ok(bt_ctf_stream_class_get_event_class_by_name(NULL, "some event name") == NULL, "bt_ctf_stream_class_get_event_class_by_name handles a NULL stream class correctly"); @@ -511,7 +598,7 @@ void append_simple_event(struct bt_ctf_stream_class *stream_class, ret_event_class = bt_ctf_stream_class_get_event_class_by_name(stream_class, "Simple Event"); ok(ret_event_class == simple_event_class, "bt_ctf_stream_class_get_event_class_by_name returns a correct event class"); - bt_ctf_event_class_put(ret_event_class); + bt_put(ret_event_class); simple_event = bt_ctf_event_create(simple_event_class); ok(simple_event, @@ -522,7 +609,7 @@ void append_simple_event(struct bt_ctf_stream_class *stream_class, ret_clock = bt_ctf_event_get_clock(simple_event); ok(ret_clock == clock, "bt_ctf_event_get_clock returns a correct clock"); - bt_ctf_clock_put(clock); + bt_put(clock); integer_field = bt_ctf_field_create(uint_12_type); bt_ctf_field_unsigned_integer_set_value(integer_field, 42); @@ -566,7 +653,7 @@ void append_simple_event(struct bt_ctf_stream_class *stream_class, bt_ctf_event_set_payload(simple_event, "enum_field_unsigned", enum_field_unsigned); ret_char = bt_ctf_field_enumeration_get_mapping_name(enum_field_unsigned); - ok(!strcmp(ret_char, mapping_name_test), + ok(ret_char && !strcmp(ret_char, mapping_name_test), "bt_ctf_field_enumeration_get_mapping_name returns the correct mapping name with an unsigned container"); ok(bt_ctf_clock_set_time(clock, current_time) == 0, "Set clock time"); @@ -599,6 +686,7 @@ void append_simple_event(struct bt_ctf_stream_class *stream_class, ok(!bt_ctf_event_set_event_context(simple_event, event_context), "Set an event context successfully"); + event_copy_tests(simple_event); ok(bt_ctf_stream_append_event(stream, simple_event) == 0, "Append simple event to trace stream"); @@ -612,7 +700,7 @@ void append_simple_event(struct bt_ctf_stream_class *stream_class, "packet_size"); ok(packet_context_field, "Packet context contains the default packet_size field."); - bt_ctf_field_put(packet_context_field); + bt_put(packet_context_field); packet_context_field = bt_ctf_field_structure_get_field(packet_context, "custom_packet_context_field"); ok(bt_ctf_field_unsigned_integer_set_value(packet_context_field, 8) == 0, @@ -628,27 +716,27 @@ void append_simple_event(struct bt_ctf_stream_class *stream_class, ok(bt_ctf_stream_flush(stream) == 0, "Flush trace stream with one event"); - bt_ctf_event_class_put(simple_event_class); - bt_ctf_event_put(simple_event); - bt_ctf_field_type_put(uint_12_type); - bt_ctf_field_type_put(int_64_type); - bt_ctf_field_type_put(float_type); - bt_ctf_field_type_put(enum_type); - bt_ctf_field_type_put(enum_type_unsigned); - bt_ctf_field_type_put(returned_type); - bt_ctf_field_type_put(event_context_type); - bt_ctf_field_put(integer_field); - bt_ctf_field_put(float_field); - bt_ctf_field_put(enum_field); - bt_ctf_field_put(enum_field_unsigned); - bt_ctf_field_put(enum_container_field); - bt_ctf_field_put(enum_container_field_unsigned); - bt_ctf_field_put(packet_context); - bt_ctf_field_put(packet_context_field); - bt_ctf_field_put(stream_event_context); - bt_ctf_field_put(stream_event_context_field); - bt_ctf_field_put(event_context); - bt_ctf_field_put(event_context_field); + bt_put(simple_event_class); + bt_put(simple_event); + bt_put(uint_12_type); + bt_put(int_64_type); + bt_put(float_type); + bt_put(enum_type); + bt_put(enum_type_unsigned); + bt_put(returned_type); + bt_put(event_context_type); + bt_put(integer_field); + bt_put(float_field); + bt_put(enum_field); + bt_put(enum_field_unsigned); + bt_put(enum_container_field); + bt_put(enum_container_field_unsigned); + bt_put(packet_context); + bt_put(packet_context_field); + bt_put(stream_event_context); + bt_put(stream_event_context_field); + bt_put(event_context); + bt_put(event_context_field); } void append_complex_event(struct bt_ctf_stream_class *stream_class, @@ -667,7 +755,11 @@ void append_complex_event(struct bt_ctf_stream_class *stream_class, int64_t int64_value; struct event_class_attrs_counts ; const char *complex_test_event_string = "Complex Test Event"; - const char *test_string = "Test string"; + const char *test_string_1 = "Test "; + const char *test_string_2 = "string "; + const char *test_string_3 = "abcdefghi"; + const char *test_string_4 = "abcd\0efg\0hi"; + const char *test_string_cat = "Test string abcdeabcd"; struct bt_ctf_field_type *uint_35_type = bt_ctf_field_type_integer_create(35); struct bt_ctf_field_type *int_16_type = @@ -700,8 +792,16 @@ void append_complex_event(struct bt_ctf_stream_class *stream_class, struct bt_ctf_stream_class *ret_stream_class; struct bt_ctf_event_class *ret_event_class; struct bt_ctf_field *packet_context, *packet_context_field; - struct bt_object *obj; - + struct bt_value *obj; + + ok(bt_ctf_field_type_set_alignment(int_16_type, 0), + "bt_ctf_field_type_set_alignment handles 0-alignment correctly"); + ok(bt_ctf_field_type_set_alignment(int_16_type, 3), + "bt_ctf_field_type_set_alignment handles wrong alignment correctly (3)"); + ok(bt_ctf_field_type_set_alignment(int_16_type, 24), + "bt_ctf_field_type_set_alignment handles wrong alignment correctly (24)"); + ok(!bt_ctf_field_type_set_alignment(int_16_type, 4), + "bt_ctf_field_type_set_alignment handles correct alignment correctly (4)"); bt_ctf_field_type_set_alignment(int_16_type, 32); bt_ctf_field_type_integer_set_signed(int_16_type, 1); bt_ctf_field_type_integer_set_base(uint_35_type, @@ -717,7 +817,7 @@ void append_complex_event(struct bt_ctf_stream_class *stream_class, array_type); ok(ret_field_type == int_16_type, "bt_ctf_field_type_array_get_element_type returns the correct type"); - bt_ctf_field_type_put(ret_field_type); + bt_put(ret_field_type); ok(bt_ctf_field_type_array_get_length(NULL) < 0, "bt_ctf_field_type_array_get_length handles NULL correctly"); @@ -769,12 +869,12 @@ void append_complex_event(struct bt_ctf_stream_class *stream_class, ret_field_type = bt_ctf_field_type_variant_get_tag_type(variant_type); ok(ret_field_type == enum_variant_type, "bt_ctf_field_type_variant_get_tag_type returns a correct tag type"); - bt_ctf_field_type_put(ret_field_type); + bt_put(ret_field_type); ok(bt_ctf_field_type_variant_get_tag_name(NULL) == NULL, "bt_ctf_field_type_variant_get_tag_name handles NULL correctly"); ret_string = bt_ctf_field_type_variant_get_tag_name(variant_type); - ok(!strcmp(ret_string, "variant_selector"), + ok(ret_string ? !strcmp(ret_string, "variant_selector") : 0, "bt_ctf_field_type_variant_get_tag_name returns the correct variant tag name"); ok(bt_ctf_field_type_variant_get_field_type_by_name(NULL, "INT16_TYPE") == NULL, @@ -786,7 +886,7 @@ void append_complex_event(struct bt_ctf_stream_class *stream_class, variant_type, "INT16_TYPE"); ok(ret_field_type == int_16_type, "bt_ctf_field_type_variant_get_field_type_by_name returns a correct field type"); - bt_ctf_field_type_put(ret_field_type); + bt_put(ret_field_type); ok(bt_ctf_field_type_variant_get_field_count(NULL) < 0, "bt_ctf_field_type_variant_get_field_count handles NULL correctly"); @@ -795,9 +895,10 @@ void append_complex_event(struct bt_ctf_stream_class *stream_class, ok(bt_ctf_field_type_variant_get_field(NULL, &ret_string, &ret_field_type, 0) < 0, "bt_ctf_field_type_variant_get_field handles a NULL type correctly"); - ok(bt_ctf_field_type_variant_get_field(variant_type, NULL, &ret_field_type, 0) < 0, + ok(bt_ctf_field_type_variant_get_field(variant_type, NULL, &ret_field_type, 0) == 0, "bt_ctf_field_type_variant_get_field handles a NULL field name correctly"); - ok(bt_ctf_field_type_variant_get_field(variant_type, &ret_string, NULL, 0) < 0, + bt_put(ret_field_type); + ok(bt_ctf_field_type_variant_get_field(variant_type, &ret_string, NULL, 0) == 0, "bt_ctf_field_type_variant_get_field handles a NULL field type correctly"); ok(bt_ctf_field_type_variant_get_field(variant_type, &ret_string, &ret_field_type, 200) < 0, "bt_ctf_field_type_variant_get_field handles an invalid index correctly"); @@ -807,7 +908,7 @@ void append_complex_event(struct bt_ctf_stream_class *stream_class, "bt_ctf_field_type_variant_get_field returns a correct field name"); ok(ret_field_type == int_16_type, "bt_ctf_field_type_variant_get_field returns a correct field type"); - bt_ctf_field_type_put(ret_field_type); + bt_put(ret_field_type); bt_ctf_field_type_structure_add_field(complex_structure_type, enum_variant_type, "variant_selector"); @@ -855,17 +956,18 @@ void append_complex_event(struct bt_ctf_stream_class *stream_class, "bt_ctf_event_class_get_id returns the correct value"); /* Test event class attributes */ - assert(obj = bt_object_integer_create_init(15)); + obj = bt_value_integer_create_init(15); + assert(obj); ok(bt_ctf_event_class_set_attribute(NULL, "id", obj), "bt_ctf_event_class_set_attribute handles a NULL event class correctly"); ok(bt_ctf_event_class_set_attribute(event_class, NULL, obj), "bt_ctf_event_class_set_attribute handles a NULL name correctly"); ok(bt_ctf_event_class_set_attribute(event_class, "id", NULL), "bt_ctf_event_class_set_attribute handles a NULL value correctly"); - assert(!bt_object_integer_set(obj, -3)); + assert(!bt_value_integer_set(obj, -3)); ok(bt_ctf_event_class_set_attribute(event_class, "id", obj), "bt_ctf_event_class_set_attribute fails with a negative \"id\" attribute"); - assert(!bt_object_integer_set(obj, 11)); + assert(!bt_value_integer_set(obj, 11)); ret = bt_ctf_event_class_set_attribute(event_class, "id", obj); ok(!ret && bt_ctf_event_class_get_id(event_class) == 11, "bt_ctf_event_class_set_attribute succeeds in replacing the existing \"id\" attribute"); @@ -873,12 +975,13 @@ void append_complex_event(struct bt_ctf_stream_class *stream_class, ret &= bt_ctf_event_class_set_attribute(event_class, "model.emf.uri", obj); ok(ret, "bt_ctf_event_class_set_attribute cannot set \"name\" or \"model.emf.uri\" to an integer value"); - BT_OBJECT_PUT(obj); + BT_PUT(obj); - assert(obj = bt_object_integer_create_init(5)); + obj = bt_value_integer_create_init(5); + assert(obj); ok(!bt_ctf_event_class_set_attribute(event_class, "loglevel", obj), "bt_ctf_event_class_set_attribute succeeds in setting the \"loglevel\" attribute"); - BT_OBJECT_PUT(obj); + BT_PUT(obj); ok(!bt_ctf_event_class_get_attribute_value_by_name(NULL, "loglevel"), "bt_ctf_event_class_get_attribute_value_by_name handles a NULL event class correctly"); ok(!bt_ctf_event_class_get_attribute_value_by_name(event_class, NULL), @@ -888,12 +991,13 @@ void append_complex_event(struct bt_ctf_stream_class *stream_class, obj = bt_ctf_event_class_get_attribute_value_by_name(event_class, "loglevel"); int64_value = 0; - ret = bt_object_integer_get(obj, &int64_value); + ret = bt_value_integer_get(obj, &int64_value); ok(obj && !ret && int64_value == 5, "bt_ctf_event_class_get_attribute_value_by_name returns the correct value"); - BT_OBJECT_PUT(obj); + BT_PUT(obj); - assert(obj = bt_object_string_create_init("nu name")); + obj = bt_value_string_create_init("nu name"); + assert(obj); assert(!bt_ctf_event_class_set_attribute(event_class, "name", obj)); ret_string = bt_ctf_event_class_get_name(event_class); ok(!strcmp(ret_string, "nu name"), @@ -902,10 +1006,11 @@ void append_complex_event(struct bt_ctf_stream_class *stream_class, ret &= bt_ctf_event_class_set_attribute(event_class, "loglevel", obj); ok(ret, "bt_ctf_event_class_set_attribute cannot set \"id\" or \"loglevel\" to a string value"); - BT_OBJECT_PUT(obj); - assert(obj = bt_object_string_create_init("http://kernel.org/")); + BT_PUT(obj); + obj = bt_value_string_create_init("http://kernel.org/"); + assert(obj); assert(!bt_ctf_event_class_set_attribute(event_class, "model.emf.uri", obj)); - BT_OBJECT_PUT(obj); + BT_PUT(obj); ok(bt_ctf_event_class_get_attribute_count(NULL), "bt_ctf_event_class_get_attribute_count handles a NULL event class"); @@ -930,29 +1035,29 @@ void append_complex_event(struct bt_ctf_stream_class *stream_class, if (!strcmp(ret_string, "id")) { attrs_count.id++; - ok(bt_object_is_integer(obj), + ok(bt_value_is_integer(obj), "bt_ctf_event_class_get_attribute_value returns the correct type (\"%s\")", ret_string); } else if (!strcmp(ret_string, "name")) { attrs_count.name++; - ok(bt_object_is_string(obj), + ok(bt_value_is_string(obj), "bt_ctf_event_class_get_attribute_value returns the correct type (\"%s\")", ret_string); } else if (!strcmp(ret_string, "loglevel")) { attrs_count.loglevel++; - ok(bt_object_is_integer(obj), + ok(bt_value_is_integer(obj), "bt_ctf_event_class_get_attribute_value returns the correct type (\"%s\")", ret_string); } else if (!strcmp(ret_string, "model.emf.uri")) { attrs_count.modelemfuri++; - ok(bt_object_is_string(obj), + ok(bt_value_is_string(obj), "bt_ctf_event_class_get_attribute_value returns the correct type (\"%s\")", ret_string); } else { attrs_count.unknown++; } - BT_OBJECT_PUT(obj); + BT_PUT(obj); } ok(attrs_count.unknown == 0, "event class has no unknown attributes"); @@ -971,7 +1076,7 @@ void append_complex_event(struct bt_ctf_stream_class *stream_class, ret_stream_class = bt_ctf_event_class_get_stream_class(event_class); ok(ret_stream_class == stream_class, "bt_ctf_event_class_get_stream_class returns the correct stream class"); - bt_ctf_stream_class_put(ret_stream_class); + bt_put(ret_stream_class); ok(bt_ctf_event_class_get_field_count(NULL) < 0, "bt_ctf_event_class_get_field_count handles NULL correctly"); @@ -982,10 +1087,11 @@ void append_complex_event(struct bt_ctf_stream_class *stream_class, &ret_field_type, 0) < 0, "bt_ctf_event_class_get_field handles a NULL event class correctly"); ok(bt_ctf_event_class_get_field(event_class, NULL, - &ret_field_type, 0) < 0, + &ret_field_type, 0) == 0, "bt_ctf_event_class_get_field handles a NULL field name correctly"); + bt_put(ret_field_type); ok(bt_ctf_event_class_get_field(event_class, &ret_string, - NULL, 0) < 0, + NULL, 0) == 0, "bt_ctf_event_class_get_field handles a NULL field type correctly"); ok(bt_ctf_event_class_get_field(event_class, &ret_string, &ret_field_type, 42) < 0, @@ -995,7 +1101,7 @@ void append_complex_event(struct bt_ctf_stream_class *stream_class, "bt_ctf_event_class_get_field returns a field"); ok(ret_field_type == uint_35_type, "bt_ctf_event_class_get_field returns a correct field type"); - bt_ctf_field_type_put(ret_field_type); + bt_put(ret_field_type); ok(!strcmp(ret_string, "uint_35"), "bt_ctf_event_class_get_field returns a correct field name"); ok(bt_ctf_event_class_get_field_by_name(NULL, "") == NULL, @@ -1008,7 +1114,7 @@ void append_complex_event(struct bt_ctf_stream_class *stream_class, "complex_structure"); ok(ret_field_type == complex_structure_type, "bt_ctf_event_class_get_field_by_name returns a correct field type"); - bt_ctf_field_type_put(ret_field_type); + bt_put(ret_field_type); event = bt_ctf_event_create(event_class); ok(event, "Instanciate a complex event"); @@ -1018,7 +1124,7 @@ void append_complex_event(struct bt_ctf_stream_class *stream_class, ret_event_class = bt_ctf_event_get_class(event); ok(ret_event_class == event_class, "bt_ctf_event_get_class returns the correct event class"); - bt_ctf_event_class_put(ret_event_class); + bt_put(ret_event_class); uint_35_field = bt_ctf_event_get_payload(event, "uint_35"); if (!uint_35_field) { @@ -1039,7 +1145,7 @@ void append_complex_event(struct bt_ctf_stream_class *stream_class, ok(bt_ctf_field_signed_integer_get_value(uint_35_field, &ret_signed_int) < 0, "bt_ctf_field_signed_integer_get_value fails on an unsigned field"); - bt_ctf_field_put(uint_35_field); + bt_put(uint_35_field); int_16_field = bt_ctf_event_get_payload(event, "int_16"); bt_ctf_field_signed_integer_set_value(int_16_field, -12345); @@ -1055,7 +1161,7 @@ void append_complex_event(struct bt_ctf_stream_class *stream_class, ok(bt_ctf_field_unsigned_integer_get_value(int_16_field, &ret_unsigned_int) < 0, "bt_ctf_field_unsigned_integer_get_value fails on a signed field"); - bt_ctf_field_put(int_16_field); + bt_put(int_16_field); complex_structure_field = bt_ctf_event_get_payload(event, "complex_structure"); @@ -1067,10 +1173,10 @@ void append_complex_event(struct bt_ctf_stream_class *stream_class, inner_structure_field = bt_ctf_field_structure_get_field_by_index( complex_structure_field, 3); ret_field_type = bt_ctf_field_get_type(inner_structure_field); - bt_ctf_field_put(inner_structure_field); + bt_put(inner_structure_field); ok(ret_field_type == inner_structure_type, "bt_ctf_field_structure_get_field_by_index returns a correct field"); - bt_ctf_field_type_put(ret_field_type); + bt_put(ret_field_type); inner_structure_field = bt_ctf_field_structure_get_field( complex_structure_field, "inner_structure"); @@ -1093,16 +1199,35 @@ void append_complex_event(struct bt_ctf_stream_class *stream_class, int_16_field = bt_ctf_field_variant_get_field(variant_field, enum_variant_field); bt_ctf_field_signed_integer_set_value(int_16_field, -200); - bt_ctf_field_put(int_16_field); + bt_put(int_16_field); ok(!bt_ctf_field_string_get_value(a_string_field), "bt_ctf_field_string_get_value returns NULL on an unset field"); bt_ctf_field_string_set_value(a_string_field, - test_string); + test_string_1); ok(!bt_ctf_field_string_get_value(NULL), "bt_ctf_field_string_get_value correctly handles NULL"); + ok(bt_ctf_field_string_append(NULL, "yeah"), + "bt_ctf_field_string_append correctly handles a NULL string field"); + ok(bt_ctf_field_string_append(a_string_field, NULL), + "bt_ctf_field_string_append correctly handles a NULL string value"); + ok(!bt_ctf_field_string_append(a_string_field, test_string_2), + "bt_ctf_field_string_append succeeds"); + ok(bt_ctf_field_string_append_len(NULL, "oh noes", 3), + "bt_ctf_field_string_append_len correctly handles a NULL string field"); + ok(bt_ctf_field_string_append_len(a_string_field, NULL, 3), + "bt_ctf_field_string_append_len correctly handles a NULL string value"); + ok(!bt_ctf_field_string_append_len(a_string_field, test_string_3, 5), + "bt_ctf_field_string_append_len succeeds (append 5 characters)"); + ok(!bt_ctf_field_string_append_len(a_string_field, test_string_4, 10), + "bt_ctf_field_string_append_len succeeds (append 4 characters)"); + ok(!bt_ctf_field_string_append_len(a_string_field, &test_string_4[4], 3), + "bt_ctf_field_string_append_len succeeds (append 0 characters)"); + ok(!bt_ctf_field_string_append_len(a_string_field, test_string_3, 0), + "bt_ctf_field_string_append_len succeeds (append 0 characters)"); + ret_string = bt_ctf_field_string_get_value(a_string_field); ok(ret_string, "bt_ctf_field_string_get_value returns a string"); - ok(ret_string ? !strcmp(ret_string, test_string) : 0, + ok(ret_string ? !strcmp(ret_string, test_string_cat) : 0, "bt_ctf_field_string_get_value returns a correct value"); bt_ctf_field_unsigned_integer_set_value(uint_35_field, SEQUENCE_TEST_LENGTH); @@ -1132,14 +1257,14 @@ void append_complex_event(struct bt_ctf_stream_class *stream_class, int_16_field = bt_ctf_field_sequence_get_field( a_sequence_field, i); bt_ctf_field_signed_integer_set_value(int_16_field, 4 - i); - bt_ctf_field_put(int_16_field); + bt_put(int_16_field); } for (i = 0; i < ARRAY_TEST_LENGTH; i++) { int_16_field = bt_ctf_field_array_get_field( an_array_field, i); bt_ctf_field_signed_integer_set_value(int_16_field, i); - bt_ctf_field_put(int_16_field); + bt_put(int_16_field); } bt_ctf_clock_set_time(clock, ++current_time); @@ -1158,31 +1283,558 @@ void append_complex_event(struct bt_ctf_stream_class *stream_class, ok(bt_ctf_stream_flush(stream) == 0, "Flush a stream containing a complex event"); - bt_ctf_field_put(uint_35_field); - bt_ctf_field_put(a_string_field); - bt_ctf_field_put(inner_structure_field); - bt_ctf_field_put(complex_structure_field); - bt_ctf_field_put(a_sequence_field); - bt_ctf_field_put(an_array_field); - bt_ctf_field_put(enum_variant_field); - bt_ctf_field_put(enum_container_field); - bt_ctf_field_put(variant_field); - bt_ctf_field_put(ret_field); - bt_ctf_field_put(packet_context_field); - bt_ctf_field_put(packet_context); - bt_ctf_field_type_put(uint_35_type); - bt_ctf_field_type_put(int_16_type); - bt_ctf_field_type_put(string_type); - bt_ctf_field_type_put(sequence_type); - bt_ctf_field_type_put(array_type); - bt_ctf_field_type_put(inner_structure_type); - bt_ctf_field_type_put(complex_structure_type); - bt_ctf_field_type_put(uint_3_type); - bt_ctf_field_type_put(enum_variant_type); - bt_ctf_field_type_put(variant_type); - bt_ctf_field_type_put(ret_field_type); - bt_ctf_event_class_put(event_class); - bt_ctf_event_put(event); + bt_put(uint_35_field); + bt_put(a_string_field); + bt_put(inner_structure_field); + bt_put(complex_structure_field); + bt_put(a_sequence_field); + bt_put(an_array_field); + bt_put(enum_variant_field); + bt_put(enum_container_field); + bt_put(variant_field); + bt_put(ret_field); + bt_put(packet_context_field); + bt_put(packet_context); + bt_put(uint_35_type); + bt_put(int_16_type); + bt_put(string_type); + bt_put(sequence_type); + bt_put(array_type); + bt_put(inner_structure_type); + bt_put(complex_structure_type); + bt_put(uint_3_type); + bt_put(enum_variant_type); + bt_put(variant_type); + bt_put(ret_field_type); + bt_put(event_class); + bt_put(event); +} + +static void field_copy_tests_validate_same_type(struct bt_ctf_field *field, + struct bt_ctf_field_type *expected_type, const char *name) +{ + struct bt_ctf_field_type *copy_type; + + copy_type = bt_ctf_field_get_type(field); + ok(copy_type == expected_type, + "bt_ctf_field_copy does not copy the type (%s)", name); + bt_put(copy_type); +} + +static void field_copy_tests_validate_diff_ptrs(struct bt_ctf_field *field_a, + struct bt_ctf_field *field_b, const char *name) +{ + ok(field_a != field_b, + "bt_ctf_field_copy creates different pointers (%s)", name); +} + +void field_copy_tests() +{ + struct bt_ctf_field_type *len_type = NULL; + struct bt_ctf_field_type *fp_type = NULL; + struct bt_ctf_field_type *s_type = NULL; + struct bt_ctf_field_type *e_int_type = NULL; + struct bt_ctf_field_type *e_type = NULL; + struct bt_ctf_field_type *v_type = NULL; + struct bt_ctf_field_type *v_label1_type = NULL; + struct bt_ctf_field_type *v_label1_array_type = NULL; + struct bt_ctf_field_type *v_label2_type = NULL; + struct bt_ctf_field_type *v_label2_seq_type = NULL; + struct bt_ctf_field_type *strct_type = NULL; + struct bt_ctf_field *len = NULL; + struct bt_ctf_field *fp = NULL; + struct bt_ctf_field *s = NULL; + struct bt_ctf_field *e_int = NULL; + struct bt_ctf_field *e = NULL; + struct bt_ctf_field *v = NULL; + struct bt_ctf_field *v_selected = NULL; + struct bt_ctf_field *v_selected_cur = NULL; + struct bt_ctf_field *v_selected_0 = NULL; + struct bt_ctf_field *v_selected_1 = NULL; + struct bt_ctf_field *v_selected_2 = NULL; + struct bt_ctf_field *v_selected_3 = NULL; + struct bt_ctf_field *v_selected_4 = NULL; + struct bt_ctf_field *v_selected_5 = NULL; + struct bt_ctf_field *v_selected_6 = NULL; + struct bt_ctf_field *a = NULL; + struct bt_ctf_field *a_0 = NULL; + struct bt_ctf_field *a_1 = NULL; + struct bt_ctf_field *a_2 = NULL; + struct bt_ctf_field *a_3 = NULL; + struct bt_ctf_field *a_4 = NULL; + struct bt_ctf_field *strct = NULL; + struct bt_ctf_field *len_copy = NULL; + struct bt_ctf_field *fp_copy = NULL; + struct bt_ctf_field *s_copy = NULL; + struct bt_ctf_field *e_int_copy = NULL; + struct bt_ctf_field *e_copy = NULL; + struct bt_ctf_field *v_copy = NULL; + struct bt_ctf_field *v_selected_copy = NULL; + struct bt_ctf_field *v_selected_copy_len = NULL; + struct bt_ctf_field *v_selected_0_copy = NULL; + struct bt_ctf_field *v_selected_1_copy = NULL; + struct bt_ctf_field *v_selected_2_copy = NULL; + struct bt_ctf_field *v_selected_3_copy = NULL; + struct bt_ctf_field *v_selected_4_copy = NULL; + struct bt_ctf_field *v_selected_5_copy = NULL; + struct bt_ctf_field *v_selected_6_copy = NULL; + struct bt_ctf_field *a_copy = NULL; + struct bt_ctf_field *a_0_copy = NULL; + struct bt_ctf_field *a_1_copy = NULL; + struct bt_ctf_field *a_2_copy = NULL; + struct bt_ctf_field *a_3_copy = NULL; + struct bt_ctf_field *a_4_copy = NULL; + struct bt_ctf_field *strct_copy = NULL; + uint64_t uint64_t_val; + const char *str_val; + double double_val; + int ret; + + /* create len type */ + len_type = bt_ctf_field_type_integer_create(32); + assert(len_type); + + /* create fp type */ + fp_type = bt_ctf_field_type_floating_point_create(); + assert(fp_type); + + /* create s type */ + s_type = bt_ctf_field_type_string_create(); + assert(s_type); + + /* create e_int type */ + e_int_type = bt_ctf_field_type_integer_create(8); + assert(e_int_type); + + /* create e type */ + e_type = bt_ctf_field_type_enumeration_create(e_int_type); + assert(e_type); + ret = bt_ctf_field_type_enumeration_add_mapping(e_type, "LABEL1", + 10, 15); + assert(!ret); + ret = bt_ctf_field_type_enumeration_add_mapping(e_type, "LABEL2", + 23, 23); + assert(!ret); + + /* create v_label1 type */ + v_label1_type = bt_ctf_field_type_string_create(); + assert(v_label1_type); + + /* create v_label1_array type */ + v_label1_array_type = bt_ctf_field_type_array_create(v_label1_type, 5); + assert(v_label1_array_type); + + /* create v_label2 type */ + v_label2_type = bt_ctf_field_type_integer_create(16); + assert(v_label2_type); + + /* create v_label2_seq type */ + v_label2_seq_type = bt_ctf_field_type_sequence_create(v_label2_type, + "len"); + assert(v_label2_seq_type); + + /* create v type */ + v_type = bt_ctf_field_type_variant_create(e_type, "e"); + assert(v_type); + ret = bt_ctf_field_type_variant_add_field(v_type, v_label1_array_type, + "LABEL1"); + assert(!ret); + ret = bt_ctf_field_type_variant_add_field(v_type, v_label2_seq_type, + "LABEL2"); + assert(!ret); + + /* create strct type */ + strct_type = bt_ctf_field_type_structure_create(); + assert(strct_type); + ret = bt_ctf_field_type_structure_add_field(strct_type, len_type, + "len"); + assert(!ret); + ret = bt_ctf_field_type_structure_add_field(strct_type, fp_type, "fp"); + assert(!ret); + ret = bt_ctf_field_type_structure_add_field(strct_type, s_type, "s"); + assert(!ret); + ret = bt_ctf_field_type_structure_add_field(strct_type, e_type, "e"); + assert(!ret); + ret = bt_ctf_field_type_structure_add_field(strct_type, v_type, "v"); + assert(!ret); + ret = bt_ctf_field_type_structure_add_field(strct_type, + v_label1_array_type, "a"); + assert(!ret); + + /* create strct */ + strct = bt_ctf_field_create(strct_type); + assert(strct); + + /* get len field */ + len = bt_ctf_field_structure_get_field(strct, "len"); + assert(len); + + /* get fp field */ + fp = bt_ctf_field_structure_get_field(strct, "fp"); + assert(fp); + + /* get s field */ + s = bt_ctf_field_structure_get_field(strct, "s"); + assert(s); + + /* get e field */ + e = bt_ctf_field_structure_get_field(strct, "e"); + assert(e); + + /* get e_int (underlying integer) */ + e_int = bt_ctf_field_enumeration_get_container(e); + assert(e_int); + + /* get v field */ + v = bt_ctf_field_structure_get_field(strct, "v"); + assert(v); + + /* get a field */ + a = bt_ctf_field_structure_get_field(strct, "a"); + assert(a); + + /* set len field */ + ret = bt_ctf_field_unsigned_integer_set_value(len, 7); + assert(!ret); + + /* set fp field */ + ret = bt_ctf_field_floating_point_set_value(fp, 3.14); + assert(!ret); + + /* set s field */ + ret = bt_ctf_field_string_set_value(s, "btbt"); + assert(!ret); + + /* set e field (LABEL2) */ + ret = bt_ctf_field_unsigned_integer_set_value(e_int, 23); + assert(!ret); + + /* set v field */ + v_selected = bt_ctf_field_variant_get_field(v, e); + assert(v_selected); + ok(!bt_ctf_field_variant_get_current_field(NULL), + "bt_ctf_field_variant_get_current_field handles NULL correctly"); + v_selected_cur = bt_ctf_field_variant_get_current_field(v); + ok(v_selected_cur == v_selected, + "bt_ctf_field_variant_get_current_field returns the current field"); + bt_put(v_selected_cur); + + /* set selected v field */ + ret = bt_ctf_field_sequence_set_length(v_selected, len); + assert(!ret); + v_selected_0 = bt_ctf_field_sequence_get_field(v_selected, 0); + assert(v_selected_0); + ret = bt_ctf_field_unsigned_integer_set_value(v_selected_0, 7); + assert(!ret); + v_selected_1 = bt_ctf_field_sequence_get_field(v_selected, 1); + assert(v_selected_1); + ret = bt_ctf_field_unsigned_integer_set_value(v_selected_1, 6); + assert(!ret); + v_selected_2 = bt_ctf_field_sequence_get_field(v_selected, 2); + assert(v_selected_2); + ret = bt_ctf_field_unsigned_integer_set_value(v_selected_2, 5); + assert(!ret); + v_selected_3 = bt_ctf_field_sequence_get_field(v_selected, 3); + assert(v_selected_3); + ret = bt_ctf_field_unsigned_integer_set_value(v_selected_3, 4); + assert(!ret); + v_selected_4 = bt_ctf_field_sequence_get_field(v_selected, 4); + assert(v_selected_4); + ret = bt_ctf_field_unsigned_integer_set_value(v_selected_4, 3); + assert(!ret); + v_selected_5 = bt_ctf_field_sequence_get_field(v_selected, 5); + assert(v_selected_5); + ret = bt_ctf_field_unsigned_integer_set_value(v_selected_5, 2); + assert(!ret); + v_selected_6 = bt_ctf_field_sequence_get_field(v_selected, 6); + assert(v_selected_6); + ret = bt_ctf_field_unsigned_integer_set_value(v_selected_6, 1); + assert(!ret); + + /* set a field */ + a_0 = bt_ctf_field_array_get_field(a, 0); + assert(a_0); + ret = bt_ctf_field_string_set_value(a_0, "a_0"); + assert(!ret); + a_1 = bt_ctf_field_array_get_field(a, 1); + assert(a_1); + ret = bt_ctf_field_string_set_value(a_1, "a_1"); + assert(!ret); + a_2 = bt_ctf_field_array_get_field(a, 2); + assert(a_2); + ret = bt_ctf_field_string_set_value(a_2, "a_2"); + assert(!ret); + a_3 = bt_ctf_field_array_get_field(a, 3); + assert(a_3); + ret = bt_ctf_field_string_set_value(a_3, "a_3"); + assert(!ret); + a_4 = bt_ctf_field_array_get_field(a, 4); + assert(a_4); + ret = bt_ctf_field_string_set_value(a_4, "a_4"); + assert(!ret); + + /* create copy of strct */ + ok(!bt_ctf_field_copy(NULL), + "bt_ctf_field_copy handles NULL correctly"); + strct_copy = bt_ctf_field_copy(strct); + ok(strct_copy, + "bt_ctf_field_copy returns a valid pointer"); + + /* get all copied fields */ + len_copy = bt_ctf_field_structure_get_field(strct_copy, "len"); + assert(len_copy); + fp_copy = bt_ctf_field_structure_get_field(strct_copy, "fp"); + assert(fp_copy); + s_copy = bt_ctf_field_structure_get_field(strct_copy, "s"); + assert(s_copy); + e_copy = bt_ctf_field_structure_get_field(strct_copy, "e"); + assert(e_copy); + e_int_copy = bt_ctf_field_enumeration_get_container(e_copy); + assert(e_int_copy); + v_copy = bt_ctf_field_structure_get_field(strct_copy, "v"); + assert(v_copy); + v_selected_copy = bt_ctf_field_variant_get_field(v_copy, e_copy); + assert(v_selected_copy); + v_selected_0_copy = bt_ctf_field_sequence_get_field(v_selected_copy, 0); + assert(v_selected_0_copy); + v_selected_1_copy = bt_ctf_field_sequence_get_field(v_selected_copy, 1); + assert(v_selected_1_copy); + v_selected_2_copy = bt_ctf_field_sequence_get_field(v_selected_copy, 2); + assert(v_selected_2_copy); + v_selected_3_copy = bt_ctf_field_sequence_get_field(v_selected_copy, 3); + assert(v_selected_3_copy); + v_selected_4_copy = bt_ctf_field_sequence_get_field(v_selected_copy, 4); + assert(v_selected_4_copy); + v_selected_5_copy = bt_ctf_field_sequence_get_field(v_selected_copy, 5); + assert(v_selected_5_copy); + v_selected_6_copy = bt_ctf_field_sequence_get_field(v_selected_copy, 6); + assert(v_selected_6_copy); + ok(!bt_ctf_field_sequence_get_field(v_selected_copy, 7), + "sequence field copy is not too large"); + a_copy = bt_ctf_field_structure_get_field(strct_copy, "a"); + assert(a_copy); + a_0_copy = bt_ctf_field_array_get_field(a_copy, 0); + assert(a_0_copy); + a_1_copy = bt_ctf_field_array_get_field(a_copy, 1); + assert(a_1_copy); + a_2_copy = bt_ctf_field_array_get_field(a_copy, 2); + assert(a_2_copy); + a_3_copy = bt_ctf_field_array_get_field(a_copy, 3); + assert(a_3_copy); + a_4_copy = bt_ctf_field_array_get_field(a_copy, 4); + assert(a_4_copy); + ok(!bt_ctf_field_array_get_field(v_selected_copy, 5), + "array field copy is not too large"); + + /* make sure copied fields are different pointers */ + field_copy_tests_validate_diff_ptrs(strct_copy, strct, "strct"); + field_copy_tests_validate_diff_ptrs(len_copy, len, "len"); + field_copy_tests_validate_diff_ptrs(fp_copy, fp, "fp"); + field_copy_tests_validate_diff_ptrs(s_copy, s, "s"); + field_copy_tests_validate_diff_ptrs(e_int_copy, e_int, "e_int"); + field_copy_tests_validate_diff_ptrs(e_copy, e, "e"); + field_copy_tests_validate_diff_ptrs(v_copy, v, "v"); + field_copy_tests_validate_diff_ptrs(v_selected_copy, v_selected, + "v_selected"); + field_copy_tests_validate_diff_ptrs(v_selected_0_copy, v_selected_0, + "v_selected_0"); + field_copy_tests_validate_diff_ptrs(v_selected_1_copy, v_selected_1, + "v_selected_1"); + field_copy_tests_validate_diff_ptrs(v_selected_2_copy, v_selected_2, + "v_selected_2"); + field_copy_tests_validate_diff_ptrs(v_selected_3_copy, v_selected_3, + "v_selected_3"); + field_copy_tests_validate_diff_ptrs(v_selected_4_copy, v_selected_4, + "v_selected_4"); + field_copy_tests_validate_diff_ptrs(v_selected_5_copy, v_selected_5, + "v_selected_5"); + field_copy_tests_validate_diff_ptrs(v_selected_6_copy, v_selected_6, + "v_selected_6"); + field_copy_tests_validate_diff_ptrs(a_copy, a, "a"); + field_copy_tests_validate_diff_ptrs(a_0_copy, a_0, "a_0"); + field_copy_tests_validate_diff_ptrs(a_1_copy, a_1, "a_1"); + field_copy_tests_validate_diff_ptrs(a_2_copy, a_2, "a_2"); + field_copy_tests_validate_diff_ptrs(a_3_copy, a_3, "a_3"); + field_copy_tests_validate_diff_ptrs(a_4_copy, a_4, "a_4"); + + /* make sure copied fields share the same types */ + field_copy_tests_validate_same_type(strct_copy, strct_type, "strct"); + field_copy_tests_validate_same_type(len_copy, len_type, "len"); + field_copy_tests_validate_same_type(fp_copy, fp_type, "fp"); + field_copy_tests_validate_same_type(e_int_copy, e_int_type, "e_int"); + field_copy_tests_validate_same_type(e_copy, e_type, "e"); + field_copy_tests_validate_same_type(v_copy, v_type, "v"); + field_copy_tests_validate_same_type(v_selected_copy, v_label2_seq_type, + "v_selected"); + field_copy_tests_validate_same_type(v_selected_0_copy, v_label2_type, + "v_selected_0"); + field_copy_tests_validate_same_type(v_selected_1_copy, v_label2_type, + "v_selected_1"); + field_copy_tests_validate_same_type(v_selected_2_copy, v_label2_type, + "v_selected_2"); + field_copy_tests_validate_same_type(v_selected_3_copy, v_label2_type, + "v_selected_3"); + field_copy_tests_validate_same_type(v_selected_4_copy, v_label2_type, + "v_selected_4"); + field_copy_tests_validate_same_type(v_selected_5_copy, v_label2_type, + "v_selected_5"); + field_copy_tests_validate_same_type(v_selected_6_copy, v_label2_type, + "v_selected_6"); + field_copy_tests_validate_same_type(a_copy, v_label1_array_type, "a"); + field_copy_tests_validate_same_type(a_0_copy, v_label1_type, "a_0"); + field_copy_tests_validate_same_type(a_1_copy, v_label1_type, "a_1"); + field_copy_tests_validate_same_type(a_2_copy, v_label1_type, "a_2"); + field_copy_tests_validate_same_type(a_3_copy, v_label1_type, "a_3"); + field_copy_tests_validate_same_type(a_4_copy, v_label1_type, "a_4"); + + /* validate len copy */ + ret = bt_ctf_field_unsigned_integer_get_value(len_copy, &uint64_t_val); + assert(!ret); + ok(uint64_t_val == 7, + "bt_ctf_field_copy creates a valid integer field copy"); + + /* validate fp copy */ + ret = bt_ctf_field_floating_point_get_value(fp_copy, &double_val); + assert(!ret); + ok(double_val == 3.14, + "bt_ctf_field_copy creates a valid floating point number field copy"); + + /* validate s copy */ + str_val = bt_ctf_field_string_get_value(s_copy); + ok(str_val && !strcmp(str_val, "btbt"), + "bt_ctf_field_copy creates a valid string field copy"); + + /* validate e_int copy */ + ret = bt_ctf_field_unsigned_integer_get_value(e_int_copy, + &uint64_t_val); + assert(!ret); + ok(uint64_t_val == 23, + "bt_ctf_field_copy creates a valid enum's integer field copy"); + + /* validate e copy */ + str_val = bt_ctf_field_enumeration_get_mapping_name(e_copy); + ok(str_val && !strcmp(str_val, "LABEL2"), + "bt_ctf_field_copy creates a valid enum field copy"); + + /* validate v_selected copy */ + v_selected_copy_len = bt_ctf_field_sequence_get_length(v_selected); + assert(v_selected_copy_len); + ret = bt_ctf_field_unsigned_integer_get_value(v_selected_copy_len, + &uint64_t_val); + assert(!ret); + ok(uint64_t_val == 7, + "bt_ctf_field_copy creates a sequence field copy with the proper length"); + bt_put(v_selected_copy_len); + v_selected_copy_len = NULL; + + /* validate v_selected copy fields */ + ret = bt_ctf_field_unsigned_integer_get_value(v_selected_0_copy, + &uint64_t_val); + assert(!ret); + ok(uint64_t_val == 7, + "bt_ctf_field_copy creates a valid sequence field element copy (v_selected_0)"); + ret = bt_ctf_field_unsigned_integer_get_value(v_selected_1_copy, + &uint64_t_val); + assert(!ret); + ok(uint64_t_val == 6, + "bt_ctf_field_copy creates a valid sequence field element copy (v_selected_1)"); + ret = bt_ctf_field_unsigned_integer_get_value(v_selected_2_copy, + &uint64_t_val); + assert(!ret); + ok(uint64_t_val == 5, + "bt_ctf_field_copy creates a valid sequence field element copy (v_selected_2)"); + ret = bt_ctf_field_unsigned_integer_get_value(v_selected_3_copy, + &uint64_t_val); + assert(!ret); + ok(uint64_t_val == 4, + "bt_ctf_field_copy creates a valid sequence field element copy (v_selected_3)"); + ret = bt_ctf_field_unsigned_integer_get_value(v_selected_4_copy, + &uint64_t_val); + assert(!ret); + ok(uint64_t_val == 3, + "bt_ctf_field_copy creates a valid sequence field element copy (v_selected_4)"); + ret = bt_ctf_field_unsigned_integer_get_value(v_selected_5_copy, + &uint64_t_val); + assert(!ret); + ok(uint64_t_val == 2, + "bt_ctf_field_copy creates a valid sequence field element copy (v_selected_5)"); + ret = bt_ctf_field_unsigned_integer_get_value(v_selected_6_copy, + &uint64_t_val); + assert(!ret); + ok(uint64_t_val == 1, + "bt_ctf_field_copy creates a valid sequence field element copy (v_selected_6)"); + + /* validate a copy fields */ + str_val = bt_ctf_field_string_get_value(a_0_copy); + ok(str_val && !strcmp(str_val, "a_0"), + "bt_ctf_field_copy creates a valid array field element copy (a_0)"); + str_val = bt_ctf_field_string_get_value(a_1_copy); + ok(str_val && !strcmp(str_val, "a_1"), + "bt_ctf_field_copy creates a valid array field element copy (a_1)"); + str_val = bt_ctf_field_string_get_value(a_2_copy); + ok(str_val && !strcmp(str_val, "a_2"), + "bt_ctf_field_copy creates a valid array field element copy (a_2)"); + str_val = bt_ctf_field_string_get_value(a_3_copy); + ok(str_val && !strcmp(str_val, "a_3"), + "bt_ctf_field_copy creates a valid array field element copy (a_3)"); + str_val = bt_ctf_field_string_get_value(a_4_copy); + ok(str_val && !strcmp(str_val, "a_4"), + "bt_ctf_field_copy creates a valid array field element copy (a_4)"); + + /* put everything */ + bt_put(len_type); + bt_put(fp_type); + bt_put(s_type); + bt_put(e_int_type); + bt_put(e_type); + bt_put(v_type); + bt_put(v_label1_type); + bt_put(v_label1_array_type); + bt_put(v_label2_type); + bt_put(v_label2_seq_type); + bt_put(strct_type); + bt_put(len); + bt_put(fp); + bt_put(s); + bt_put(e_int); + bt_put(e); + bt_put(v); + bt_put(v_selected); + bt_put(v_selected_0); + bt_put(v_selected_1); + bt_put(v_selected_2); + bt_put(v_selected_3); + bt_put(v_selected_4); + bt_put(v_selected_5); + bt_put(v_selected_6); + bt_put(a); + bt_put(a_0); + bt_put(a_1); + bt_put(a_2); + bt_put(a_3); + bt_put(a_4); + bt_put(strct); + bt_put(len_copy); + bt_put(fp_copy); + bt_put(s_copy); + bt_put(e_int_copy); + bt_put(e_copy); + bt_put(v_copy); + bt_put(v_selected_copy); + bt_put(v_selected_0_copy); + bt_put(v_selected_1_copy); + bt_put(v_selected_2_copy); + bt_put(v_selected_3_copy); + bt_put(v_selected_4_copy); + bt_put(v_selected_5_copy); + bt_put(v_selected_6_copy); + bt_put(a_copy); + bt_put(a_0_copy); + bt_put(a_1_copy); + bt_put(a_2_copy); + bt_put(a_3_copy); + bt_put(a_4_copy); + bt_put(strct_copy); } void type_field_tests() @@ -1309,7 +1961,7 @@ void type_field_tests() sequence_type); ok(returned_type == int_16_type, "bt_ctf_field_type_sequence_get_element_type returns the correct type"); - bt_ctf_field_type_put(returned_type); + bt_put(returned_type); string_type = bt_ctf_field_type_string_create(); ok(string_type, "Create a string type"); @@ -1351,10 +2003,11 @@ void type_field_tests() &ret_string, &returned_type, 1) < 0, "bt_ctf_field_type_structure_get_field handles a NULL type correctly"); ok(bt_ctf_field_type_structure_get_field(structure_seq_type, - NULL, &returned_type, 1) < 0, + NULL, &returned_type, 1) == 0, "bt_ctf_field_type_structure_get_field handles a NULL name correctly"); + bt_put(returned_type); ok(bt_ctf_field_type_structure_get_field(structure_seq_type, - &ret_string, NULL, 1) < 0, + &ret_string, NULL, 1) == 0, "bt_ctf_field_type_structure_get_field handles a NULL return type correctly"); ok(bt_ctf_field_type_structure_get_field(structure_seq_type, &ret_string, &returned_type, 10) < 0, @@ -1366,7 +2019,7 @@ void type_field_tests() "bt_ctf_field_type_structure_get_field returns a correct field name"); ok(returned_type == sequence_type, "bt_ctf_field_type_structure_get_field returns a correct field type"); - bt_ctf_field_type_put(returned_type); + bt_put(returned_type); ok(bt_ctf_field_type_structure_get_field_type_by_name(NULL, "a_sequence") == NULL, "bt_ctf_field_type_structure_get_field_type_by_name handles a NULL structure correctly"); @@ -1376,7 +2029,7 @@ void type_field_tests() structure_seq_type, "a_sequence"); ok(returned_type == sequence_type, "bt_ctf_field_type_structure_get_field_type_by_name returns the correct field type"); - bt_ctf_field_type_put(returned_type); + bt_put(returned_type); composite_structure_type = bt_ctf_field_type_structure_create(); ok(bt_ctf_field_type_structure_add_field(composite_structure_type, @@ -1396,7 +2049,7 @@ void type_field_tests() structure_seq_type, "a_sequence"); ok(returned_type == sequence_type, "bt_ctf_field_type_structure_get_field_type_by_name returns a correct type"); - bt_ctf_field_type_put(returned_type); + bt_put(returned_type); int_16 = bt_ctf_field_create(int_16_type); ok(int_16, "Instanciate a signed 16-bit integer"); @@ -1461,21 +2114,21 @@ void type_field_tests() ok(!enumeration, "Check enumeration types are validated before instantiation"); - bt_ctf_field_put(string); - bt_ctf_field_put(uint_12); - bt_ctf_field_put(int_16); - bt_ctf_field_put(enumeration); - bt_ctf_field_type_put(composite_structure_type); - bt_ctf_field_type_put(structure_seq_type); - bt_ctf_field_type_put(string_type); - bt_ctf_field_type_put(sequence_type); - bt_ctf_field_type_put(uint_8_type); - bt_ctf_field_type_put(int_16_type); - bt_ctf_field_type_put(uint_12_type); - bt_ctf_field_type_put(enumeration_type); - bt_ctf_field_type_put(enumeration_sequence_type); - bt_ctf_field_type_put(enumeration_array_type); - bt_ctf_field_type_put(returned_type); + bt_put(string); + bt_put(uint_12); + bt_put(int_16); + bt_put(enumeration); + bt_put(composite_structure_type); + bt_put(structure_seq_type); + bt_put(string_type); + bt_put(sequence_type); + bt_put(uint_8_type); + bt_put(int_16_type); + bt_put(uint_12_type); + bt_put(enumeration_type); + bt_put(enumeration_sequence_type); + bt_put(enumeration_array_type); + bt_put(returned_type); } void packet_resize_test(struct bt_ctf_stream_class *stream_class, @@ -1517,14 +2170,14 @@ void packet_resize_test(struct bt_ctf_stream_class *stream_class, ret_field_type = bt_ctf_field_get_type(ret_field); ok(ret_field_type == integer_type, "bt_ctf_event_get_payload_by_index returns a correct field"); - bt_ctf_field_type_put(ret_field_type); - bt_ctf_field_put(ret_field); + bt_put(ret_field_type); + bt_put(ret_field); ok(bt_ctf_event_get_payload_by_index(NULL, 0) == NULL, "bt_ctf_event_get_payload_by_index handles NULL correctly"); ok(bt_ctf_event_get_payload_by_index(event, 4) == NULL, "bt_ctf_event_get_payload_by_index handles an invalid index correctly"); - bt_ctf_event_put(event); + bt_put(event); ok(bt_ctf_stream_get_event_context(NULL) == NULL, "bt_ctf_stream_get_event_context handles NULL correctly"); @@ -1540,7 +2193,7 @@ void packet_resize_test(struct bt_ctf_stream_class *stream_class, ret_field = bt_ctf_field_create(integer_type); ok(bt_ctf_stream_set_event_context(stream, ret_field) < 0, "bt_ctf_stream_set_event_context rejects an event context of incorrect type"); - bt_ctf_field_put(ret_field); + bt_put(ret_field); for (i = 0; i < PACKET_RESIZE_TEST_LENGTH; i++) { event = bt_ctf_event_create(event_class); @@ -1553,21 +2206,21 @@ void packet_resize_test(struct bt_ctf_stream_class *stream_class, ret |= bt_ctf_field_unsigned_integer_set_value(integer, i); ret |= bt_ctf_event_set_payload(event, "field_1", integer); - bt_ctf_field_put(integer); + bt_put(integer); ret |= bt_ctf_field_string_set_value(string, "This is a test"); ret |= bt_ctf_event_set_payload(event, "a_string", string); - bt_ctf_field_put(string); + bt_put(string); /* Populate stream event context */ integer = bt_ctf_field_structure_get_field(event_context, "common_event_context"); ret |= bt_ctf_field_unsigned_integer_set_value(integer, i % 42); - bt_ctf_field_put(integer); + bt_put(integer); ret |= bt_ctf_stream_append_event(stream, event); - bt_ctf_event_put(event); + bt_put(event); if (ret) { break; @@ -1604,18 +2257,18 @@ end: ret = bt_ctf_stream_get_discarded_events_count(stream, &ret_uint64); ok(ret == 0 && ret_uint64 == 1000, "bt_ctf_stream_get_discarded_events_count returns a correct number of discarded events after a flush"); - bt_ctf_field_type_put(integer_type); - bt_ctf_field_type_put(string_type); - bt_ctf_field_put(packet_context); - bt_ctf_field_put(packet_context_field); - bt_ctf_field_put(event_context); - bt_ctf_event_class_put(event_class); + bt_put(integer_type); + bt_put(string_type); + bt_put(packet_context); + bt_put(packet_context_field); + bt_put(event_context); + bt_put(event_class); } void test_empty_stream(struct bt_ctf_writer *writer) { int ret = 0; - struct bt_ctf_trace *trace = NULL; + struct bt_ctf_trace *trace = NULL, *ret_trace = NULL; struct bt_ctf_stream_class *stream_class = NULL; struct bt_ctf_stream *stream = NULL; @@ -1633,18 +2286,233 @@ void test_empty_stream(struct bt_ctf_writer *writer) goto end; } + ok(bt_ctf_stream_class_get_trace(NULL) == NULL, + "bt_ctf_stream_class_get_trace handles NULL correctly"); + ok(bt_ctf_stream_class_get_trace(stream_class) == NULL, + "bt_ctf_stream_class_get_trace returns NULL when stream class is orphaned"); + stream = bt_ctf_writer_create_stream(writer, stream_class); if (!stream) { diag("Failed to create writer stream"); ret = -1; goto end; } + + ret_trace = bt_ctf_stream_class_get_trace(stream_class); + ok(ret_trace == trace, + "bt_ctf_stream_class_get_trace returns the correct trace after a stream has been created"); end: ok(ret == 0, "Created a stream class with default attributes and an empty stream"); - bt_ctf_trace_put(trace); - bt_ctf_stream_put(stream); - bt_ctf_stream_class_put(stream_class); + bt_put(trace); + bt_put(ret_trace); + bt_put(stream); + bt_put(stream_class); +} + +void test_custom_event_header_stream(struct bt_ctf_writer *writer) +{ + int i, ret; + struct bt_ctf_trace *trace = NULL; + struct bt_ctf_clock *clock = NULL; + struct bt_ctf_stream_class *stream_class = NULL; + struct bt_ctf_stream *stream = NULL; + struct bt_ctf_field_type *integer_type = NULL, + *sequence_type = NULL, *event_header_type = NULL; + struct bt_ctf_field *integer = NULL, *sequence = NULL, + *event_header = NULL, *packet_header = NULL; + struct bt_ctf_event_class *event_class = NULL; + struct bt_ctf_event *event = NULL; + + trace = bt_ctf_writer_get_trace(writer); + if (!trace) { + fail("Failed to get trace from writer"); + goto end; + } + + clock = bt_ctf_trace_get_clock(trace, 0); + if (!clock) { + fail("Failed to get clock from trace"); + goto end; + } + + stream_class = bt_ctf_stream_class_create("custom_event_header_stream"); + if (!stream_class) { + fail("Failed to create stream class"); + goto end; + } + + ret = bt_ctf_stream_class_set_clock(stream_class, clock); + if (ret) { + fail("Failed to set stream class clock"); + goto end; + } + + /* + * Customize event header to add an "seq_len" integer member + * which will be used as the length of a sequence in an event of this + * stream. + */ + event_header_type = bt_ctf_stream_class_get_event_header_type( + stream_class); + if (!event_header_type) { + fail("Failed to get event header type"); + goto end; + } + + integer_type = bt_ctf_field_type_integer_create(13); + if (!integer_type) { + fail("Failed to create length integer type"); + goto end; + } + + ret = bt_ctf_field_type_structure_add_field(event_header_type, + integer_type, "seq_len"); + if (ret) { + fail("Failed to add a new field to stream event header"); + goto end; + } + + event_class = bt_ctf_event_class_create("sequence_event"); + if (!event_class) { + fail("Failed to create event class"); + goto end; + } + + /* + * This event's payload will contain a sequence which references + * stream.event.header.seq_len as its length field. + */ + sequence_type = bt_ctf_field_type_sequence_create(integer_type, + "stream.event.header.seq_len"); + if (!sequence_type) { + fail("Failed to create a sequence"); + goto end; + } + + ret = bt_ctf_event_class_add_field(event_class, sequence_type, + "some_sequence"); + if (ret) { + fail("Failed to add a sequence to an event class"); + goto end; + } + + ret = bt_ctf_stream_class_add_event_class(stream_class, event_class); + if (ret) { + fail("Failed to add event class to stream class"); + goto end; + } + + stream = bt_ctf_writer_create_stream(writer, stream_class); + if (!stream) { + fail("Failed to create stream") + goto end; + } + + /* + * We have defined a custom packet header field. We have to populate it + * explicitly. + */ + packet_header = bt_ctf_stream_get_packet_header(stream); + if (!packet_header) { + fail("Failed to get stream packet header"); + goto end; + } + + integer = bt_ctf_field_structure_get_field(packet_header, + "custom_trace_packet_header_field"); + if (!integer) { + fail("Failed to retrieve custom_trace_packet_header_field"); + goto end; + } + + ret = bt_ctf_field_unsigned_integer_set_value(integer, 3487); + if (ret) { + fail("Failed to set custom_trace_packet_header_field value"); + goto end; + } + bt_put(integer); + + event = bt_ctf_event_create(event_class); + if (!event) { + fail("Failed to create event"); + goto end; + } + + event_header = bt_ctf_event_get_header(event); + if (!event_header) { + fail("Failed to get event header"); + goto end; + } + + integer = bt_ctf_field_structure_get_field(event_header, + "seq_len"); + if (!integer) { + fail("Failed to get seq_len field from event header"); + goto end; + } + + ret = bt_ctf_field_unsigned_integer_set_value(integer, 2); + if (ret) { + fail("Failed to set seq_len value in event header"); + goto end; + } + + /* Populate both sequence integer fields */ + sequence = bt_ctf_event_get_payload(event, "some_sequence"); + if (!sequence) { + fail("Failed to retrieve sequence from event"); + goto end; + } + + ret = bt_ctf_field_sequence_set_length(sequence, integer); + if (ret) { + fail("Failed to set sequence length"); + goto end; + } + bt_put(integer); + + for (i = 0; i < 2; i++) { + integer = bt_ctf_field_sequence_get_field(sequence, i); + if (ret) { + fail("Failed to retrieve sequence element"); + goto end; + } + + ret = bt_ctf_field_unsigned_integer_set_value(integer, i); + if (ret) { + fail("Failed to set sequence element value"); + goto end; + } + + bt_put(integer); + integer = NULL; + } + + ret = bt_ctf_stream_append_event(stream, event); + if (ret) { + fail("Failed to append event to stream"); + goto end; + } + + ret = bt_ctf_stream_flush(stream); + if (ret) { + fail("Failed to flush custom_event_header stream"); + } +end: + bt_put(clock); + bt_put(trace); + bt_put(stream); + bt_put(stream_class); + bt_put(event_class); + bt_put(event); + bt_put(integer); + bt_put(sequence); + bt_put(event_header); + bt_put(packet_header); + bt_put(sequence_type); + bt_put(integer_type); + bt_put(event_header_type); } void test_instanciate_event_before_stream(struct bt_ctf_writer *writer) @@ -1653,7 +2521,8 @@ void test_instanciate_event_before_stream(struct bt_ctf_writer *writer) struct bt_ctf_trace *trace = NULL; struct bt_ctf_clock *clock = NULL; struct bt_ctf_stream_class *stream_class = NULL; - struct bt_ctf_stream *stream = NULL; + struct bt_ctf_stream *stream = NULL, + *ret_stream = NULL; struct bt_ctf_event_class *event_class = NULL; struct bt_ctf_event *event = NULL; struct bt_ctf_field_type *integer_type = NULL; @@ -1734,38 +2603,50 @@ void test_instanciate_event_before_stream(struct bt_ctf_writer *writer) goto end; } + ok(bt_ctf_event_get_stream(NULL) == NULL, + "bt_ctf_event_get_stream handles NULL correctly"); + ok(bt_ctf_event_get_stream(event) == NULL, + "bt_ctf_event_get_stream returns NULL on event which has not yet been appended to a stream"); + ret = bt_ctf_stream_append_event(stream, event); if (ret) { diag("Failed to append event to stream"); goto end; } + + ret_stream = bt_ctf_event_get_stream(event); + ok(ret_stream == stream, + "bt_ctf_event_get_stream returns an event's stream after it has been appended"); end: ok(ret == 0, "Create an event before instanciating its associated stream"); - bt_ctf_trace_put(trace); - bt_ctf_stream_put(stream); - bt_ctf_stream_class_put(stream_class); - bt_ctf_event_class_put(event_class); - bt_ctf_event_put(event); - bt_ctf_field_type_put(integer_type); - bt_ctf_field_put(integer); - bt_ctf_clock_put(clock); + bt_put(trace); + bt_put(stream); + bt_put(ret_stream); + bt_put(stream_class); + bt_put(event_class); + bt_put(event); + bt_put(integer_type); + bt_put(integer); + bt_put(clock); } void append_existing_event_class(struct bt_ctf_stream_class *stream_class) { struct bt_ctf_event_class *event_class; - assert(event_class = bt_ctf_event_class_create("Simple Event")); + event_class = bt_ctf_event_class_create("Simple Event"); + assert(event_class); ok(bt_ctf_stream_class_add_event_class(stream_class, event_class), "two event classes with the same name cannot cohabit within the same stream class"); - bt_ctf_event_class_put(event_class); + bt_put(event_class); - assert(event_class = bt_ctf_event_class_create("different name, ok")); + event_class = bt_ctf_event_class_create("different name, ok"); + assert(event_class); assert(!bt_ctf_event_class_set_id(event_class, 11)); ok(bt_ctf_stream_class_add_event_class(stream_class, event_class), "two event classes with the same ID cannot cohabit within the same stream class"); - bt_ctf_event_class_put(event_class); + bt_put(event_class); } int main(int argc, char **argv) @@ -1777,8 +2658,11 @@ int main(int argc, char **argv) const char *returned_clock_name; const char *returned_clock_description; const uint64_t frequency = 1123456789; - const uint64_t offset_s = 1351530929945824323; - const uint64_t offset = 1234567; + const int64_t offset_s = 1351530929945824323; + const int64_t offset = 1234567; + int64_t get_offset_s, + get_offset, + get_time; const uint64_t precision = 10; const int is_absolute = 0xFF; char *metadata_string; @@ -1803,16 +2687,16 @@ int main(int argc, char **argv) struct bt_ctf_trace *trace; int ret; int64_t ret_int64_t; - struct bt_object *obj; + struct bt_value *obj; if (argc < 3) { printf("Usage: tests-ctf-writer path_to_ctf_parser_test path_to_babeltrace\n"); return -1; } - plan_no_plan(); + plan_tests(NR_TESTS); - if (!mkdtemp(trace_path)) { + if (!bt_mkdtemp(trace_path)) { perror("# perror"); } @@ -1851,7 +2735,7 @@ int main(int argc, char **argv) "bt_ctf_writer_add_environment_field error with NULL field value"); /* Test bt_ctf_trace_set_environment_field with an integer object */ - obj = bt_object_integer_create_init(23); + obj = bt_value_integer_create_init(23); assert(obj); ok(bt_ctf_trace_set_environment_field(NULL, "test_env_int_obj", obj), "bt_ctf_trace_set_environment_field handles a NULL trace correctly"); @@ -1861,14 +2745,14 @@ int main(int argc, char **argv) "bt_ctf_trace_set_environment_field handles a NULL value correctly"); ok(!bt_ctf_trace_set_environment_field(trace, "test_env_int_obj", obj), "bt_ctf_trace_set_environment_field succeeds in adding an integer object"); - BT_OBJECT_PUT(obj); + BT_PUT(obj); /* Test bt_ctf_trace_set_environment_field with a string object */ - obj = bt_object_string_create_init("the value"); + obj = bt_value_string_create_init("the value"); assert(obj); ok(!bt_ctf_trace_set_environment_field(trace, "test_env_str_obj", obj), "bt_ctf_trace_set_environment_field succeeds in adding a string object"); - BT_OBJECT_PUT(obj); + BT_PUT(obj); /* Test bt_ctf_trace_set_environment_field_integer */ ok(bt_ctf_trace_set_environment_field_integer(NULL, "test_env_int", @@ -1930,15 +2814,15 @@ int main(int argc, char **argv) ok(bt_ctf_trace_get_environment_field_value(trace, 5) == NULL, "bt_ctf_trace_get_environment_field_value handles an invalid index correctly (too large)"); obj = bt_ctf_trace_get_environment_field_value(trace, 1); - ret = bt_object_integer_get(obj, &ret_int64_t); + ret = bt_value_integer_get(obj, &ret_int64_t); ok(!ret && ret_int64_t == 23, "bt_ctf_trace_get_environment_field_value succeeds in getting an integer value"); - BT_OBJECT_PUT(obj); + BT_PUT(obj); obj = bt_ctf_trace_get_environment_field_value(trace, 2); - ret = bt_object_string_get(obj, &ret_string); + ret = bt_value_string_get(obj, &ret_string); ok(!ret && ret_string && !strcmp(ret_string, "the value"), "bt_ctf_trace_get_environment_field_value succeeds in getting a string value"); - BT_OBJECT_PUT(obj); + BT_PUT(obj); /* Test bt_ctf_trace_get_environment_field_value_by_name */ ok(!bt_ctf_trace_get_environment_field_value_by_name(NULL, @@ -1950,10 +2834,10 @@ int main(int argc, char **argv) "bt_ctf_trace_get_environment_field_value_by_name returns NULL or an unknown field name"); obj = bt_ctf_trace_get_environment_field_value_by_name(trace, "test_env_str"); - ret = bt_object_string_get(obj, &ret_string); + ret = bt_value_string_get(obj, &ret_string); ok(!ret && ret_string && !strcmp(ret_string, "oh yeah"), "bt_ctf_trace_get_environment_field_value_by_name succeeds in getting an existing field"); - BT_OBJECT_PUT(obj); + BT_PUT(obj); /* Test environment field replacement */ ok(!bt_ctf_trace_set_environment_field_integer(trace, "test_env_int", @@ -1962,12 +2846,13 @@ int main(int argc, char **argv) ok(bt_ctf_trace_get_environment_field_count(trace) == 5, "bt_ctf_trace_set_environment_field_integer with an existing key does not increase the environment size"); obj = bt_ctf_trace_get_environment_field_value(trace, 3); - ret = bt_object_integer_get(obj, &ret_int64_t); + ret = bt_value_integer_get(obj, &ret_int64_t); ok(!ret && ret_int64_t == 654321, "bt_ctf_trace_get_environment_field_value successfully replaces an existing field"); - BT_OBJECT_PUT(obj); + BT_PUT(obj); - if (uname(&name)) { + /* On Solaris, uname() can return any positive value on success */ + if (uname(&name) < 0) { perror("uname"); return -1; } @@ -2019,18 +2904,26 @@ int main(int argc, char **argv) ok(bt_ctf_clock_get_frequency(clock) == frequency, "bt_ctf_clock_get_frequency returns the correct frequency once it is set"); - ok(bt_ctf_clock_get_offset_s(clock) == DEFAULT_CLOCK_OFFSET_S, + ok(bt_ctf_clock_get_offset_s(clock, &get_offset_s) == 0, + "bt_ctf_clock_get_offset_s succeeds"); + ok(get_offset_s == DEFAULT_CLOCK_OFFSET_S, "bt_ctf_clock_get_offset_s returns the correct default offset (in seconds)"); ok(bt_ctf_clock_set_offset_s(clock, offset_s) == 0, "Set clock offset (seconds)"); - ok(bt_ctf_clock_get_offset_s(clock) == offset_s, + ok(bt_ctf_clock_get_offset_s(clock, &get_offset_s) == 0, + "bt_ctf_clock_get_offset_s succeeds"); + ok(get_offset_s == offset_s, "bt_ctf_clock_get_offset_s returns the correct default offset (in seconds) once it is set"); - ok(bt_ctf_clock_get_offset(clock) == DEFAULT_CLOCK_OFFSET, - "bt_ctf_clock_get_frequency returns the correct default offset (in ticks)"); + ok(bt_ctf_clock_get_offset(clock, &get_offset) == 0, + "bt_ctf_clock_get_offset succeeds"); + ok(get_offset == DEFAULT_CLOCK_OFFSET, + "bt_ctf_clock_get_offset returns the correct default offset (in ticks)"); ok(bt_ctf_clock_set_offset(clock, offset) == 0, "Set clock offset"); - ok(bt_ctf_clock_get_offset(clock) == offset, - "bt_ctf_clock_get_frequency returns the correct default offset (in ticks) once it is set"); + ok(bt_ctf_clock_get_offset(clock, &get_offset) == 0, + "bt_ctf_clock_get_offset succeeds"); + ok(get_offset == offset, + "bt_ctf_clock_get_offset returns the correct default offset (in ticks) once it is set"); ok(bt_ctf_clock_get_precision(clock) == DEFAULT_CLOCK_PRECISION, "bt_ctf_clock_get_precision returns the correct default precision"); @@ -2046,11 +2939,15 @@ int main(int argc, char **argv) ok(bt_ctf_clock_get_is_absolute(clock) == !!is_absolute, "bt_ctf_clock_get_precision returns the correct is_absolute attribute once it is set"); - ok(bt_ctf_clock_get_time(clock) == DEFAULT_CLOCK_TIME, + ok(bt_ctf_clock_get_time(clock, &get_time) == 0, + "bt_ctf_clock_get_time succeeds"); + ok(get_time == DEFAULT_CLOCK_TIME, "bt_ctf_clock_get_time returns the correct default time"); ok(bt_ctf_clock_set_time(clock, current_time) == 0, "Set clock time"); - ok(bt_ctf_clock_get_time(clock) == current_time, + ok(bt_ctf_clock_get_time(clock, &get_time) == 0, + "bt_ctf_clock_get_time succeeds"); + ok(get_time == current_time, "bt_ctf_clock_get_time returns the correct time once it is set"); ok(bt_ctf_writer_add_clock(writer, clock) == 0, @@ -2071,7 +2968,7 @@ int main(int argc, char **argv) ret_clock = bt_ctf_trace_get_clock(trace, 0); ok(ret_clock == clock, "bt_ctf_trace_get_clock returns the right clock instance"); - bt_ctf_clock_put(ret_clock); + bt_put(ret_clock); ok(!bt_ctf_trace_get_clock_by_name(trace, NULL), "bt_ctf_trace_get_clock_by_name correctly handles NULL (trace)"); ok(!bt_ctf_trace_get_clock_by_name(NULL, clock_name), @@ -2081,7 +2978,7 @@ int main(int argc, char **argv) ret_clock = bt_ctf_trace_get_clock_by_name(trace, clock_name); ok(ret_clock == clock, "bt_ctf_trace_get_clock_by_name returns the right clock instance"); - bt_ctf_clock_put(ret_clock); + bt_put(ret_clock); ok(!bt_ctf_trace_get_clock_by_name(trace, "random"), "bt_ctf_trace_get_clock_by_name fails when the requested clock doesn't exist"); @@ -2093,14 +2990,20 @@ int main(int argc, char **argv) "bt_ctf_clock_get_frequency correctly handles NULL"); ok(bt_ctf_clock_get_precision(NULL) == -1ULL, "bt_ctf_clock_get_precision correctly handles NULL"); - ok(bt_ctf_clock_get_offset_s(NULL) == -1ULL, - "bt_ctf_clock_get_offset_s correctly handles NULL"); - ok(bt_ctf_clock_get_offset(NULL) == -1ULL, - "bt_ctf_clock_get_offset correctly handles NULL"); + ok(bt_ctf_clock_get_offset_s(NULL, &get_offset_s) < 0, + "bt_ctf_clock_get_offset_s correctly handles NULL clock"); + ok(bt_ctf_clock_get_offset_s(clock, NULL) < 0, + "bt_ctf_clock_get_offset_s correctly handles NULL output"); + ok(bt_ctf_clock_get_offset(NULL, &get_offset) < 0, + "bt_ctf_clock_get_offset correctly handles NULL clock"); + ok(bt_ctf_clock_get_offset(clock, NULL) < 0, + "bt_ctf_clock_get_offset correctly handles NULL output"); ok(bt_ctf_clock_get_is_absolute(NULL) < 0, "bt_ctf_clock_get_is_absolute correctly handles NULL"); - ok(bt_ctf_clock_get_time(NULL) == -1ULL, - "bt_ctf_clock_get_time correctly handles NULL"); + ok(bt_ctf_clock_get_time(NULL, &get_time) < 0, + "bt_ctf_clock_get_time correctly handles NULL clock"); + ok(bt_ctf_clock_get_time(clock, NULL) < 0, + "bt_ctf_clock_get_time correctly handles NULL output"); ok(bt_ctf_clock_set_description(NULL, NULL) < 0, "bt_ctf_clock_set_description correctly handles NULL clock"); @@ -2159,11 +3062,14 @@ int main(int argc, char **argv) ret_clock = bt_ctf_stream_class_get_clock(stream_class); ok(ret_clock == clock, "bt_ctf_stream_class_get_clock returns a correct clock"); - bt_ctf_clock_put(ret_clock); + bt_put(ret_clock); /* Test the event fields and event types APIs */ type_field_tests(); + /* Test fields copying */ + field_copy_tests(); + ok(bt_ctf_stream_class_get_id(stream_class) < 0, "bt_ctf_stream_class_get_id returns an error when no id is set"); ok(bt_ctf_stream_class_get_id(NULL) < 0, @@ -2192,7 +3098,7 @@ int main(int argc, char **argv) ok(bt_ctf_field_type_get_type_id( event_header_field_type) == CTF_TYPE_INTEGER, "Default event header \"id\" field is an integer"); - bt_ctf_field_type_put(event_header_field_type); + bt_put(event_header_field_type); event_header_field_type = bt_ctf_field_type_structure_get_field_type_by_name( ret_field_type, "timestamp"); @@ -2201,8 +3107,8 @@ int main(int argc, char **argv) ok(bt_ctf_field_type_get_type_id( event_header_field_type) == CTF_TYPE_INTEGER, "Default event header \"timestamp\" field is an integer"); - bt_ctf_field_type_put(event_header_field_type); - bt_ctf_field_type_put(ret_field_type); + bt_put(event_header_field_type); + bt_put(ret_field_type); /* Add a custom trace packet header field */ ok(bt_ctf_trace_get_packet_header_type(NULL) == NULL, @@ -2215,15 +3121,15 @@ int main(int argc, char **argv) ret_field_type = bt_ctf_field_type_structure_get_field_type_by_name( packet_header_type, "magic"); ok(ret_field_type, "Default packet header type contains a \"magic\" field"); - bt_ctf_field_type_put(ret_field_type); + bt_put(ret_field_type); ret_field_type = bt_ctf_field_type_structure_get_field_type_by_name( packet_header_type, "uuid"); ok(ret_field_type, "Default packet header type contains a \"uuid\" field"); - bt_ctf_field_type_put(ret_field_type); + bt_put(ret_field_type); ret_field_type = bt_ctf_field_type_structure_get_field_type_by_name( packet_header_type, "stream_id"); ok(ret_field_type, "Default packet header type contains a \"stream_id\" field"); - bt_ctf_field_type_put(ret_field_type); + bt_put(ret_field_type); packet_header_field_type = bt_ctf_field_type_integer_create(22); ok(!bt_ctf_field_type_structure_add_field(packet_header_type, @@ -2290,7 +3196,7 @@ int main(int argc, char **argv) stream_class); ok(ret_field_type == stream_event_context_type, "bt_ctf_stream_class_get_event_context_type returns the correct field type."); - bt_ctf_field_type_put(ret_field_type); + bt_put(ret_field_type); /* Instantiate a stream and append events */ stream1 = bt_ctf_writer_create_stream(writer, stream_class); @@ -2344,7 +3250,7 @@ int main(int argc, char **argv) ret_field_type = bt_ctf_field_get_type(packet_header); ok(ret_field_type == packet_header_type, "Stream returns a packet header of the appropriate type"); - bt_ctf_field_type_put(ret_field_type); + bt_put(ret_field_type); packet_header_field = bt_ctf_field_structure_get_field(packet_header, "custom_trace_packet_header_field"); ok(packet_header_field, @@ -2363,6 +3269,9 @@ int main(int argc, char **argv) ok(!bt_ctf_stream_set_packet_header(stream1, packet_header), "Successfully set a stream's packet header"); + ok(bt_ctf_writer_add_environment_field(writer, "new_field", "test") == 0, + "Add environment field to writer after stream creation"); + test_instanciate_event_before_stream(writer); append_simple_event(stream_class, stream1, clock); @@ -2375,6 +3284,8 @@ int main(int argc, char **argv) test_empty_stream(writer); + test_custom_event_header_stream(writer); + metadata_string = bt_ctf_writer_get_metadata_string(writer); ok(metadata_string, "Get metadata string"); @@ -2382,22 +3293,22 @@ int main(int argc, char **argv) validate_metadata(argv[1], metadata_path); validate_trace(argv[2], trace_path); - bt_ctf_clock_put(clock); - bt_ctf_stream_class_put(stream_class); - bt_ctf_stream_class_put(ret_stream_class); - bt_ctf_writer_put(writer); - bt_ctf_stream_put(stream1); - bt_ctf_field_type_put(packet_context_type); - bt_ctf_field_type_put(packet_context_field_type); - bt_ctf_field_type_put(integer_type); - bt_ctf_field_type_put(stream_event_context_type); - bt_ctf_field_type_put(ret_field_type); - bt_ctf_field_type_put(packet_header_type); - bt_ctf_field_type_put(packet_header_field_type); - bt_ctf_field_put(packet_header); - bt_ctf_field_put(packet_header_field); - bt_ctf_trace_put(trace); + bt_put(clock); + bt_put(ret_stream_class); + bt_put(writer); + bt_put(stream1); + bt_put(packet_context_type); + bt_put(packet_context_field_type); + bt_put(integer_type); + bt_put(stream_event_context_type); + bt_put(ret_field_type); + bt_put(packet_header_type); + bt_put(packet_header_field_type); + bt_put(packet_header); + bt_put(packet_header_field); + bt_put(trace); free(metadata_string); + bt_put(stream_class); /* Remove all trace files and delete temporary trace directory */ DIR *trace_dir = opendir(trace_path); @@ -2408,8 +3319,20 @@ int main(int argc, char **argv) struct dirent *entry; while ((entry = readdir(trace_dir))) { - if (entry->d_type == DT_REG) { - unlinkat(dirfd(trace_dir), entry->d_name, 0); + struct stat st; + char filename[PATH_MAX]; + + if (snprintf(filename, sizeof(filename), "%s/%s", + trace_path, entry->d_name) <= 0) { + continue; + } + + if (stat(entry->d_name, &st)) { + continue; + } + + if (S_ISREG(st.st_mode)) { + unlinkat(bt_dirfd(trace_dir), entry->d_name, 0); } }