X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=tests%2Flib%2Ftest_ctf_writer.c;h=928ff982183f7f5b2f2716779d35c5cf2d508a60;hp=5f173aff32287a69e6958c3b73b29e98616a874d;hb=312c056ae3d374b253fa0cfe5ed576c0b0e5e569;hpb=55eb4a0471fded5edce486a0596dffb488124da7 diff --git a/tests/lib/test_ctf_writer.c b/tests/lib/test_ctf_writer.c index 5f173aff..928ff982 100644 --- a/tests/lib/test_ctf_writer.c +++ b/tests/lib/test_ctf_writer.c @@ -1,9 +1,9 @@ /* - * test-ctf-writer.c + * test_ctf_writer.c * * CTF Writer test * - * Copyright 2013 - 2015 - Jérémie Galarneau + * Copyright 2013 - 2017 - Jérémie Galarneau * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -26,21 +26,19 @@ #include #include #include -#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 @@ -49,7 +47,7 @@ #define METADATA_LINE_SIZE 512 #define SEQUENCE_TEST_LENGTH 10 #define ARRAY_TEST_LENGTH 5 -#define PACKET_RESIZE_TEST_LENGTH 100000 +#define PACKET_RESIZE_TEST_DEF_LENGTH 100000 #define DEFAULT_CLOCK_FREQ 1000000000 #define DEFAULT_CLOCK_PRECISION 1 @@ -59,9 +57,18 @@ #define DEFAULT_CLOCK_TIME 0 #define DEFAULT_CLOCK_VALUE 0 -#define NR_TESTS 605 +#define NR_TESTS 346 + +struct bt_utsname { + char sysname[BABELTRACE_HOST_NAME_MAX]; + char nodename[BABELTRACE_HOST_NAME_MAX]; + char release[BABELTRACE_HOST_NAME_MAX]; + char version[BABELTRACE_HOST_NAME_MAX]; + char machine[BABELTRACE_HOST_NAME_MAX]; +}; static int64_t current_time = 42; +static unsigned int packet_resize_test_length = PACKET_RESIZE_TEST_DEF_LENGTH; /* Return 1 if uuids match, zero if different. */ static @@ -86,203 +93,46 @@ end: } static -void validate_metadata(char *parser_path, char *metadata_path) +void validate_trace(char *parser_path, char *trace_path) { int ret = 0; - char parser_output_path[] = "/tmp/parser_output_XXXXXX"; - int parser_output_fd = -1, metadata_fd = -1; + gint exit_status; + char *argv[] = {parser_path, trace_path, "-o", "dummy", NULL}; - if (!metadata_path) { + if (!parser_path || !trace_path) { ret = -1; goto result; } - parser_output_fd = mkstemp(parser_output_path); - metadata_fd = open(metadata_path, O_RDONLY); - - unlink(parser_output_path); - - if (parser_output_fd == -1 || metadata_fd == -1) { - diag("Failed create temporary files for metadata parsing."); + if (!g_spawn_sync(NULL, + argv, + NULL, + G_SPAWN_STDOUT_TO_DEV_NULL, + NULL, + NULL, + NULL, + NULL, + &exit_status, + NULL)) { + diag("Failed to spawn babeltrace."); ret = -1; goto result; } - pid_t pid = fork(); - if (pid) { - int status = 0; - waitpid(pid, &status, 0); - ret = WIFEXITED(status) ? WEXITSTATUS(status) : -1; - } else { - /* ctf-parser-test expects a metadata string on stdin. */ - ret = dup2(metadata_fd, STDIN_FILENO); - if (ret < 0) { - perror("# dup2 metadata_fd to STDIN"); - goto result; - } - - ret = dup2(parser_output_fd, STDOUT_FILENO); - if (ret < 0) { - perror("# dup2 parser_output_fd to STDOUT"); - goto result; - } - - ret = dup2(parser_output_fd, STDERR_FILENO); - if (ret < 0) { - perror("# dup2 parser_output_fd to STDERR"); - goto result; - } - - execl(parser_path, "ctf-parser-test", NULL); - perror("# Could not launch the ctf metadata parser process"); - exit(-1); - } -result: - ok(ret == 0, "Metadata string is valid"); - - if (ret && metadata_fd >= 0 && parser_output_fd >= 0) { - char *line; - size_t len = METADATA_LINE_SIZE; - FILE *metadata_fp = NULL, *parser_output_fp = NULL; - - metadata_fp = fdopen(metadata_fd, "r"); - if (!metadata_fp) { - perror("fdopen on metadata_fd"); - goto close_fp; - } - metadata_fd = -1; - - parser_output_fp = fdopen(parser_output_fd, "r"); - if (!parser_output_fp) { - perror("fdopen on parser_output_fd"); - goto close_fp; - } - parser_output_fd = -1; - - line = malloc(len); - if (!line) { - diag("malloc failure"); - } - - rewind(metadata_fp); - - /* Output the metadata and parser output as diagnostic */ - while (bt_getline(&line, &len, metadata_fp) > 0) { - fprintf(stderr, "# %s", line); - } - - rewind(parser_output_fp); - while (bt_getline(&line, &len, parser_output_fp) > 0) { - fprintf(stderr, "# %s", line); - } - - free(line); -close_fp: - if (metadata_fp) { - if (fclose(metadata_fp)) { - diag("fclose failure"); - } - } - if (parser_output_fp) { - if (fclose(parser_output_fp)) { - diag("fclose failure"); - } - } - } - - if (parser_output_fd >= 0) { - if (close(parser_output_fd)) { - diag("close error"); - } - } - if (metadata_fd >= 0) { - if (close(metadata_fd)) { - diag("close error"); - } - } -} - -static -void validate_trace(char *parser_path, char *trace_path) -{ - int ret = 0; - char babeltrace_output_path[] = "/tmp/babeltrace_output_XXXXXX"; - int babeltrace_output_fd = -1; + /* Replace by g_spawn_check_exit_status when we require glib >= 2.34 */ +#ifdef G_OS_UNIX + ret = WIFEXITED(exit_status) ? WEXITSTATUS(exit_status) : -1; +#else + ret = exit_status; +#endif - if (!trace_path) { - ret = -1; + if (ret != 0) { + diag("Babeltrace returned an error."); goto result; } - babeltrace_output_fd = mkstemp(babeltrace_output_path); - unlink(babeltrace_output_path); - - if (babeltrace_output_fd == -1) { - diag("Failed to create a temporary file for trace parsing."); - ret = -1; - goto result; - } - - pid_t pid = fork(); - if (pid) { - int status = 0; - waitpid(pid, &status, 0); - ret = WIFEXITED(status) ? WEXITSTATUS(status) : -1; - } else { - ret = dup2(babeltrace_output_fd, STDOUT_FILENO); - if (ret < 0) { - perror("# dup2 babeltrace_output_fd to STDOUT"); - goto result; - } - - ret = dup2(babeltrace_output_fd, STDERR_FILENO); - if (ret < 0) { - perror("# dup2 babeltrace_output_fd to STDERR"); - goto result; - } - - execl(parser_path, "babeltrace", trace_path, NULL); - perror("# Could not launch the babeltrace process"); - exit(-1); - } result: ok(ret == 0, "Babeltrace could read the resulting trace"); - - if (ret && babeltrace_output_fd >= 0) { - char *line; - size_t len = METADATA_LINE_SIZE; - FILE *babeltrace_output_fp = NULL; - - babeltrace_output_fp = fdopen(babeltrace_output_fd, "r"); - if (!babeltrace_output_fp) { - perror("fdopen on babeltrace_output_fd"); - goto close_fp; - } - babeltrace_output_fd = -1; - - line = malloc(len); - if (!line) { - diag("malloc error"); - } - rewind(babeltrace_output_fp); - while (bt_getline(&line, &len, babeltrace_output_fp) > 0) { - diag("%s", line); - } - - free(line); -close_fp: - if (babeltrace_output_fp) { - if (fclose(babeltrace_output_fp)) { - diag("fclose error"); - } - } - } - - if (babeltrace_output_fd >= 0) { - if (close(babeltrace_output_fd)) { - diag("close error"); - } - } } static @@ -319,7 +169,6 @@ void append_simple_event(struct bt_ctf_stream_class *stream_class, double ret_double; int64_t ret_range_start_int64_t, ret_range_end_int64_t; uint64_t ret_range_start_uint64_t, ret_range_end_uint64_t; - struct bt_ctf_clock *ret_clock; struct bt_ctf_event_class *ret_event_class; struct bt_ctf_field *packet_context; struct bt_ctf_field *packet_context_field; @@ -330,24 +179,23 @@ void append_simple_event(struct bt_ctf_stream_class *stream_class, struct bt_ctf_field_type *ep_integer_field_type = NULL; struct bt_ctf_field_type *ep_enum_field_type = NULL; struct bt_ctf_field_type *ep_enum_field_unsigned_type = NULL; + struct bt_ctf_field_type_enumeration_mapping_iterator *iter = NULL; int ret; ok(uint_12_type, "Create an unsigned integer type"); - bt_ctf_field_type_integer_set_signed(int_64_type, 1); + ok(!bt_ctf_field_type_integer_set_signed(int_64_type, 1), + "Set signed 64 bit integer signedness to true"); ok(int_64_type, "Create a signed integer type"); enum_type = bt_ctf_field_type_enumeration_create(int_64_type); - returned_type = bt_ctf_field_type_enumeration_get_container_type(enum_type); - ok(returned_type == int_64_type, "bt_ctf_field_type_enumeration_get_container_type returns the right type"); - ok(!bt_ctf_field_type_enumeration_get_container_type(NULL), "bt_ctf_field_type_enumeration_get_container_type handles NULL correctly"); + returned_type = bt_ctf_field_type_enumeration_get_container_field_type(enum_type); + ok(returned_type == int_64_type, "bt_ctf_field_type_enumeration_get_container_field_type returns the right type"); ok(!bt_ctf_field_type_enumeration_create(enum_type), "bt_ctf_field_enumeration_type_create rejects non-integer container field types"); bt_put(returned_type); bt_ctf_field_type_set_alignment(float_type, 32); - ok(bt_ctf_field_type_get_alignment(NULL) < 0, - "bt_ctf_field_type_get_alignment handles NULL correctly"); ok(bt_ctf_field_type_get_alignment(float_type) == 32, "bt_ctf_field_type_get_alignment returns a correct value"); @@ -356,10 +204,6 @@ void append_simple_event(struct bt_ctf_stream_class *stream_class, ok(bt_ctf_field_type_floating_point_set_mantissa_digits(float_type, 53) == 0, "Set a floating point type's mantissa digit count"); - ok(bt_ctf_field_type_floating_point_get_exponent_digits(NULL) < 0, - "bt_ctf_field_type_floating_point_get_exponent_digits handles NULL properly"); - ok(bt_ctf_field_type_floating_point_get_mantissa_digits(NULL) < 0, - "bt_ctf_field_type_floating_point_get_mantissa_digits handles NULL properly"); ok(bt_ctf_field_type_floating_point_get_exponent_digits(float_type) == 11, "bt_ctf_field_type_floating_point_get_exponent_digits returns the correct value"); ok(bt_ctf_field_type_floating_point_get_mantissa_digits(float_type) == 53, @@ -380,91 +224,77 @@ void append_simple_event(struct bt_ctf_stream_class *stream_class, bt_ctf_field_type_enumeration_add_mapping(enum_type, mapping_name_test, 42, 42); ok(bt_ctf_field_type_enumeration_add_mapping(enum_type, mapping_name_test, - 43, 51), "bt_ctf_field_type_enumeration_add_mapping rejects duplicate mapping names"); + 43, 51) == 0, "bt_ctf_field_type_enumeration_add_mapping accepts duplicate mapping names"); ok(bt_ctf_field_type_enumeration_add_mapping(enum_type, "something", - -500, -400), "bt_ctf_field_type_enumeration_add_mapping rejects overlapping enum entries"); + -500, -400) == 0, "bt_ctf_field_type_enumeration_add_mapping accepts overlapping enum entries"); ok(bt_ctf_field_type_enumeration_add_mapping(enum_type, mapping_name_test, -54, -55), "bt_ctf_field_type_enumeration_add_mapping rejects mapping where end < start"); bt_ctf_field_type_enumeration_add_mapping(enum_type, "another entry", -42000, -13000); - ok(bt_ctf_field_type_enumeration_get_mapping_index_by_value(NULL, -42) < 0, - "bt_ctf_field_type_enumeration_get_mapping_index_by_value handles a NULL field type correctly"); - ok(bt_ctf_field_type_enumeration_get_mapping_index_by_value(enum_type, 1000000) < 0, - "bt_ctf_field_type_enumeration_get_mapping_index_by_value handles invalid values correctly"); - ok(bt_ctf_field_type_enumeration_get_mapping_index_by_value(enum_type, -55) == 1, - "bt_ctf_field_type_enumeration_get_mapping_index_by_value returns the correct index"); - ok(bt_ctf_event_class_add_field(simple_event_class, enum_type, "enum_field") == 0, "Add signed enumeration field to event"); - ok(bt_ctf_field_type_enumeration_get_mapping(NULL, 0, &ret_char, - &ret_range_start_int64_t, &ret_range_end_int64_t) < 0, - "bt_ctf_field_type_enumeration_get_mapping handles a NULL enumeration correctly"); - ok(bt_ctf_field_type_enumeration_get_mapping(enum_type, 0, NULL, - &ret_range_start_int64_t, &ret_range_end_int64_t) < 0, - "bt_ctf_field_type_enumeration_get_mapping handles a NULL string correctly"); - ok(bt_ctf_field_type_enumeration_get_mapping(enum_type, 0, &ret_char, - NULL, &ret_range_end_int64_t) < 0, - "bt_ctf_field_type_enumeration_get_mapping handles a NULL start correctly"); - ok(bt_ctf_field_type_enumeration_get_mapping(enum_type, 0, &ret_char, - &ret_range_start_int64_t, NULL) < 0, - "bt_ctf_field_type_enumeration_get_mapping handles a NULL end correctly"); - ok(bt_ctf_field_type_enumeration_get_mapping(enum_type, 5, &ret_char, + ok(bt_ctf_field_type_enumeration_signed_get_mapping_by_index(enum_type, 0, NULL, &ret_range_start_int64_t, &ret_range_end_int64_t) == 0, - "bt_ctf_field_type_enumeration_get_mapping returns a value"); + "bt_ctf_field_type_enumeration_signed_get_mapping_by_index handles a NULL string correctly"); + ok(bt_ctf_field_type_enumeration_signed_get_mapping_by_index(enum_type, 0, &ret_char, + NULL, &ret_range_end_int64_t) == 0, + "bt_ctf_field_type_enumeration_signed_get_mapping_by_index handles a NULL start correctly"); + ok(bt_ctf_field_type_enumeration_signed_get_mapping_by_index(enum_type, 0, &ret_char, + &ret_range_start_int64_t, NULL) == 0, + "bt_ctf_field_type_enumeration_signed_get_mapping_by_index handles a NULL end correctly"); + /* Assumes entries are sorted by range_start values. */ + ok(bt_ctf_field_type_enumeration_signed_get_mapping_by_index(enum_type, 6, &ret_char, + &ret_range_start_int64_t, &ret_range_end_int64_t) == 0, + "bt_ctf_field_type_enumeration_signed_get_mapping_by_index returns a value"); ok(!strcmp(ret_char, mapping_name_test), - "bt_ctf_field_type_enumeration_get_mapping returns a correct mapping name"); + "bt_ctf_field_type_enumeration_signed_get_mapping_by_index returns a correct mapping name"); ok(ret_range_start_int64_t == 42, - "bt_ctf_field_type_enumeration_get_mapping returns a correct mapping start"); + "bt_ctf_field_type_enumeration_signed_get_mapping_by_index returns a correct mapping start"); ok(ret_range_end_int64_t == 42, - "bt_ctf_field_type_enumeration_get_mapping returns a correct mapping end"); + "bt_ctf_field_type_enumeration_signed_get_mapping_by_index returns a correct mapping end"); - ok(bt_ctf_field_type_enumeration_add_mapping_unsigned(enum_type_unsigned, + ok(bt_ctf_field_type_enumeration_unsigned_add_mapping(enum_type_unsigned, "escaping; \"test\"", 0, 0) == 0, - "bt_ctf_field_type_enumeration_add_mapping_unsigned accepts enumeration mapping strings containing quotes"); - ok(bt_ctf_field_type_enumeration_add_mapping_unsigned(enum_type_unsigned, + "bt_ctf_field_type_enumeration_unsigned_add_mapping accepts enumeration mapping strings containing quotes"); + ok(bt_ctf_field_type_enumeration_unsigned_add_mapping(enum_type_unsigned, "\tanother \'escaping\'\n test\"", 1, 4) == 0, - "bt_ctf_field_type_enumeration_add_mapping_unsigned accepts enumeration mapping strings containing special characters"); - ok(bt_ctf_field_type_enumeration_add_mapping_unsigned(enum_type_unsigned, + "bt_ctf_field_type_enumeration_unsigned_add_mapping accepts enumeration mapping strings containing special characters"); + ok(bt_ctf_field_type_enumeration_unsigned_add_mapping(enum_type_unsigned, "event clock int float", 5, 22) == 0, - "bt_ctf_field_type_enumeration_add_mapping_unsigned accepts enumeration mapping strings containing reserved keywords"); - bt_ctf_field_type_enumeration_add_mapping_unsigned(enum_type_unsigned, mapping_name_test, - 42, 42); - ok(bt_ctf_field_type_enumeration_add_mapping_unsigned(enum_type_unsigned, mapping_name_test, - 43, 51), "bt_ctf_field_type_enumeration_add_mapping_unsigned rejects duplicate mapping names"); - ok(bt_ctf_field_type_enumeration_add_mapping_unsigned(enum_type_unsigned, "something", - 7, 8), "bt_ctf_field_type_enumeration_add_mapping_unsigned rejects overlapping enum entries"); - ok(bt_ctf_field_type_enumeration_add_mapping_unsigned(enum_type_unsigned, mapping_name_test, - 55, 54), "bt_ctf_field_type_enumeration_add_mapping_unsigned rejects mapping where end < start"); + "bt_ctf_field_type_enumeration_unsigned_add_mapping accepts enumeration mapping strings containing reserved keywords"); + ok(bt_ctf_field_type_enumeration_unsigned_add_mapping(enum_type_unsigned, mapping_name_test, + 42, 42) == 0, "bt_ctf_field_type_enumeration_unsigned_add_mapping accepts single-value ranges"); + ok(bt_ctf_field_type_enumeration_unsigned_add_mapping(enum_type_unsigned, mapping_name_test, + 43, 51) == 0, "bt_ctf_field_type_enumeration_unsigned_add_mapping accepts duplicate mapping names"); + ok(bt_ctf_field_type_enumeration_unsigned_add_mapping(enum_type_unsigned, "something", + 7, 8) == 0, "bt_ctf_field_type_enumeration_unsigned_add_mapping accepts overlapping enum entries"); + ok(bt_ctf_field_type_enumeration_unsigned_add_mapping(enum_type_unsigned, mapping_name_test, + 55, 54), "bt_ctf_field_type_enumeration_unsigned_add_mapping rejects mapping where end < start"); ok(bt_ctf_event_class_add_field(simple_event_class, enum_type_unsigned, "enum_field_unsigned") == 0, "Add unsigned enumeration field to event"); - ok(bt_ctf_field_type_enumeration_get_mapping_count(NULL) < 0, - "bt_ctf_field_type_enumeration_get_mapping_count handles NULL correctly"); - ok(bt_ctf_field_type_enumeration_get_mapping_count(enum_type_unsigned) == 4, + ok(bt_ctf_field_type_enumeration_get_mapping_count(enum_type_unsigned) == 6, "bt_ctf_field_type_enumeration_get_mapping_count returns the correct value"); - ok(bt_ctf_field_type_enumeration_get_mapping_unsigned(NULL, 0, &ret_char, - &ret_range_start_uint64_t, &ret_range_end_uint64_t) < 0, - "bt_ctf_field_type_enumeration_get_mapping_unsigned handles a NULL enumeration correctly"); - ok(bt_ctf_field_type_enumeration_get_mapping_unsigned(enum_type_unsigned, 0, NULL, - &ret_range_start_uint64_t, &ret_range_end_uint64_t) < 0, - "bt_ctf_field_type_enumeration_get_mapping_unsigned handles a NULL string correctly"); - ok(bt_ctf_field_type_enumeration_get_mapping_unsigned(enum_type_unsigned, 0, &ret_char, - NULL, &ret_range_end_uint64_t) < 0, - "bt_ctf_field_type_enumeration_get_mapping_unsigned handles a NULL start correctly"); - ok(bt_ctf_field_type_enumeration_get_mapping_unsigned(enum_type_unsigned, 0, &ret_char, - &ret_range_start_uint64_t, NULL) < 0, - "bt_ctf_field_type_enumeration_get_mapping_unsigned handles a NULL end correctly"); - ok(bt_ctf_field_type_enumeration_get_mapping_unsigned(enum_type_unsigned, 3, &ret_char, + ok(bt_ctf_field_type_enumeration_unsigned_get_mapping_by_index(enum_type_unsigned, 0, NULL, &ret_range_start_uint64_t, &ret_range_end_uint64_t) == 0, - "bt_ctf_field_type_enumeration_get_mapping_unsigned returns a value"); + "bt_ctf_field_type_enumeration_unsigned_get_mapping_by_index handles a NULL string correctly"); + ok(bt_ctf_field_type_enumeration_unsigned_get_mapping_by_index(enum_type_unsigned, 0, &ret_char, + NULL, &ret_range_end_uint64_t) == 0, + "bt_ctf_field_type_enumeration_unsigned_get_mapping_by_index handles a NULL start correctly"); + ok(bt_ctf_field_type_enumeration_unsigned_get_mapping_by_index(enum_type_unsigned, 0, &ret_char, + &ret_range_start_uint64_t, NULL) == 0, + "bt_ctf_field_type_enumeration_unsigned_get_mapping_by_index handles a NULL end correctly"); + ok(bt_ctf_field_type_enumeration_unsigned_get_mapping_by_index(enum_type_unsigned, 4, &ret_char, + &ret_range_start_uint64_t, &ret_range_end_uint64_t) == 0, + "bt_ctf_field_type_enumeration_unsigned_get_mapping_by_index returns a value"); ok(!strcmp(ret_char, mapping_name_test), - "bt_ctf_field_type_enumeration_get_mapping_unsigned returns a correct mapping name"); + "bt_ctf_field_type_enumeration_unsigned_get_mapping_by_index returns a correct mapping name"); ok(ret_range_start_uint64_t == 42, - "bt_ctf_field_type_enumeration_get_mapping_unsigned returns a correct mapping start"); + "bt_ctf_field_type_enumeration_unsigned_get_mapping_by_index returns a correct mapping start"); ok(ret_range_end_uint64_t == 42, - "bt_ctf_field_type_enumeration_get_mapping_unsigned returns a correct mapping end"); + "bt_ctf_field_type_enumeration_unsigned_get_mapping_by_index returns a correct mapping end"); bt_ctf_event_class_add_field(simple_event_class, uint_12_type, "integer_field"); @@ -473,27 +303,22 @@ void append_simple_event(struct bt_ctf_stream_class *stream_class, assert(!bt_ctf_event_class_set_id(simple_event_class, 13)); - /* Set an event context type which will contain a single integer*/ + /* Set an event context type which will contain a single integer. */ ok(!bt_ctf_field_type_structure_add_field(event_context_type, uint_12_type, "event_specific_context"), "Add event specific context field"); - ok(bt_ctf_event_class_get_context_type(NULL) == NULL, - "bt_ctf_event_class_get_context_type handles NULL correctly"); - ok(bt_ctf_event_class_get_context_type(simple_event_class) == NULL, - "bt_ctf_event_class_get_context_type returns NULL when no event context type is set"); - - ok(bt_ctf_event_class_set_context_type(simple_event_class, NULL) < 0, - "bt_ctf_event_class_set_context_type handles a NULL context type correctly"); - ok(bt_ctf_event_class_set_context_type(NULL, event_context_type) < 0, - "bt_ctf_event_class_set_context_type handles a NULL event class correctly"); - ok(!bt_ctf_event_class_set_context_type(simple_event_class, event_context_type), + + ok(bt_ctf_event_class_set_context_field_type(NULL, event_context_type) < 0, + "bt_ctf_event_class_set_context_field_type handles a NULL event class correctly"); + ok(!bt_ctf_event_class_set_context_field_type(simple_event_class, event_context_type), "Set an event class' context type successfully"); - returned_type = bt_ctf_event_class_get_context_type(simple_event_class); + returned_type = bt_ctf_event_class_get_context_field_type(simple_event_class); ok(returned_type == event_context_type, - "bt_ctf_event_class_get_context_type returns the appropriate type"); + "bt_ctf_event_class_get_context_field_type returns the appropriate type"); bt_put(returned_type); - bt_ctf_stream_class_add_event_class(stream_class, simple_event_class); + ok(!bt_ctf_stream_class_add_event_class(stream_class, simple_event_class), + "Adding simple event class to stream class"); /* * bt_ctf_stream_class_add_event_class() copies the field types @@ -502,10 +327,10 @@ void append_simple_event(struct bt_ctf_stream_class *stream_class, */ BT_PUT(event_context_type); BT_PUT(event_payload_type); - event_payload_type = bt_ctf_event_class_get_payload_type( + event_payload_type = bt_ctf_event_class_get_payload_field_type( simple_event_class); assert(event_payload_type); - event_context_type = bt_ctf_event_class_get_context_type( + event_context_type = bt_ctf_event_class_get_context_field_type( simple_event_class); assert(event_context_type); ep_integer_field_type = @@ -521,20 +346,12 @@ void append_simple_event(struct bt_ctf_stream_class *stream_class, event_payload_type, "enum_field_unsigned"); assert(ep_enum_field_unsigned_type); - ok(bt_ctf_stream_class_get_event_class_count(NULL) < 0, - "bt_ctf_stream_class_get_event_class_count handles NULL correctly"); ok(bt_ctf_stream_class_get_event_class_count(stream_class) == 1, "bt_ctf_stream_class_get_event_class_count returns a correct number of event classes"); - ok(bt_ctf_stream_class_get_event_class(NULL, 0) == NULL, - "bt_ctf_stream_class_get_event_class handles NULL correctly"); - ok(bt_ctf_stream_class_get_event_class(stream_class, 8724) == NULL, - "bt_ctf_stream_class_get_event_class handles invalid indexes correctly"); - ret_event_class = bt_ctf_stream_class_get_event_class(stream_class, 0); + ret_event_class = bt_ctf_stream_class_get_event_class_by_index(stream_class, 0); ok(ret_event_class == simple_event_class, "bt_ctf_stream_class_get_event_class returns the correct 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), "bt_ctf_stream_class_get_event_class_by_id returns NULL when the requested ID doesn't exist"); ret_event_class = @@ -543,41 +360,17 @@ void append_simple_event(struct bt_ctf_stream_class *stream_class, "bt_ctf_stream_class_get_event_class_by_id returns a correct 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"); - ok(bt_ctf_stream_class_get_event_class_by_name(stream_class, NULL) == NULL, - "bt_ctf_stream_class_get_event_class_by_name handles a NULL event class name correctly"); - ok(bt_ctf_stream_class_get_event_class_by_name(stream_class, "some event name") == NULL, - "bt_ctf_stream_class_get_event_class_by_name handles non-existing event class names correctly"); - 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_put(ret_event_class); - simple_event = bt_ctf_event_create(simple_event_class); ok(simple_event, "Instantiate an event containing a single integer field"); - ok(bt_ctf_event_get_clock(NULL) == NULL, - "bt_ctf_event_get_clock handles NULL correctly"); - ret_clock = bt_ctf_event_get_clock(simple_event); - ok(ret_clock == clock, - "bt_ctf_event_get_clock returns a correct clock"); - bt_put(clock); - integer_field = bt_ctf_field_create(ep_integer_field_type); - bt_ctf_field_unsigned_integer_set_value(integer_field, 42); + bt_ctf_field_integer_unsigned_set_value(integer_field, 42); ok(bt_ctf_event_set_payload(simple_event, "integer_field", integer_field) == 0, "Use bt_ctf_event_set_payload to set a manually allocated field"); float_field = bt_ctf_event_get_payload(simple_event, "float_field"); - ok(bt_ctf_field_floating_point_get_value(float_field, &ret_double), - "bt_ctf_field_floating_point_get_value fails on an unset float field"); bt_ctf_field_floating_point_set_value(float_field, double_test_value); - ok(bt_ctf_field_floating_point_get_value(NULL, &ret_double), - "bt_ctf_field_floating_point_get_value properly handles a NULL field"); - ok(bt_ctf_field_floating_point_get_value(float_field, NULL), - "bt_ctf_field_floating_point_get_value properly handles a NULL return value pointer"); ok(!bt_ctf_field_floating_point_get_value(float_field, &ret_double), "bt_ctf_field_floating_point_get_value returns a double value"); ok(fabs(ret_double - double_test_value) <= DBL_EPSILON, @@ -585,34 +378,25 @@ void append_simple_event(struct bt_ctf_stream_class *stream_class, enum_field = bt_ctf_field_create(ep_enum_field_type); assert(enum_field); - ret_char = bt_ctf_field_enumeration_get_mapping_name(NULL); - ok(!ret_char, "bt_ctf_field_enumeration_get_mapping_name handles NULL correctly"); - ret_char = bt_ctf_field_enumeration_get_mapping_name(enum_field); - ok(!ret_char, "bt_ctf_field_enumeration_get_mapping_name returns NULL if the enumeration's container field is unset"); - enum_container_field = bt_ctf_field_enumeration_get_container( - enum_field); - ok(bt_ctf_field_signed_integer_set_value( + + enum_container_field = bt_ctf_field_enumeration_get_container(enum_field); + ok(bt_ctf_field_integer_signed_set_value( enum_container_field, -42) == 0, "Set signed enumeration container value"); - ret_char = bt_ctf_field_enumeration_get_mapping_name(enum_field); - ok(!strcmp(ret_char, mapping_name_negative_test), - "bt_ctf_field_enumeration_get_mapping_name returns the correct mapping name with an signed container"); ret = bt_ctf_event_set_payload(simple_event, "enum_field", enum_field); assert(!ret); + BT_PUT(iter); enum_field_unsigned = bt_ctf_field_create(ep_enum_field_unsigned_type); assert(enum_field_unsigned); enum_container_field_unsigned = bt_ctf_field_enumeration_get_container( enum_field_unsigned); - ok(bt_ctf_field_unsigned_integer_set_value( + ok(bt_ctf_field_integer_unsigned_set_value( enum_container_field_unsigned, 42) == 0, "Set unsigned enumeration container value"); ret = bt_ctf_event_set_payload(simple_event, "enum_field_unsigned", enum_field_unsigned); assert(!ret); - ret_char = bt_ctf_field_enumeration_get_mapping_name(enum_field_unsigned); - 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"); @@ -620,55 +404,41 @@ void append_simple_event(struct bt_ctf_stream_class *stream_class, stream_event_context = bt_ctf_event_get_stream_event_context(simple_event); assert(stream_event_context); - stream_event_context_field = bt_ctf_field_structure_get_field( + stream_event_context_field = bt_ctf_field_structure_get_field_by_name( stream_event_context, "common_event_context"); - bt_ctf_field_unsigned_integer_set_value(stream_event_context_field, 42); + bt_ctf_field_integer_unsigned_set_value(stream_event_context_field, 42); /* Populate the event's context */ - ok(bt_ctf_event_get_event_context(NULL) == NULL, - "bt_ctf_event_get_event_context handles NULL correctly"); - event_context = bt_ctf_event_get_event_context(simple_event); + event_context = bt_ctf_event_get_context(simple_event); ok(event_context, - "bt_ctf_event_get_event_context returns a field"); + "bt_ctf_event_get_context returns a field"); returned_type = bt_ctf_field_get_type(event_context); ok(returned_type == event_context_type, - "bt_ctf_event_get_event_context returns a field of the appropriate type"); - event_context_field = bt_ctf_field_structure_get_field(event_context, + "bt_ctf_event_get_context returns a field of the appropriate type"); + event_context_field = bt_ctf_field_structure_get_field_by_name(event_context, "event_specific_context"); - ok(!bt_ctf_field_unsigned_integer_set_value(event_context_field, 1234), + ok(!bt_ctf_field_integer_unsigned_set_value(event_context_field, 1234), "Successfully set an event context's value"); - ok(bt_ctf_event_set_event_context(NULL, event_context) < 0, - "bt_ctf_event_set_event_context handles a NULL event correctly"); - ok(bt_ctf_event_set_event_context(simple_event, NULL) < 0, - "bt_ctf_event_set_event_context handles a NULL event context correctly"); - ok(bt_ctf_event_set_event_context(simple_event, event_context_field) < 0, - "bt_ctf_event_set_event_context rejects a context of the wrong type"); - ok(!bt_ctf_event_set_event_context(simple_event, event_context), + ok(!bt_ctf_event_set_context(simple_event, event_context), "Set an event context successfully"); ok(bt_ctf_stream_append_event(stream, simple_event) == 0, "Append simple event to trace stream"); - ok(bt_ctf_stream_get_packet_context(NULL) == NULL, - "bt_ctf_stream_get_packet_context handles NULL correctly"); packet_context = bt_ctf_stream_get_packet_context(stream); ok(packet_context, "bt_ctf_stream_get_packet_context returns a packet context"); - packet_context_field = bt_ctf_field_structure_get_field(packet_context, + packet_context_field = bt_ctf_field_structure_get_field_by_name(packet_context, "packet_size"); ok(packet_context_field, "Packet context contains the default packet_size field."); bt_put(packet_context_field); - packet_context_field = bt_ctf_field_structure_get_field(packet_context, + packet_context_field = bt_ctf_field_structure_get_field_by_name(packet_context, "custom_packet_context_field"); - ok(bt_ctf_field_unsigned_integer_set_value(packet_context_field, 8) == 0, + ok(bt_ctf_field_integer_unsigned_set_value(packet_context_field, 8) == 0, "Custom packet context field value successfully set."); - ok(bt_ctf_stream_set_packet_context(NULL, packet_context_field) < 0, - "bt_ctf_stream_set_packet_context handles a NULL stream correctly"); - ok(bt_ctf_stream_set_packet_context(stream, NULL) < 0, - "bt_ctf_stream_set_packet_context handles a NULL packet context correctly"); ok(bt_ctf_stream_set_packet_context(stream, packet_context) == 0, "Successfully set a stream's packet context"); @@ -700,30 +470,21 @@ void append_simple_event(struct bt_ctf_stream_class *stream_class, bt_put(ep_integer_field_type); bt_put(ep_enum_field_type); bt_put(ep_enum_field_unsigned_type); + bt_put(iter); } static void append_complex_event(struct bt_ctf_stream_class *stream_class, struct bt_ctf_stream *stream, struct bt_ctf_clock *clock) { - struct event_class_attrs_counts { - int id; - int name; - int loglevel; - int modelemfuri; - int unknown; - } attrs_count; - int i; - int ret; - int64_t int64_value; struct event_class_attrs_counts ; const char *complex_test_event_string = "Complex Test Event"; 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"; + const char *test_string_cat = "Test string abcdeefg"; struct bt_ctf_field_type *uint_35_type = bt_ctf_field_type_integer_create(35); struct bt_ctf_field_type *int_16_type = @@ -750,14 +511,13 @@ void append_complex_event(struct bt_ctf_stream_class *stream_class, *inner_structure_field, *complex_structure_field, *a_sequence_field, *enum_variant_field, *enum_container_field, *variant_field, *an_array_field, *stream_event_ctx_field, - *stream_event_ctx_int_field, *ret_field; + *stream_event_ctx_int_field; uint64_t ret_unsigned_int; int64_t ret_signed_int; const char *ret_string; 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_value *obj; ok(bt_ctf_field_type_set_alignment(int_16_type, 0), "bt_ctf_field_type_set_alignment handles 0-alignment correctly"); @@ -767,34 +527,35 @@ void append_complex_event(struct bt_ctf_stream_class *stream_class, "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, - BT_CTF_INTEGER_BASE_HEXADECIMAL); + ok(!bt_ctf_field_type_set_alignment(int_16_type, 32), + "Set alignment of signed 16 bit integer to 32"); + ok(!bt_ctf_field_type_integer_set_signed(int_16_type, 1), + "Set integer signedness to true"); + ok(!bt_ctf_field_type_integer_set_base(uint_35_type, + BT_CTF_INTEGER_BASE_HEXADECIMAL), + "Set signed 16 bit integer base to hexadecimal"); array_type = bt_ctf_field_type_array_create(int_16_type, ARRAY_TEST_LENGTH); sequence_type = bt_ctf_field_type_sequence_create(int_16_type, "seq_len"); - ok(bt_ctf_field_type_array_get_element_type(NULL) == NULL, - "bt_ctf_field_type_array_get_element_type handles NULL correctly"); - ret_field_type = bt_ctf_field_type_array_get_element_type( + ret_field_type = bt_ctf_field_type_array_get_element_field_type( 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_array_get_element_field_type returns the correct 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"); ok(bt_ctf_field_type_array_get_length(array_type) == ARRAY_TEST_LENGTH, "bt_ctf_field_type_array_get_length returns the correct length"); - bt_ctf_field_type_structure_add_field(inner_structure_type, - uint_35_type, "seq_len"); - bt_ctf_field_type_structure_add_field(inner_structure_type, - sequence_type, "a_sequence"); - bt_ctf_field_type_structure_add_field(inner_structure_type, - array_type, "an_array"); + ok(bt_ctf_field_type_structure_add_field(inner_structure_type, + inner_structure_type, "yes"), "Cannot add self to structure"); + ok(!bt_ctf_field_type_structure_add_field(inner_structure_type, + uint_35_type, "seq_len"), "Add seq_len field to inner structure"); + ok(!bt_ctf_field_type_structure_add_field(inner_structure_type, + sequence_type, "a_sequence"), "Add a_sequence field to inner structure"); + ok(!bt_ctf_field_type_structure_add_field(inner_structure_type, + array_type, "an_array"), "Add an_array field to inner structure"); bt_ctf_field_type_enumeration_add_mapping(enum_variant_type, "UINT3_TYPE", 0, 0); @@ -803,71 +564,38 @@ void append_complex_event(struct bt_ctf_stream_class *stream_class, bt_ctf_field_type_enumeration_add_mapping(enum_variant_type, "UINT35_TYPE", 2, 7); - ok(bt_ctf_field_type_enumeration_get_mapping_index_by_name(NULL, - "INT16_TYPE") < 0, - "bt_ctf_field_type_enumeration_get_mapping_index_by_name handles a NULL field type correctly"); - ok(bt_ctf_field_type_enumeration_get_mapping_index_by_name( - enum_variant_type, NULL) < 0, - "bt_ctf_field_type_enumeration_get_mapping_index_by_name handles a NULL name correctly"); - ok(bt_ctf_field_type_enumeration_get_mapping_index_by_name( - enum_variant_type, "INT16_TYPE") == 1, - "bt_ctf_field_type_enumeration_get_mapping_index_by_name returns the correct index"); - - ok(bt_ctf_field_type_enumeration_get_mapping_index_by_unsigned_value(NULL, 1) < 0, - "bt_ctf_field_type_enumeration_get_mapping_index_by_unsigned_value handles a NULL field type correctly"); - ok(bt_ctf_field_type_enumeration_get_mapping_index_by_unsigned_value(enum_variant_type, -42) < 0, - "bt_ctf_field_type_enumeration_get_mapping_index_by_unsigned_value handles invalid values correctly"); - ok(bt_ctf_field_type_enumeration_get_mapping_index_by_unsigned_value(enum_variant_type, 5) == 2, - "bt_ctf_field_type_enumeration_get_mapping_index_by_unsigned_value returns the correct index"); - ok(bt_ctf_field_type_variant_add_field(variant_type, uint_3_type, "An unknown entry"), "Reject a variant field based on an unknown tag value"); ok(bt_ctf_field_type_variant_add_field(variant_type, uint_3_type, "UINT3_TYPE") == 0, "Add a field to a variant"); - bt_ctf_field_type_variant_add_field(variant_type, int_16_type, - "INT16_TYPE"); - bt_ctf_field_type_variant_add_field(variant_type, uint_35_type, - "UINT35_TYPE"); - - ok(bt_ctf_field_type_variant_get_tag_type(NULL) == NULL, - "bt_ctf_field_type_variant_get_tag_type handles NULL correctly"); - ret_field_type = bt_ctf_field_type_variant_get_tag_type(variant_type); + ok(!bt_ctf_field_type_variant_add_field(variant_type, int_16_type, + "INT16_TYPE"), "Add INT16_TYPE field to variant"); + ok(!bt_ctf_field_type_variant_add_field(variant_type, uint_35_type, + "UINT35_TYPE"), "Add UINT35_TYPE field to variant"); + + ret_field_type = bt_ctf_field_type_variant_get_tag_field_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_variant_get_tag_field_type returns a correct tag 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(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, - "bt_ctf_field_type_variant_get_field_type_by_name handles a NULL variant_type correctly"); - ok(bt_ctf_field_type_variant_get_field_type_by_name(variant_type, - NULL) == NULL, - "bt_ctf_field_type_variant_get_field_type_by_name handles a NULL field name correctly"); ret_field_type = bt_ctf_field_type_variant_get_field_type_by_name( 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_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"); ok(bt_ctf_field_type_variant_get_field_count(variant_type) == 3, "bt_ctf_field_type_variant_get_field_count returns the correct count"); - 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_by_index(variant_type, NULL, &ret_field_type, 0) == 0, "bt_ctf_field_type_variant_get_field handles a NULL field name correctly"); bt_put(ret_field_type); - ok(bt_ctf_field_type_variant_get_field(variant_type, &ret_string, NULL, 0) == 0, + ok(bt_ctf_field_type_variant_get_field_by_index(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"); - ok(bt_ctf_field_type_variant_get_field(variant_type, &ret_string, &ret_field_type, 1) == 0, + ok(bt_ctf_field_type_variant_get_field_by_index(variant_type, &ret_string, &ret_field_type, 1) == 0, "bt_ctf_field_type_variant_get_field returns a field"); ok(!strcmp("INT16_TYPE", ret_string), "bt_ctf_field_type_variant_get_field returns a correct field name"); @@ -875,17 +603,18 @@ void append_complex_event(struct bt_ctf_stream_class *stream_class, "bt_ctf_field_type_variant_get_field returns a correct field type"); bt_put(ret_field_type); - bt_ctf_field_type_structure_add_field(complex_structure_type, - enum_variant_type, "variant_selector"); - bt_ctf_field_type_structure_add_field(complex_structure_type, - string_type, "a_string"); - bt_ctf_field_type_structure_add_field(complex_structure_type, - variant_type, "variant_value"); - bt_ctf_field_type_structure_add_field(complex_structure_type, - inner_structure_type, "inner_structure"); - - ok(bt_ctf_event_class_create("clock") == NULL, - "Reject creation of an event class with an illegal name"); + ok(!bt_ctf_field_type_structure_add_field(complex_structure_type, + enum_variant_type, "variant_selector"), + "Add variant_selector field to complex structure"); + ok(!bt_ctf_field_type_structure_add_field(complex_structure_type, + string_type, "string"), "Add `string` field to complex structure"); + ok(!bt_ctf_field_type_structure_add_field(complex_structure_type, + variant_type, "variant_value"), + "Add variant_value field to complex structure"); + ok(!bt_ctf_field_type_structure_add_field(complex_structure_type, + inner_structure_type, "inner_structure"), + "Add inner_structure field to complex structure"); + event_class = bt_ctf_event_class_create(complex_test_event_string); ok(event_class, "Create an event class"); ok(bt_ctf_event_class_add_field(event_class, uint_35_type, ""), @@ -904,15 +633,11 @@ void append_complex_event(struct bt_ctf_stream_class *stream_class, "complex_structure") == 0, "Add composite structure to an event"); - ok(bt_ctf_event_class_get_name(NULL) == NULL, - "bt_ctf_event_class_get_name handles NULL correctly"); ret_string = bt_ctf_event_class_get_name(event_class); ok(!strcmp(ret_string, complex_test_event_string), "bt_ctf_event_class_get_name returns a correct name"); ok(bt_ctf_event_class_get_id(event_class) < 0, "bt_ctf_event_class_get_id returns a negative value when not set"); - ok(bt_ctf_event_class_get_id(NULL) < 0, - "bt_ctf_event_class_get_id handles NULL correctly"); ok(bt_ctf_event_class_set_id(NULL, 42) < 0, "bt_ctf_event_class_set_id handles NULL correctly"); ok(bt_ctf_event_class_set_id(event_class, 42) == 0, @@ -921,114 +646,28 @@ 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 */ - 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_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_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"); - ret = bt_ctf_event_class_set_attribute(event_class, "name", obj); - 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_PUT(obj); - - 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_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), - "bt_ctf_event_class_get_attribute_value_by_name handles a NULL name correctly"); - ok(!bt_ctf_event_class_get_attribute_value_by_name(event_class, "meow"), - "bt_ctf_event_class_get_attribute_value_by_name fails with a non-existing attribute name"); - obj = bt_ctf_event_class_get_attribute_value_by_name(event_class, - "loglevel"); - int64_value = 0; - 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_PUT(obj); - - 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"), - "bt_ctf_event_class_set_attribute succeeds in replacing the existing \"name\" attribute"); - ret = bt_ctf_event_class_set_attribute(event_class, "id", obj); - 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_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_PUT(obj); - - ok(bt_ctf_event_class_get_attribute_count(NULL), - "bt_ctf_event_class_get_attribute_count handles a NULL event class"); - ok(bt_ctf_event_class_get_attribute_count(event_class) == 4, - "bt_ctf_event_class_get_attribute_count returns the correct count"); - ok(!bt_ctf_event_class_get_attribute_name(NULL, 0), - "bt_ctf_event_class_get_attribute_name handles a NULL event class correctly"); - ok(!bt_ctf_event_class_get_attribute_name(event_class, 4), - "bt_ctf_event_class_get_attribute_name handles a too large index correctly"); - ok(!bt_ctf_event_class_get_attribute_value(NULL, 0), - "bt_ctf_event_class_get_attribute_value handles a NULL event class correctly"); - ok(!bt_ctf_event_class_get_attribute_value(event_class, 4), - "bt_ctf_event_class_get_attribute_value handles a too large index correctly"); - - memset(&attrs_count, 0, sizeof(attrs_count)); - - for (i = 0; i < 4; ++i) { - ret_string = bt_ctf_event_class_get_attribute_name(event_class, - i); - obj = bt_ctf_event_class_get_attribute_value(event_class, i); - assert(ret_string && obj); - - if (!strcmp(ret_string, "id")) { - attrs_count.id++; - 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_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_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_value_is_string(obj), - "bt_ctf_event_class_get_attribute_value returns the correct type (\"%s\")", - ret_string); - } else { - attrs_count.unknown++; - } - - BT_PUT(obj); - } - - ok(attrs_count.unknown == 0, "event class has no unknown attributes"); - ok(attrs_count.id == 1 && attrs_count.name == 1 && - attrs_count.loglevel == 1 && attrs_count.modelemfuri == 1, - "event class has one instance of each known attribute"); + ok(bt_ctf_event_class_get_log_level(event_class) == BT_CTF_EVENT_CLASS_LOG_LEVEL_UNSPECIFIED, + "event class has the expected initial log level"); + ok(!bt_ctf_event_class_get_emf_uri(event_class), + "as expected, event class has no initial EMF URI"); + ok(bt_ctf_event_class_set_log_level(NULL, BT_CTF_EVENT_CLASS_LOG_LEVEL_INFO), + "bt_ctf_event_class_set_log_level handles a NULL event class correctly"); + ok(bt_ctf_event_class_set_log_level(event_class, BT_CTF_EVENT_CLASS_LOG_LEVEL_UNKNOWN), + "bt_ctf_event_class_set_log_level handles an unknown log level correctly"); + ok(!bt_ctf_event_class_set_log_level(event_class, BT_CTF_EVENT_CLASS_LOG_LEVEL_INFO), + "bt_ctf_event_class_set_log_level succeeds with a valid log level"); + ok(bt_ctf_event_class_get_log_level(event_class) == BT_CTF_EVENT_CLASS_LOG_LEVEL_INFO, + "bt_ctf_event_class_get_log_level returns the expected log level"); + ok(bt_ctf_event_class_set_emf_uri(NULL, "http://diamon.org/babeltrace/"), + "bt_ctf_event_class_set_emf_uri handles a NULL event class correctly"); + ok(!bt_ctf_event_class_set_emf_uri(event_class, "http://diamon.org/babeltrace/"), + "bt_ctf_event_class_set_emf_uri succeeds with a valid EMF URI"); + ok(strcmp(bt_ctf_event_class_get_emf_uri(event_class), "http://diamon.org/babeltrace/") == 0, + "bt_ctf_event_class_get_emf_uri returns the expected EMF URI"); + ok(!bt_ctf_event_class_set_emf_uri(event_class, NULL), + "bt_ctf_event_class_set_emf_uri succeeds with NULL (to reset)"); + ok(!bt_ctf_event_class_get_emf_uri(event_class), + "as expected, event class has no EMF URI after reset"); /* Add event class to the stream class */ ok(bt_ctf_stream_class_add_event_class(stream_class, NULL), @@ -1036,156 +675,82 @@ void append_complex_event(struct bt_ctf_stream_class *stream_class, ok(bt_ctf_stream_class_add_event_class(stream_class, event_class) == 0, "Add an event class to stream class"); - ok(bt_ctf_event_class_get_stream_class(NULL) == NULL, - "bt_ctf_event_class_get_stream_class handles NULL correctly"); 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_put(ret_stream_class); - ok(bt_ctf_event_class_get_field_count(NULL) < 0, - "bt_ctf_event_class_get_field_count handles NULL correctly"); - ok(bt_ctf_event_class_get_field_count(event_class) == 3, - "bt_ctf_event_class_get_field_count returns a correct value"); - - ok(bt_ctf_event_class_get_field(NULL, &ret_string, - &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, - "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, - "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, - "bt_ctf_event_class_get_field handles an invalid index correctly"); - ok(bt_ctf_event_class_get_field(event_class, &ret_string, - &ret_field_type, 0) == 0, - "bt_ctf_event_class_get_field returns a field"); - ok(bt_ctf_field_type_compare(ret_field_type, uint_35_type) == 0, - "bt_ctf_event_class_get_field returns a correct 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, - "bt_ctf_event_class_get_field_by_name handles a NULL event class correctly"); - ok(bt_ctf_event_class_get_field_by_name(event_class, NULL) == NULL, - "bt_ctf_event_class_get_field_by_name handles a NULL field name correctly"); ok(bt_ctf_event_class_get_field_by_name(event_class, "truie") == NULL, "bt_ctf_event_class_get_field_by_name handles an invalid field name correctly"); ret_field_type = bt_ctf_event_class_get_field_by_name(event_class, "complex_structure"); - ok(bt_ctf_field_type_compare(ret_field_type, complex_structure_type) == 0, - "bt_ctf_event_class_get_field_by_name returns a correct field type"); bt_put(ret_field_type); event = bt_ctf_event_create(event_class); ok(event, "Instanciate a complex event"); - ok(bt_ctf_event_get_class(NULL) == NULL, - "bt_ctf_event_get_class handles NULL correctly"); 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_put(ret_event_class); uint_35_field = bt_ctf_event_get_payload(event, "uint_35"); - if (!uint_35_field) { - printf("uint_35_field is NULL\n"); - } - ok(uint_35_field, "Use bt_ctf_event_get_payload to get a field instance "); - bt_ctf_field_unsigned_integer_set_value(uint_35_field, 0x0DDF00D); - ok(bt_ctf_field_unsigned_integer_get_value(NULL, &ret_unsigned_int) < 0, - "bt_ctf_field_unsigned_integer_get_value properly properly handles a NULL field."); - ok(bt_ctf_field_unsigned_integer_get_value(uint_35_field, NULL) < 0, - "bt_ctf_field_unsigned_integer_get_value properly handles a NULL return value"); - ok(bt_ctf_field_unsigned_integer_get_value(uint_35_field, + bt_ctf_field_integer_unsigned_set_value(uint_35_field, 0x0DDF00D); + ok(bt_ctf_field_integer_unsigned_get_value(uint_35_field, &ret_unsigned_int) == 0, - "bt_ctf_field_unsigned_integer_get_value succeeds after setting a value"); + "bt_ctf_field_integer_unsigned_get_value succeeds after setting a value"); ok(ret_unsigned_int == 0x0DDF00D, - "bt_ctf_field_unsigned_integer_get_value returns the correct value"); - 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_integer_unsigned_get_value returns the correct value"); 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); - ok(bt_ctf_field_signed_integer_get_value(NULL, &ret_signed_int) < 0, - "bt_ctf_field_signed_integer_get_value properly handles a NULL field"); - ok(bt_ctf_field_signed_integer_get_value(int_16_field, NULL) < 0, - "bt_ctf_field_signed_integer_get_value properly handles a NULL return value"); - ok(bt_ctf_field_signed_integer_get_value(int_16_field, + bt_ctf_field_integer_signed_set_value(int_16_field, -12345); + ok(bt_ctf_field_integer_signed_get_value(int_16_field, &ret_signed_int) == 0, - "bt_ctf_field_signed_integer_get_value succeeds after setting a value"); + "bt_ctf_field_integer_signed_get_value succeeds after setting a value"); ok(ret_signed_int == -12345, - "bt_ctf_field_signed_integer_get_value returns the correct value"); - 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_integer_signed_get_value returns the correct value"); bt_put(int_16_field); complex_structure_field = bt_ctf_event_get_payload(event, "complex_structure"); - ok(bt_ctf_field_structure_get_field_by_index(NULL, 0) == NULL, - "bt_ctf_field_structure_get_field_by_index handles NULL correctly"); - ok(bt_ctf_field_structure_get_field_by_index(NULL, 9) == NULL, - "bt_ctf_field_structure_get_field_by_index handles an invalid index correctly"); 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_put(inner_structure_field); - ok(bt_ctf_field_type_compare(ret_field_type, inner_structure_type) == 0, - "bt_ctf_field_structure_get_field_by_index returns a correct field"); bt_put(ret_field_type); - inner_structure_field = bt_ctf_field_structure_get_field( + inner_structure_field = bt_ctf_field_structure_get_field_by_name( complex_structure_field, "inner_structure"); - a_string_field = bt_ctf_field_structure_get_field( - complex_structure_field, "a_string"); - enum_variant_field = bt_ctf_field_structure_get_field( + a_string_field = bt_ctf_field_structure_get_field_by_name( + complex_structure_field, "string"); + enum_variant_field = bt_ctf_field_structure_get_field_by_name( complex_structure_field, "variant_selector"); - variant_field = bt_ctf_field_structure_get_field( + variant_field = bt_ctf_field_structure_get_field_by_name( complex_structure_field, "variant_value"); - uint_35_field = bt_ctf_field_structure_get_field( + uint_35_field = bt_ctf_field_structure_get_field_by_name( inner_structure_field, "seq_len"); - a_sequence_field = bt_ctf_field_structure_get_field( + a_sequence_field = bt_ctf_field_structure_get_field_by_name( inner_structure_field, "a_sequence"); - an_array_field = bt_ctf_field_structure_get_field( + an_array_field = bt_ctf_field_structure_get_field_by_name( inner_structure_field, "an_array"); enum_container_field = bt_ctf_field_enumeration_get_container( enum_variant_field); - bt_ctf_field_unsigned_integer_set_value(enum_container_field, 1); + bt_ctf_field_integer_unsigned_set_value(enum_container_field, 1); 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_integer_signed_set_value(int_16_field, -200); 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_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), + ok(!bt_ctf_field_string_append_len(a_string_field, &test_string_4[5], 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)"); @@ -1194,50 +759,37 @@ void append_complex_event(struct bt_ctf_stream_class *stream_class, ok(ret_string, "bt_ctf_field_string_get_value returns a string"); 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, + bt_ctf_field_integer_unsigned_set_value(uint_35_field, SEQUENCE_TEST_LENGTH); - ok(bt_ctf_field_type_variant_get_field_type_from_tag(NULL, - enum_container_field) == NULL, - "bt_ctf_field_type_variant_get_field_type_from_tag handles a NULL variant type correctly"); - ok(bt_ctf_field_type_variant_get_field_type_from_tag(variant_type, - NULL) == NULL, - "bt_ctf_field_type_variant_get_field_type_from_tag handles a NULL tag correctly"); ret_field_type = bt_ctf_field_type_variant_get_field_type_from_tag( variant_type, enum_variant_field); ok(ret_field_type == int_16_type, "bt_ctf_field_type_variant_get_field_type_from_tag returns the correct field type"); - ok(bt_ctf_field_sequence_get_length(a_sequence_field) == NULL, - "bt_ctf_field_sequence_get_length returns NULL when length is unset"); ok(bt_ctf_field_sequence_set_length(a_sequence_field, uint_35_field) == 0, "Set a sequence field's length"); - ret_field = bt_ctf_field_sequence_get_length(a_sequence_field); - ok(ret_field == uint_35_field, - "bt_ctf_field_sequence_get_length returns the correct length field"); - ok(bt_ctf_field_sequence_get_length(NULL) == NULL, - "bt_ctf_field_sequence_get_length properly handles NULL"); for (i = 0; i < SEQUENCE_TEST_LENGTH; i++) { 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_integer_signed_set_value(int_16_field, 4 - i); 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_integer_signed_set_value(int_16_field, i); bt_put(int_16_field); } stream_event_ctx_field = bt_ctf_event_get_stream_event_context(event); assert(stream_event_ctx_field); - stream_event_ctx_int_field = bt_ctf_field_structure_get_field( + stream_event_ctx_int_field = bt_ctf_field_structure_get_field_by_name( stream_event_ctx_field, "common_event_context"); BT_PUT(stream_event_ctx_field); - bt_ctf_field_unsigned_integer_set_value(stream_event_ctx_int_field, 17); + bt_ctf_field_integer_unsigned_set_value(stream_event_ctx_int_field, 17); BT_PUT(stream_event_ctx_int_field); bt_ctf_clock_set_time(clock, ++current_time); @@ -1249,9 +801,9 @@ void append_complex_event(struct bt_ctf_stream_class *stream_class, * otherwise flush will fail. */ packet_context = bt_ctf_stream_get_packet_context(stream); - packet_context_field = bt_ctf_field_structure_get_field(packet_context, + packet_context_field = bt_ctf_field_structure_get_field_by_name(packet_context, "custom_packet_context_field"); - bt_ctf_field_unsigned_integer_set_value(packet_context_field, 1); + bt_ctf_field_integer_unsigned_set_value(packet_context_field, 1); ok(bt_ctf_stream_flush(stream) == 0, "Flush a stream containing a complex event"); @@ -1265,7 +817,6 @@ void append_complex_event(struct bt_ctf_stream_class *stream_class, 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); @@ -1283,543 +834,12 @@ void append_complex_event(struct bt_ctf_stream_class *stream_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); -} - -static -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); -} - static void type_field_tests() { struct bt_ctf_field *uint_12; struct bt_ctf_field *int_16; struct bt_ctf_field *string; - struct bt_ctf_field *enumeration; struct bt_ctf_field_type *composite_structure_type; struct bt_ctf_field_type *structure_seq_type; struct bt_ctf_field_type *string_type; @@ -1832,9 +852,6 @@ void type_field_tests() struct bt_ctf_field_type *returned_type; const char *ret_string; - returned_type = bt_ctf_field_get_type(NULL); - ok(!returned_type, "bt_ctf_field_get_type handles NULL correctly"); - ok(uint_12_type, "Create an unsigned integer type"); ok(bt_ctf_field_type_integer_set_base(uint_12_type, BT_CTF_INTEGER_BASE_BINARY) == 0, @@ -1857,12 +874,8 @@ void type_field_tests() "Set integer type signedness to signed"); ok(bt_ctf_field_type_integer_set_signed(uint_12_type, 0) == 0, "Set integer type signedness to unsigned"); - ok(bt_ctf_field_type_integer_get_size(NULL) < 0, - "bt_ctf_field_type_integer_get_size handles NULL correctly"); ok(bt_ctf_field_type_integer_get_size(uint_12_type) == 12, "bt_ctf_field_type_integer_get_size returns a correct value"); - ok(bt_ctf_field_type_integer_get_signed(NULL) < 0, - "bt_ctf_field_type_integer_get_signed handles NULL correctly"); ok(bt_ctf_field_type_integer_get_signed(uint_12_type) == 0, "bt_ctf_field_type_integer_get_signed returns a correct value for unsigned types"); @@ -1881,20 +894,11 @@ void type_field_tests() ok(bt_ctf_field_type_get_byte_order(uint_12_type) == BT_CTF_BYTE_ORDER_BIG_ENDIAN, "bt_ctf_field_type_get_byte_order returns a correct value"); - ok(bt_ctf_field_type_get_byte_order(NULL) == - BT_CTF_BYTE_ORDER_UNKNOWN, - "bt_ctf_field_type_get_byte_order handles NULL correctly"); - ok(bt_ctf_field_type_get_type_id(NULL) == - BT_CTF_TYPE_ID_UNKNOWN, - "bt_ctf_field_type_get_type_id handles NULL correctly"); ok(bt_ctf_field_type_get_type_id(uint_12_type) == - BT_CTF_TYPE_ID_INTEGER, + BT_CTF_FIELD_TYPE_ID_INTEGER, "bt_ctf_field_type_get_type_id returns a correct value with an integer type"); - ok(bt_ctf_field_type_integer_get_base(NULL) == - BT_CTF_INTEGER_BASE_UNKNOWN, - "bt_ctf_field_type_integer_get_base handles NULL correctly"); ok(bt_ctf_field_type_integer_get_base(uint_12_type) == BT_CTF_INTEGER_BASE_HEXADECIMAL, "bt_ctf_field_type_integer_get_base returns a correct value"); @@ -1908,15 +912,14 @@ void type_field_tests() ok(bt_ctf_field_type_integer_set_encoding(uint_12_type, BT_CTF_STRING_ENCODING_UTF8) == 0, "Set integer type encoding to UTF8"); - ok(bt_ctf_field_type_integer_get_encoding(NULL) == - BT_CTF_STRING_ENCODING_UNKNOWN, - "bt_ctf_field_type_integer_get_encoding handles NULL correctly"); ok(bt_ctf_field_type_integer_get_encoding(uint_12_type) == BT_CTF_STRING_ENCODING_UTF8, "bt_ctf_field_type_integer_get_encoding returns a correct value"); int_16_type = bt_ctf_field_type_integer_create(16); - bt_ctf_field_type_integer_set_signed(int_16_type, 1); + assert(int_16_type); + ok(!bt_ctf_field_type_integer_set_signed(int_16_type, 1), + "Set signedness of 16 bit integer to true"); ok(bt_ctf_field_type_integer_get_signed(int_16_type) == 1, "bt_ctf_field_type_integer_get_signed returns a correct value for signed types"); uint_8_type = bt_ctf_field_type_integer_create(8); @@ -1924,21 +927,17 @@ void type_field_tests() bt_ctf_field_type_sequence_create(int_16_type, "seq_len"); ok(sequence_type, "Create a sequence of int16_t type"); ok(bt_ctf_field_type_get_type_id(sequence_type) == - BT_CTF_TYPE_ID_SEQUENCE, + BT_CTF_FIELD_TYPE_ID_SEQUENCE, "bt_ctf_field_type_get_type_id returns a correct value with a sequence type"); - ok(bt_ctf_field_type_sequence_get_length_field_name(NULL) == NULL, - "bt_ctf_field_type_sequence_get_length_field_name handles NULL correctly"); ret_string = bt_ctf_field_type_sequence_get_length_field_name( sequence_type); ok(!strcmp(ret_string, "seq_len"), "bt_ctf_field_type_sequence_get_length_field_name returns the correct value"); - ok(bt_ctf_field_type_sequence_get_element_type(NULL) == NULL, - "bt_ctf_field_type_sequence_get_element_type handles NULL correctly"); - returned_type = bt_ctf_field_type_sequence_get_element_type( + returned_type = bt_ctf_field_type_sequence_get_element_field_type( sequence_type); ok(returned_type == int_16_type, - "bt_ctf_field_type_sequence_get_element_type returns the correct type"); + "bt_ctf_field_type_sequence_get_element_field_type returns the correct type"); bt_put(returned_type); string_type = bt_ctf_field_type_string_create(); @@ -1953,16 +952,13 @@ void type_field_tests() BT_CTF_STRING_ENCODING_ASCII) == 0, "Set string encoding to ASCII"); - ok(bt_ctf_field_type_string_get_encoding(NULL) == - BT_CTF_STRING_ENCODING_UNKNOWN, - "bt_ctf_field_type_string_get_encoding handles NULL correctly"); ok(bt_ctf_field_type_string_get_encoding(string_type) == BT_CTF_STRING_ENCODING_ASCII, "bt_ctf_field_type_string_get_encoding returns the correct value"); structure_seq_type = bt_ctf_field_type_structure_create(); ok(bt_ctf_field_type_get_type_id(structure_seq_type) == - BT_CTF_TYPE_ID_STRUCT, + BT_CTF_FIELD_TYPE_ID_STRUCT, "bt_ctf_field_type_get_type_id returns a correct value with a structure type"); ok(structure_seq_type, "Create a structure type"); ok(bt_ctf_field_type_structure_add_field(structure_seq_type, @@ -1972,14 +968,9 @@ void type_field_tests() sequence_type, "a_sequence") == 0, "Add a sequence type to a structure"); - ok(bt_ctf_field_type_structure_get_field_count(NULL) < 0, - "bt_ctf_field_type_structure_get_field_count handles NULL correctly"); ok(bt_ctf_field_type_structure_get_field_count(structure_seq_type) == 2, "bt_ctf_field_type_structure_get_field_count returns a correct value"); - ok(bt_ctf_field_type_structure_get_field(NULL, - &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, "bt_ctf_field_type_structure_get_field handles a NULL name correctly"); @@ -1987,9 +978,6 @@ void type_field_tests() ok(bt_ctf_field_type_structure_get_field(structure_seq_type, &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, - "bt_ctf_field_type_structure_get_field handles an invalid index correctly"); ok(bt_ctf_field_type_structure_get_field(structure_seq_type, &ret_string, &returned_type, 1) == 0, "bt_ctf_field_type_structure_get_field returns a field"); @@ -1999,10 +987,6 @@ void type_field_tests() "bt_ctf_field_type_structure_get_field returns a correct field 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"); - ok(bt_ctf_field_type_structure_get_field_type_by_name(structure_seq_type, NULL) == NULL, - "bt_ctf_field_type_structure_get_field_type_by_name handles a NULL field name correctly"); returned_type = bt_ctf_field_type_structure_get_field_type_by_name( structure_seq_type, "a_sequence"); ok(returned_type == sequence_type, @@ -2017,12 +1001,6 @@ void type_field_tests() structure_seq_type, "inner_structure") == 0, "Add a structure type to a structure"); - 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 field correctly"); - ok(bt_ctf_field_type_structure_get_field_type_by_name( - structure_seq_type, NULL) == NULL, - "bt_ctf_field_type_structure_get_field_type_by_name handles a NULL field name correctly"); returned_type = bt_ctf_field_type_structure_get_field_type_by_name( structure_seq_type, "a_sequence"); ok(returned_type == sequence_type, @@ -2044,29 +1022,17 @@ void type_field_tests() ok(bt_ctf_field_type_integer_set_signed(uint_12_type, 0), "Check an integer type's signedness can't be modified after instanciation"); - /* Check signed property is checked */ - ok(bt_ctf_field_signed_integer_set_value(uint_12, -52), - "Check bt_ctf_field_signed_integer_set_value is not allowed on an unsigned integer"); - ok(bt_ctf_field_unsigned_integer_set_value(int_16, 42), - "Check bt_ctf_field_unsigned_integer_set_value is not allowed on a signed integer"); - /* Check overflows are properly tested for */ - ok(bt_ctf_field_signed_integer_set_value(int_16, -32768) == 0, + ok(bt_ctf_field_integer_signed_set_value(int_16, -32768) == 0, "Check -32768 is allowed for a signed 16-bit integer"); - ok(bt_ctf_field_signed_integer_set_value(int_16, 32767) == 0, + ok(bt_ctf_field_integer_signed_set_value(int_16, 32767) == 0, "Check 32767 is allowed for a signed 16-bit integer"); - ok(bt_ctf_field_signed_integer_set_value(int_16, 32768), - "Check 32768 is not allowed for a signed 16-bit integer"); - ok(bt_ctf_field_signed_integer_set_value(int_16, -32769), - "Check -32769 is not allowed for a signed 16-bit integer"); - ok(bt_ctf_field_signed_integer_set_value(int_16, -42) == 0, + ok(bt_ctf_field_integer_signed_set_value(int_16, -42) == 0, "Check -42 is allowed for a signed 16-bit integer"); - ok(bt_ctf_field_unsigned_integer_set_value(uint_12, 4095) == 0, + ok(bt_ctf_field_integer_unsigned_set_value(uint_12, 4095) == 0, "Check 4095 is allowed for an unsigned 12-bit integer"); - ok(bt_ctf_field_unsigned_integer_set_value(uint_12, 4096), - "Check 4096 is not allowed for a unsigned 12-bit integer"); - ok(bt_ctf_field_unsigned_integer_set_value(uint_12, 0) == 0, + ok(bt_ctf_field_integer_unsigned_set_value(uint_12, 0) == 0, "Check 0 is allowed for an unsigned 12-bit integer"); string = bt_ctf_field_create(string_type); @@ -2077,14 +1043,10 @@ void type_field_tests() enumeration_type = bt_ctf_field_type_enumeration_create(uint_12_type); ok(enumeration_type, "Create an enumeration type with an unsigned 12-bit integer as container"); - enumeration = bt_ctf_field_create(enumeration_type); - ok(!enumeration, - "Check enumeration types are validated before instantiation"); 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); @@ -2139,7 +1101,7 @@ void packet_resize_test(struct bt_ctf_stream_class *stream_class, * of event_class, so we retrieve the new ones to create the * appropriate fields. */ - ep_type = bt_ctf_event_class_get_payload_type(event_class); + ep_type = bt_ctf_event_class_get_payload_field_type(event_class); assert(ep_type); ep_field_1_type = bt_ctf_field_type_structure_get_field_type_by_name( ep_type, "field_1"); @@ -2149,20 +1111,13 @@ void packet_resize_test(struct bt_ctf_stream_class *stream_class, assert(ep_a_string_type); event = bt_ctf_event_create(event_class); - ret_field = bt_ctf_event_get_payload_by_index(event, 0); + ret_field = bt_ctf_event_get_payload(event, 0); ret_field_type = bt_ctf_field_get_type(ret_field); - ok(bt_ctf_field_type_compare(ret_field_type, integer_type) == 0, - "bt_ctf_event_get_payload_by_index returns a correct 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_put(event); - for (i = 0; i < PACKET_RESIZE_TEST_LENGTH; i++) { + for (i = 0; i < packet_resize_test_length; i++) { event = bt_ctf_event_create(event_class); struct bt_ctf_field *integer = bt_ctf_field_create(ep_field_1_type); @@ -2170,7 +1125,7 @@ void packet_resize_test(struct bt_ctf_stream_class *stream_class, bt_ctf_field_create(ep_a_string_type); ret |= bt_ctf_clock_set_time(clock, ++current_time); - ret |= bt_ctf_field_unsigned_integer_set_value(integer, i); + ret |= bt_ctf_field_integer_unsigned_set_value(integer, i); ret |= bt_ctf_event_set_payload(event, "field_1", integer); bt_put(integer); @@ -2182,10 +1137,10 @@ void packet_resize_test(struct bt_ctf_stream_class *stream_class, /* Populate stream event context */ stream_event_context = bt_ctf_event_get_stream_event_context(event); - integer = bt_ctf_field_structure_get_field(stream_event_context, + integer = bt_ctf_field_structure_get_field_by_name(stream_event_context, "common_event_context"); BT_PUT(stream_event_context); - ret |= bt_ctf_field_unsigned_integer_set_value(integer, + ret |= bt_ctf_field_integer_unsigned_set_value(integer, i % 42); bt_put(integer); @@ -2197,11 +1152,7 @@ void packet_resize_test(struct bt_ctf_stream_class *stream_class, } } - events_appended = !!(i == PACKET_RESIZE_TEST_LENGTH); - ok(bt_ctf_stream_get_discarded_events_count(NULL, &ret_uint64) < 0, - "bt_ctf_stream_get_discarded_events_count handles a NULL stream correctly"); - ok(bt_ctf_stream_get_discarded_events_count(stream, NULL) < 0, - "bt_ctf_stream_get_discarded_events_count handles a NULL return pointer correctly"); + events_appended = !!(i == packet_resize_test_length); ret = bt_ctf_stream_get_discarded_events_count(stream, &ret_uint64); ok(ret == 0 && ret_uint64 == 0, "bt_ctf_stream_get_discarded_events_count returns a correct number of discarded events when none were discarded"); @@ -2218,9 +1169,9 @@ end: * otherwise flush will fail. */ packet_context = bt_ctf_stream_get_packet_context(stream); - packet_context_field = bt_ctf_field_structure_get_field(packet_context, + packet_context_field = bt_ctf_field_structure_get_field_by_name(packet_context, "custom_packet_context_field"); - bt_ctf_field_unsigned_integer_set_value(packet_context_field, 2); + bt_ctf_field_integer_unsigned_set_value(packet_context_field, 2); ok(bt_ctf_stream_flush(stream) == 0, "Flush a stream that forces a packet resize"); @@ -2260,8 +1211,11 @@ 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"); + ret = bt_ctf_stream_class_set_packet_context_type(stream_class, NULL); + assert(ret == 0); + ret = bt_ctf_stream_class_set_event_header_type(stream_class, NULL); + assert(ret == 0); + ok(bt_ctf_stream_class_get_trace(stream_class) == NULL, "bt_ctf_stream_class_get_trace returns NULL when stream class is orphaned"); @@ -2285,11 +1239,10 @@ end: } static -void test_custom_event_header_stream(struct bt_ctf_writer *writer) +void test_custom_event_header_stream(struct bt_ctf_writer *writer, + struct bt_ctf_clock *clock) { 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, @@ -2299,18 +1252,6 @@ void test_custom_event_header_stream(struct bt_ctf_writer *writer) 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"); @@ -2394,14 +1335,14 @@ void test_custom_event_header_stream(struct bt_ctf_writer *writer) goto end; } - integer = bt_ctf_field_structure_get_field(packet_header, + integer = bt_ctf_field_structure_get_field_by_name(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); + ret = bt_ctf_field_integer_unsigned_set_value(integer, 3487); if (ret) { fail("Failed to set custom_trace_packet_header_field value"); goto end; @@ -2420,14 +1361,14 @@ void test_custom_event_header_stream(struct bt_ctf_writer *writer) goto end; } - integer = bt_ctf_field_structure_get_field(event_header, + integer = bt_ctf_field_structure_get_field_by_name(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); + ret = bt_ctf_field_integer_unsigned_set_value(integer, 2); if (ret) { fail("Failed to set seq_len value in event header"); goto end; @@ -2454,7 +1395,7 @@ void test_custom_event_header_stream(struct bt_ctf_writer *writer) goto end; } - ret = bt_ctf_field_unsigned_integer_set_value(integer, i); + ret = bt_ctf_field_integer_unsigned_set_value(integer, i); if (ret) { fail("Failed to set sequence element value"); goto end; @@ -2475,8 +1416,6 @@ void test_custom_event_header_stream(struct bt_ctf_writer *writer) 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); @@ -2491,33 +1430,19 @@ end: } static -void test_instanciate_event_before_stream(struct bt_ctf_writer *writer) +void test_instanciate_event_before_stream(struct bt_ctf_writer *writer, + struct bt_ctf_clock *clock) { int ret = 0; - 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, *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; + struct bt_ctf_field *payload_field = NULL; struct bt_ctf_field *integer = NULL; - trace = bt_ctf_writer_get_trace(writer); - if (!trace) { - diag("Failed to get trace from writer"); - ret = -1; - goto end; - } - - clock = bt_ctf_trace_get_clock(trace, 0); - if (!clock) { - diag("Failed to get clock from trace"); - ret = -1; - goto end; - } - stream_class = bt_ctf_stream_class_create("event_before_stream_test"); if (!stream_class) { diag("Failed to create stream class"); @@ -2559,14 +1484,21 @@ void test_instanciate_event_before_stream(struct bt_ctf_writer *writer) goto end; } - integer = bt_ctf_event_get_payload_by_index(event, 0); + payload_field = bt_ctf_event_get_payload_field(event); + if (!payload_field) { + diag("Failed to get event's payload field"); + ret = -1; + goto end; + } + + integer = bt_ctf_field_structure_get_field_by_index(payload_field, 0); if (!integer) { diag("Failed to get integer field payload from event"); ret = -1; goto end; } - ret = bt_ctf_field_unsigned_integer_set_value(integer, 1234); + ret = bt_ctf_field_integer_unsigned_set_value(integer, 1234); if (ret) { diag("Failed to set integer field value"); goto end; @@ -2579,11 +1511,6 @@ 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"); @@ -2596,7 +1523,6 @@ void test_instanciate_event_before_stream(struct bt_ctf_writer *writer) end: ok(ret == 0, "Create an event before instanciating its associated stream"); - bt_put(trace); bt_put(stream); bt_put(ret_stream); bt_put(stream_class); @@ -2604,7 +1530,7 @@ end: bt_put(event); bt_put(integer_type); bt_put(integer); - bt_put(clock); + bt_put(payload_field); } static @@ -2614,280 +1540,18 @@ void append_existing_event_class(struct bt_ctf_stream_class *stream_class) 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"); + ok(bt_ctf_stream_class_add_event_class(stream_class, event_class) == 0, + "two event classes with the same name may cohabit within the same stream class"); bt_put(event_class); event_class = bt_ctf_event_class_create("different name, ok"); assert(event_class); - assert(!bt_ctf_event_class_set_id(event_class, 11)); + assert(!bt_ctf_event_class_set_id(event_class, 13)); 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_put(event_class); } -static -void test_trace_stream_class_clock(void) -{ - struct bt_ctf_trace *trace = NULL; - struct bt_ctf_stream_class *sc1 = NULL; - struct bt_ctf_stream_class *sc2 = NULL; - struct bt_ctf_clock *sc1_clock = NULL; - struct bt_ctf_clock *sc2_clock = NULL; - const char *clock_name = "hello"; - - trace = bt_ctf_trace_create(); - assert(trace); - sc1 = bt_ctf_stream_class_create(NULL); - assert(sc1); - sc2 = bt_ctf_stream_class_create(NULL); - assert(sc2); - sc1_clock = bt_ctf_clock_create(clock_name); - assert(sc1_clock); - sc2_clock = bt_ctf_clock_create(clock_name); - assert(sc2_clock); - - ok(!bt_ctf_stream_class_set_clock(sc1, sc1_clock), - "bt_ctf_stream_class_set_clock() succeeds for sc1"); - ok(!bt_ctf_stream_class_set_clock(sc2, sc2_clock), - "bt_ctf_stream_class_set_clock() succeeds for sc2"); - ok(!bt_ctf_trace_add_stream_class(trace, sc1), - "bt_ctf_trace_add_stream_class() succeeds with sc1"); - ok(bt_ctf_trace_add_stream_class(trace, sc2), - "bt_ctf_trace_add_stream_class() fails with sc2 (different clock, same name)"); - - BT_PUT(trace); - BT_PUT(sc1); - BT_PUT(sc2); - BT_PUT(sc1_clock); - BT_PUT(sc2_clock); -} - -static -struct bt_ctf_event_class *create_minimal_event_class(void) -{ - struct bt_ctf_event_class *ec = NULL; - struct bt_ctf_field_type *int_ft = NULL; - int ret; - - int_ft = bt_ctf_field_type_integer_create(23); - assert(int_ft); - ec = bt_ctf_event_class_create("minimal"); - assert(ec); - ret = bt_ctf_event_class_add_field(ec, int_ft, "field"); - assert(!ret); - BT_PUT(int_ft); - - return ec; -} - -static -void test_create_writer_vs_non_writer_mode(void) -{ - int ret; - char trace_path[] = "/tmp/ctfwriter_XXXXXX"; - const char *writer_stream_name = "writer stream instance"; - struct bt_ctf_writer *writer = NULL; - struct bt_ctf_trace *writer_trace = NULL; - struct bt_ctf_stream_class *writer_sc = NULL; - struct bt_ctf_stream *writer_stream = NULL; - struct bt_ctf_stream *writer_stream2 = NULL; - struct bt_ctf_stream *packet_stream = NULL; - struct bt_ctf_trace *non_writer_trace = NULL; - struct bt_ctf_stream_class *non_writer_sc = NULL; - struct bt_ctf_stream *non_writer_stream = NULL; - struct bt_ctf_stream *non_writer_stream2 = NULL; - struct bt_ctf_event_class *writer_ec = NULL; - struct bt_ctf_event_class *non_writer_ec = NULL; - struct bt_ctf_event *event = NULL; - struct bt_ctf_event *event2 = NULL; - struct bt_ctf_field_type *empty_struct_ft = NULL; - struct bt_ctf_field *int_field = NULL; - struct bt_ctf_clock *writer_clock = NULL; - struct bt_ctf_clock *non_writer_clock = NULL; - struct bt_ctf_packet *packet = NULL; - struct bt_ctf_packet *packet2 = NULL; - - if (!bt_mkdtemp(trace_path)) { - perror("# perror"); - } - - /* Create empty structure field type (event header) */ - empty_struct_ft = bt_ctf_field_type_structure_create(); - assert(empty_struct_ft); - - /* Create writer, writer stream class, stream, and clock */ - writer = bt_ctf_writer_create(trace_path); - assert(writer); - writer_trace = bt_ctf_writer_get_trace(writer); - ok(writer_trace, "bt_ctf_writer_get_trace() returns a trace"); - writer_sc = bt_ctf_stream_class_create("writer_sc"); - assert(writer_sc); - ret = bt_ctf_stream_class_set_event_header_type(writer_sc, - empty_struct_ft); - assert(!ret); - ret = bt_ctf_trace_add_stream_class(writer_trace, writer_sc); - assert(!ret); - writer_stream = bt_ctf_stream_create(writer_sc, writer_stream_name); - assert(writer_stream); - ok(!strcmp(bt_ctf_stream_get_name(writer_stream), writer_stream_name), - "bt_ctf_stream_get_name() returns the stream's name"); - writer_clock = bt_ctf_clock_create("writer_clock"); - assert(writer_clock); - ret = bt_ctf_trace_add_clock(writer_trace, writer_clock); - assert(!ret); - - /* Create non-writer trace, stream class, stream, and clock */ - non_writer_trace = bt_ctf_trace_create(); - assert(non_writer_trace); - non_writer_sc = bt_ctf_stream_class_create("nonwriter_sc"); - assert(non_writer_sc); - ret = bt_ctf_stream_class_set_event_header_type(non_writer_sc, - empty_struct_ft); - assert(!ret); - ret = bt_ctf_trace_add_stream_class(non_writer_trace, non_writer_sc); - assert(!ret); - non_writer_stream = bt_ctf_stream_create(non_writer_sc, NULL); - assert(non_writer_stream); - non_writer_clock = bt_ctf_clock_create("non_writer_clock"); - assert(non_writer_clock); - ret = bt_ctf_trace_add_clock(non_writer_trace, non_writer_clock); - assert(!ret); - - /* Create event class and event */ - writer_ec = create_minimal_event_class(); - assert(writer_ec); - ret = bt_ctf_stream_class_add_event_class(writer_sc, writer_ec); - assert(!ret); - event = bt_ctf_event_create(writer_ec); - assert(event); - int_field = bt_ctf_event_get_payload_by_index(event, 0); - assert(int_field); - bt_ctf_field_unsigned_integer_set_value(int_field, 17); - - /* - * Verify non-writer stream: it should be impossible to append - * an event to it. - */ - ok(bt_ctf_stream_append_event(non_writer_stream, event), - "bt_ctf_stream_append_event() fails with a non-writer stream"); - - /* - * Verify writer stream: it should be possible to append an - * event to it. - */ - ok(!bt_ctf_stream_append_event(writer_stream, event), - "bt_ctf_stream_append_event() succeeds with a writer stream"); - - /* - * Verify that it's possible to get and set the value of a - * writer mode clock. - */ - ok (!bt_ctf_clock_set_value(writer_clock, 1000), - "bt_ctf_clock_set_value() succeeds with a writer mode clock"); - ok (bt_ctf_clock_get_value(writer_clock) == 1000, - "bt_ctf_clock_get_value() succeeds with a writer mode clock"); - - /* - * Verify that it's impossible to get and set the value of a - * non-writer mode clock. - */ - ok (bt_ctf_clock_set_value(non_writer_clock, 1000), - "bt_ctf_clock_set_value() fails with a non-writer mode clock"); - ok (bt_ctf_clock_get_value(non_writer_clock) == -1ULL, - "bt_ctf_clock_get_value() fails with a non-writer mode clock"); - - /* - * It should be possible to create a packet from a non-writer - * stream, but not from a writer stream. - */ - packet = bt_ctf_packet_create(writer_stream); - ok(!packet, "bt_ctf_packet_create() fails with a writer stream"); - packet = bt_ctf_packet_create(non_writer_stream); - ok(packet, "bt_ctf_packet_create() succeeds with a non-writer stream"); - packet_stream = bt_ctf_packet_get_stream(packet); - ok(packet_stream == non_writer_stream, - "bt_ctf_packet_get_stream() returns the correct stream"); - - /* - * It should not be possible to append an event associated to - * a stream to a different stream. - */ - writer_stream2 = bt_ctf_stream_create(writer_sc, "zoo"); - assert(writer_stream2); - ok(bt_ctf_stream_append_event(writer_stream2, event), - "bt_ctf_stream_append_event() fails with an event associated to another stream"); - - /* - * It should not be possible to set the packet of an event - * associated to a given stream to a packet associated with - * a different stream. - */ - ok(bt_ctf_event_set_packet(event, packet), - "bt_ctf_event_set_packet() fails with a packet not sharing the event's stream"); - - /* - * It should be possible to set the packet of a fresh event, as - * long as the originating stream classes are the same. - */ - event2 = bt_ctf_event_create(writer_ec); - assert(event2); - ok(bt_ctf_event_set_packet(event2, packet), - "bt_ctf_event_set_packet() fails when the event's and the packet's stream class differ"); - non_writer_ec = create_minimal_event_class(); - assert(non_writer_ec); - ret = bt_ctf_stream_class_add_event_class(non_writer_sc, non_writer_ec); - assert(!ret); - BT_PUT(event2); - event2 = bt_ctf_event_create(non_writer_ec); - assert(event2); - ok(!bt_ctf_event_set_packet(event2, packet), - "bt_ctf_event_set_packet() succeeds when the event's and the packet's stream class are the same"); - - /* - * It should be possible to set a packet created from the same - * stream to an event with an existing packet. - */ - packet2 = bt_ctf_packet_create(non_writer_stream); - assert(packet2); - ok(!bt_ctf_event_set_packet(event2, packet2), - "bt_ctf_event_set_packet() succeeds when the event's current packet has the same stream"); - BT_PUT(packet2); - - /* - * It should not be possible to set a packet created from a - * different stream to an event with an existing packet. - */ - non_writer_stream2 = bt_ctf_stream_create(non_writer_sc, "rj45"); - assert(non_writer_stream2); - packet2 = bt_ctf_packet_create(non_writer_stream); - assert(packet2); - ok(!bt_ctf_event_set_packet(event2, packet2), - "bt_ctf_event_set_packet() fails when the event's current packet does not have the same stream"); - - bt_put(writer); - bt_put(writer_trace); - bt_put(writer_sc); - bt_put(writer_stream); - bt_put(writer_stream2); - bt_put(non_writer_trace); - bt_put(non_writer_sc); - bt_put(non_writer_stream); - bt_put(non_writer_stream2); - bt_put(packet_stream); - bt_put(writer_ec); - bt_put(non_writer_ec); - bt_put(event); - bt_put(event2); - bt_put(int_field); - bt_put(empty_struct_ft); - bt_put(writer_clock); - bt_put(non_writer_clock); - bt_put(packet); - bt_put(packet2); - recursive_rmdir(trace_path); -} - static void test_clock_utils(void) { @@ -2902,40 +1566,37 @@ void test_clock_utils(void) assert(!ret); ret = bt_ctf_clock_set_frequency(clock, 1000000000); assert(!ret); - ok(bt_ctf_clock_ns_from_value(clock, 4321) == 1234000005321ULL, - "bt_ctf_clock_ns_from_value() returns the correct value with a 1 GHz frequency"); ret = bt_ctf_clock_set_frequency(clock, 1534); assert(!ret); - ok(bt_ctf_clock_ns_from_value(clock, 4321) == - (uint64_t) 1237468709256.845, - "bt_ctf_clock_ns_from_value() returns the correct value with a non-1 GHz frequency"); BT_PUT(clock); } int main(int argc, char **argv) { - char trace_path[] = "/tmp/ctfwriter_XXXXXX"; - char metadata_path[sizeof(trace_path) + 9]; + const char *env_resize_length; + gchar *trace_path; + gchar *metadata_path; const char *clock_name = "test_clock"; const char *clock_description = "This is a test clock"; const char *returned_clock_name; const char *returned_clock_description; const uint64_t frequency = 1123456789; - const int64_t offset_s = 1351530929945824323; + const int64_t offset_s = 13515309; const int64_t offset = 1234567; int64_t get_offset_s, - get_offset, - get_time; + get_offset; const uint64_t precision = 10; const int is_absolute = 0xFF; char *metadata_string; struct bt_ctf_writer *writer; - struct utsname name; - char hostname[BABELTRACE_HOST_NAME_MAX]; + struct bt_utsname name = {"GNU/Linux", "testhost", "4.4.0-87-generic", + "#110-Ubuntu SMP Tue Jul 18 12:55:35 UTC 2017", "x86_64"}; struct bt_ctf_clock *clock, *ret_clock; + struct bt_ctf_clock_class *ret_clock_class; struct bt_ctf_stream_class *stream_class, *ret_stream_class; struct bt_ctf_stream *stream1; + struct bt_ctf_stream *stream; const char *ret_string; const unsigned char *ret_uuid; unsigned char tmp_uuid[16] = { 0 }; @@ -2953,19 +1614,25 @@ int main(int argc, char **argv) int64_t ret_int64_t; struct bt_value *obj; - if (argc < 3) { - printf("Usage: tests-ctf-writer path_to_ctf_parser_test path_to_babeltrace\n"); + if (argc < 2) { + printf("Usage: tests-ctf-writer path_to_babeltrace\n"); return -1; } + env_resize_length = getenv("PACKET_RESIZE_TEST_LENGTH"); + if (env_resize_length) { + packet_resize_test_length = + (unsigned int) atoi(env_resize_length); + } + plan_tests(NR_TESTS); + trace_path = g_build_filename(g_get_tmp_dir(), "ctfwriter_XXXXXX", NULL); if (!bt_mkdtemp(trace_path)) { perror("# perror"); } - strcpy(metadata_path, trace_path); - strcat(metadata_path + sizeof(trace_path) - 1, "/metadata"); + metadata_path = g_build_filename(trace_path, "metadata", NULL); writer = bt_ctf_writer_create(trace_path); ok(writer, "bt_ctf_create succeeds in creating trace with path"); @@ -2973,21 +1640,21 @@ int main(int argc, char **argv) ok(!bt_ctf_writer_get_trace(NULL), "bt_ctf_writer_get_trace correctly handles NULL"); trace = bt_ctf_writer_get_trace(writer); + ok(bt_ctf_trace_set_native_byte_order(trace, BT_CTF_BYTE_ORDER_NATIVE), + "Cannot set a trace's byte order to BT_CTF_BYTE_ORDER_NATIVE"); + ok(bt_ctf_trace_set_native_byte_order(trace, BT_CTF_BYTE_ORDER_UNSPECIFIED), + "Cannot set a trace's byte order to BT_CTF_BYTE_ORDER_UNSPECIFIED"); ok(trace, "bt_ctf_writer_get_trace returns a bt_ctf_trace object"); - ok(bt_ctf_trace_set_byte_order(trace, BT_CTF_BYTE_ORDER_BIG_ENDIAN) == 0, + ok(bt_ctf_trace_set_native_byte_order(trace, BT_CTF_BYTE_ORDER_BIG_ENDIAN) == 0, "Set a trace's byte order to big endian"); - ok(bt_ctf_trace_get_byte_order(trace) == BT_CTF_BYTE_ORDER_BIG_ENDIAN, - "bt_ctf_trace_get_byte_order returns a correct endianness"); + ok(bt_ctf_trace_get_native_byte_order(trace) == BT_CTF_BYTE_ORDER_BIG_ENDIAN, + "bt_ctf_trace_get_native_byte_order returns a correct endianness"); /* Add environment context to the trace */ - ret = gethostname(hostname, sizeof(hostname)); - if (ret < 0) { - return ret; - } - ok(bt_ctf_writer_add_environment_field(writer, "host", hostname) == 0, + ok(bt_ctf_writer_add_environment_field(writer, "host", name.nodename) == 0, "Add host (%s) environment field to writer instance", - hostname); + name.nodename); ok(bt_ctf_writer_add_environment_field(NULL, "test_field", "test_value"), "bt_ctf_writer_add_environment_field error with NULL writer"); @@ -3042,58 +1709,39 @@ int main(int argc, char **argv) "bt_ctf_trace_set_environment_field_string succeeds"); /* Test bt_ctf_trace_get_environment_field_count */ - ok(bt_ctf_trace_get_environment_field_count(NULL) < 0, - "bt_ctf_trace_get_environment_field_count handles a NULL trace correctly"); ok(bt_ctf_trace_get_environment_field_count(trace) == 5, "bt_ctf_trace_get_environment_field_count returns a correct number of environment fields"); /* Test bt_ctf_trace_get_environment_field_name */ - ok(bt_ctf_trace_get_environment_field_name(NULL, 0) == NULL, - "bt_ctf_trace_get_environment_field_name handles a NULL trace correctly"); - ok(bt_ctf_trace_get_environment_field_name(trace, -1) == NULL, - "bt_ctf_trace_get_environment_field_name handles an invalid index correctly (negative)"); - ok(bt_ctf_trace_get_environment_field_name(trace, 5) == NULL, - "bt_ctf_trace_get_environment_field_name handles an invalid index correctly (too large)"); - ret_string = bt_ctf_trace_get_environment_field_name(trace, 0); + ret_string = bt_ctf_trace_get_environment_field_name_by_index(trace, 0); ok(ret_string && !strcmp(ret_string, "host"), "bt_ctf_trace_get_environment_field_name returns a correct field name"); - ret_string = bt_ctf_trace_get_environment_field_name(trace, 1); + ret_string = bt_ctf_trace_get_environment_field_name_by_index(trace, 1); ok(ret_string && !strcmp(ret_string, "test_env_int_obj"), "bt_ctf_trace_get_environment_field_name returns a correct field name"); - ret_string = bt_ctf_trace_get_environment_field_name(trace, 2); + ret_string = bt_ctf_trace_get_environment_field_name_by_index(trace, 2); ok(ret_string && !strcmp(ret_string, "test_env_str_obj"), "bt_ctf_trace_get_environment_field_name returns a correct field name"); - ret_string = bt_ctf_trace_get_environment_field_name(trace, 3); + ret_string = bt_ctf_trace_get_environment_field_name_by_index(trace, 3); ok(ret_string && !strcmp(ret_string, "test_env_int"), "bt_ctf_trace_get_environment_field_name returns a correct field name"); - ret_string = bt_ctf_trace_get_environment_field_name(trace, 4); + ret_string = bt_ctf_trace_get_environment_field_name_by_index(trace, 4); ok(ret_string && !strcmp(ret_string, "test_env_str"), "bt_ctf_trace_get_environment_field_name returns a correct field name"); /* Test bt_ctf_trace_get_environment_field_value */ - ok(bt_ctf_trace_get_environment_field_value(NULL, 0) == NULL, - "bt_ctf_trace_get_environment_field_value handles a NULL trace correctly"); - ok(bt_ctf_trace_get_environment_field_value(trace, -1) == NULL, - "bt_ctf_trace_get_environment_field_value handles an invalid index correctly (negative)"); - 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); + obj = bt_ctf_trace_get_environment_field_value_by_index(trace, 1); 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_PUT(obj); - obj = bt_ctf_trace_get_environment_field_value(trace, 2); + obj = bt_ctf_trace_get_environment_field_value_by_index(trace, 2); 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_PUT(obj); /* Test bt_ctf_trace_get_environment_field_value_by_name */ - ok(!bt_ctf_trace_get_environment_field_value_by_name(NULL, - "test_env_str"), - "bt_ctf_trace_get_environment_field_value_by_name handles a NULL trace correctly"); - ok(!bt_ctf_trace_get_environment_field_value_by_name(trace, NULL), - "bt_ctf_trace_get_environment_field_value_by_name handles a NULL name correctly"); ok(!bt_ctf_trace_get_environment_field_value_by_name(trace, "oh oh"), "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, @@ -3109,18 +1757,12 @@ int main(int argc, char **argv) "bt_ctf_trace_set_environment_field_integer succeeds with an existing name"); 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); + obj = bt_ctf_trace_get_environment_field_value_by_index(trace, 3); 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_PUT(obj); - /* On Solaris, uname() can return any positive value on success */ - if (uname(&name) < 0) { - perror("uname"); - return -1; - } - ok(bt_ctf_writer_add_environment_field(writer, "sysname", name.sysname) == 0, "Add sysname (%s) environment field to writer instance", name.sysname); @@ -3141,7 +1783,6 @@ int main(int argc, char **argv) /* Define a clock and add it to the trace */ ok(bt_ctf_clock_create("signed") == NULL, "Illegal clock name rejected"); - ok(bt_ctf_clock_create(NULL) == NULL, "NULL clock name rejected"); clock = bt_ctf_clock_create(clock_name); ok(clock, "Clock created sucessfully"); returned_clock_name = bt_ctf_clock_get_name(clock); @@ -3202,63 +1843,8 @@ int main(int argc, char **argv) "Set clock absolute property"); 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, &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_get_value(clock) == DEFAULT_CLOCK_VALUE, - "bt_ctf_clock_get_value returns the correct default value"); - ok(bt_ctf_clock_set_value(clock, current_time) == 0, - "Set clock value"); - ok(bt_ctf_clock_get_value(clock) == current_time, - "bt_ctf_clock_get_value returns the correct value once it is set"); ok(bt_ctf_clock_set_time(clock, current_time) == 0, "Set clock time"); - ok(bt_ctf_clock_get_time(clock, &get_time) == 0, - "bt_ctf_clock_get_time succeeds"); - ok(get_time >= current_time - 1 && get_time <= current_time + 1, - "bt_ctf_clock_get_time returns the correct time once it is set"); - - ok(!bt_ctf_clock_get_name(NULL), - "bt_ctf_clock_get_name correctly handles NULL"); - ok(!bt_ctf_clock_get_description(NULL), - "bt_ctf_clock_get_description correctly handles NULL"); - ok(bt_ctf_clock_get_frequency(NULL) == -1ULL, - "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, &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, &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"); - ok(bt_ctf_clock_set_frequency(NULL, frequency) < 0, - "bt_ctf_clock_set_frequency correctly handles NULL clock"); - ok(bt_ctf_clock_set_precision(NULL, precision) < 0, - "bt_ctf_clock_get_precision correctly handles NULL clock"); - ok(bt_ctf_clock_set_offset_s(NULL, offset_s) < 0, - "bt_ctf_clock_set_offset_s correctly handles NULL clock"); - ok(bt_ctf_clock_set_offset(NULL, offset) < 0, - "bt_ctf_clock_set_offset correctly handles NULL clock"); - ok(bt_ctf_clock_set_is_absolute(NULL, is_absolute) < 0, - "bt_ctf_clock_set_is_absolute correctly handles NULL clock"); - ok(bt_ctf_clock_set_time(NULL, current_time) < 0, - "bt_ctf_clock_set_time correctly handles NULL clock"); - ok(bt_ctf_clock_get_uuid(NULL) == NULL, - "bt_ctf_clock_get_uuid correctly handles NULL clock"); ret_uuid = bt_ctf_clock_get_uuid(clock); ok(ret_uuid, "bt_ctf_clock_get_uuid returns a UUID"); @@ -3268,10 +1854,6 @@ int main(int argc, char **argv) tmp_uuid[sizeof(tmp_uuid) - 1]++; } - ok(bt_ctf_clock_set_uuid(NULL, tmp_uuid) < 0, - "bt_ctf_clock_set_uuid correctly handles a NULL clock"); - ok(bt_ctf_clock_set_uuid(clock, NULL) < 0, - "bt_ctf_clock_set_uuid correctly handles a NULL UUID"); ok(bt_ctf_clock_set_uuid(clock, tmp_uuid) == 0, "bt_ctf_clock_set_uuid sets a new uuid successfully"); ret_uuid = bt_ctf_clock_get_uuid(clock); @@ -3282,9 +1864,6 @@ int main(int argc, char **argv) /* Define a stream class */ stream_class = bt_ctf_stream_class_create("test_stream"); - - ok(bt_ctf_stream_class_get_name(NULL) == NULL, - "bt_ctf_stream_class_get_name handles NULL correctly"); ret_string = bt_ctf_stream_class_get_name(stream_class); ok(ret_string && !strcmp(ret_string, "test_stream"), "bt_ctf_stream_class_get_name returns a correct stream class name"); @@ -3305,13 +1884,8 @@ int main(int argc, char **argv) /* 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, - "bt_ctf_stream_class_get_id handles NULL correctly"); ok(bt_ctf_stream_class_set_id(NULL, 123) < 0, "bt_ctf_stream_class_set_id handles NULL correctly"); ok(bt_ctf_stream_class_set_id(stream_class, 123) == 0, @@ -3320,13 +1894,11 @@ int main(int argc, char **argv) "bt_ctf_stream_class_get_id returns the correct value"); /* Validate default event header fields */ - ok(bt_ctf_stream_class_get_event_header_type(NULL) == NULL, - "bt_ctf_stream_class_get_event_header_type handles NULL correctly"); ret_field_type = bt_ctf_stream_class_get_event_header_type( stream_class); ok(ret_field_type, "bt_ctf_stream_class_get_event_header_type returns an event header type"); - ok(bt_ctf_field_type_get_type_id(ret_field_type) == BT_CTF_TYPE_ID_STRUCT, + ok(bt_ctf_field_type_get_type_id(ret_field_type) == BT_CTF_FIELD_TYPE_ID_STRUCT, "Default event header type is a structure"); event_header_field_type = bt_ctf_field_type_structure_get_field_type_by_name( @@ -3334,7 +1906,7 @@ int main(int argc, char **argv) ok(event_header_field_type, "Default event header type contains an \"id\" field"); ok(bt_ctf_field_type_get_type_id( - event_header_field_type) == BT_CTF_TYPE_ID_INTEGER, + event_header_field_type) == BT_CTF_FIELD_TYPE_ID_INTEGER, "Default event header \"id\" field is an integer"); bt_put(event_header_field_type); event_header_field_type = @@ -3343,19 +1915,17 @@ int main(int argc, char **argv) ok(event_header_field_type, "Default event header type contains a \"timestamp\" field"); ok(bt_ctf_field_type_get_type_id( - event_header_field_type) == BT_CTF_TYPE_ID_INTEGER, + event_header_field_type) == BT_CTF_FIELD_TYPE_ID_INTEGER, "Default event header \"timestamp\" field is an integer"); 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, - "bt_ctf_trace_get_packet_header_type handles NULL correctly"); - packet_header_type = bt_ctf_trace_get_packet_header_type(trace); + packet_header_type = bt_ctf_trace_get_packet_header_field_type(trace); ok(packet_header_type, - "bt_ctf_trace_get_packet_header_type returns a packet header"); - ok(bt_ctf_field_type_get_type_id(packet_header_type) == BT_CTF_TYPE_ID_STRUCT, - "bt_ctf_trace_get_packet_header_type returns a packet header of type struct"); + "bt_ctf_trace_get_packet_header_field_type returns a packet header"); + ok(bt_ctf_field_type_get_type_id(packet_header_type) == BT_CTF_FIELD_TYPE_ID_STRUCT, + "bt_ctf_trace_get_packet_header_field_type returns a packet header of type struct"); 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"); @@ -3374,32 +1944,27 @@ int main(int argc, char **argv) packet_header_field_type, "custom_trace_packet_header_field"), "Added a custom trace packet header field successfully"); - ok(bt_ctf_trace_set_packet_header_type(NULL, packet_header_type) < 0, - "bt_ctf_trace_set_packet_header_type handles a NULL trace correctly"); - ok(bt_ctf_trace_set_packet_header_type(trace, NULL) < 0, - "bt_ctf_trace_set_packet_header_type handles a NULL packet_header_type correctly"); - ok(!bt_ctf_trace_set_packet_header_type(trace, packet_header_type), + ok(bt_ctf_trace_set_packet_header_field_type(NULL, packet_header_type) < 0, + "bt_ctf_trace_set_packet_header_field_type handles a NULL trace correctly"); + ok(!bt_ctf_trace_set_packet_header_field_type(trace, packet_header_type), "Set a trace packet_header_type successfully"); - ok(bt_ctf_stream_class_get_packet_context_type(NULL) == NULL, - "bt_ctf_stream_class_get_packet_context_type handles NULL correctly"); - /* Add a custom field to the stream class' packet context */ packet_context_type = bt_ctf_stream_class_get_packet_context_type(stream_class); ok(packet_context_type, "bt_ctf_stream_class_get_packet_context_type returns a packet context type."); - ok(bt_ctf_field_type_get_type_id(packet_context_type) == BT_CTF_TYPE_ID_STRUCT, + ok(bt_ctf_field_type_get_type_id(packet_context_type) == BT_CTF_FIELD_TYPE_ID_STRUCT, "Packet context is a structure"); ok(bt_ctf_stream_class_set_packet_context_type(NULL, packet_context_type), "bt_ctf_stream_class_set_packet_context_type handles a NULL stream class correctly"); - ok(bt_ctf_stream_class_set_packet_context_type(stream_class, NULL), - "bt_ctf_stream_class_set_packet_context_type handles a NULL packet context type correctly"); integer_type = bt_ctf_field_type_integer_create(32); + ok(bt_ctf_stream_class_set_packet_context_type(stream_class, integer_type) < 0, "bt_ctf_stream_class_set_packet_context_type rejects a packet context that is not a structure"); + /* Create a "uint5_t" equivalent custom packet context field */ packet_context_field_type = bt_ctf_field_type_integer_create(5); @@ -3408,11 +1973,6 @@ int main(int argc, char **argv) ok(ret == 0, "Packet context field added successfully"); /* Define a stream event context containing a my_integer field. */ - ok(bt_ctf_stream_class_get_event_context_type(NULL) == NULL, - "bt_ctf_stream_class_get_event_context_type handles NULL correctly"); - ok(bt_ctf_stream_class_get_event_context_type( - stream_class) == NULL, - "bt_ctf_stream_class_get_event_context_type returns NULL when no stream event context type was set."); stream_event_context_type = bt_ctf_field_type_structure_create(); bt_ctf_field_type_structure_add_field(stream_event_context_type, integer_type, "common_event_context"); @@ -3420,9 +1980,6 @@ int main(int argc, char **argv) ok(bt_ctf_stream_class_set_event_context_type(NULL, stream_event_context_type) < 0, "bt_ctf_stream_class_set_event_context_type handles a NULL stream_class correctly"); - ok(bt_ctf_stream_class_set_event_context_type(stream_class, - NULL) < 0, - "bt_ctf_stream_class_set_event_context_type handles a NULL event_context correctly"); ok(bt_ctf_stream_class_set_event_context_type(stream_class, integer_type) < 0, "bt_ctf_stream_class_set_event_context_type validates that the event context os a structure"); @@ -3430,50 +1987,49 @@ int main(int argc, char **argv) ok(bt_ctf_stream_class_set_event_context_type( stream_class, stream_event_context_type) == 0, "Set a new stream event context type"); + ret_field_type = bt_ctf_stream_class_get_event_context_type( stream_class); ok(ret_field_type == stream_event_context_type, "bt_ctf_stream_class_get_event_context_type returns the correct field type."); bt_put(ret_field_type); + /* Instantiate a stream and append events */ + ret = bt_ctf_writer_add_clock(writer, clock); + assert(ret == 0); + + ok(bt_ctf_trace_get_stream_count(trace) == 0, + "bt_ctf_trace_get_stream_count() succeeds and returns the correct value (0)"); stream1 = bt_ctf_writer_create_stream(writer, stream_class); ok(stream1, "Instanciate a stream class from writer"); + ok(bt_ctf_trace_get_stream_count(trace) == 1, + "bt_ctf_trace_get_stream_count() succeeds and returns the correct value (1)"); + stream = bt_ctf_trace_get_stream_by_index(trace, 0); + ok(stream == stream1, + "bt_ctf_trace_get_stream_by_index() succeeds and returns the correct value"); + BT_PUT(stream); /* * Creating a stream through a writer adds the given stream * class to the writer's trace, thus registering the stream * class's clock to the trace. */ - ok(bt_ctf_trace_get_clock_count(NULL) < 0, - "bt_ctf_trace_get_clock_count correctly handles NULL"); - ok(bt_ctf_trace_get_clock_count(trace) == 1, - "bt_ctf_trace_get_clock_count returns the correct number of clocks"); - ok(!bt_ctf_trace_get_clock(NULL, 0), - "bt_ctf_trace_get_clock correctly handles NULL"); - ok(!bt_ctf_trace_get_clock(trace, -1), - "bt_ctf_trace_get_clock correctly handles negative indexes"); - ok(!bt_ctf_trace_get_clock(trace, 1), - "bt_ctf_trace_get_clock correctly handles out of bound accesses"); - ret_clock = bt_ctf_trace_get_clock(trace, 0); - ok(ret_clock == clock, - "bt_ctf_trace_get_clock returns the right clock instance"); - 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), - "bt_ctf_trace_get_clock_by_name correctly handles NULL (clock name)"); - ok(!bt_ctf_trace_get_clock_by_name(NULL, NULL), - "bt_ctf_trace_get_clock_by_name correctly handles NULL (both)"); - 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_put(ret_clock); - ok(!bt_ctf_trace_get_clock_by_name(trace, "random"), + ok(bt_ctf_trace_get_clock_class_count(trace) == 1, + "bt_ctf_trace_get_clock_class_count returns the correct number of clocks"); + ret_clock_class = bt_ctf_trace_get_clock_class_by_index(trace, 0); + ok(strcmp(bt_ctf_clock_class_get_name(ret_clock_class), + bt_ctf_clock_get_name(clock)) == 0, + "bt_ctf_trace_get_clock_class returns the right clock instance"); + bt_put(ret_clock_class); + ret_clock_class = bt_ctf_trace_get_clock_class_by_name(trace, clock_name); + ok(strcmp(bt_ctf_clock_class_get_name(ret_clock_class), + bt_ctf_clock_get_name(clock)) == 0, + "bt_ctf_trace_get_clock_class returns the right clock instance"); + bt_put(ret_clock_class); + ok(!bt_ctf_trace_get_clock_class_by_name(trace, "random"), "bt_ctf_trace_get_clock_by_name fails when the requested clock doesn't exist"); - ok(bt_ctf_stream_get_class(NULL) == NULL, - "bt_ctf_stream_get_class correctly handles NULL"); ret_stream_class = bt_ctf_stream_get_class(stream1); ok(ret_stream_class, "bt_ctf_stream_get_class returns a stream class"); @@ -3488,7 +2044,7 @@ int main(int argc, char **argv) BT_PUT(packet_header_type); BT_PUT(packet_context_type); BT_PUT(stream_event_context_type); - packet_header_type = bt_ctf_trace_get_packet_header_type(trace); + packet_header_type = bt_ctf_trace_get_packet_header_field_type(trace); assert(packet_header_type); packet_context_type = bt_ctf_stream_class_get_packet_context_type(stream_class); @@ -3538,14 +2094,12 @@ int main(int argc, char **argv) ok(ret_field_type == packet_header_type, "Stream returns a packet header of the appropriate type"); bt_put(ret_field_type); - packet_header_field = bt_ctf_field_structure_get_field(packet_header, + packet_header_field = bt_ctf_field_structure_get_field_by_name(packet_header, "custom_trace_packet_header_field"); ok(packet_header_field, "Packet header structure contains a custom field with the appropriate name"); ret_field_type = bt_ctf_field_get_type(packet_header_field); - ok(bt_ctf_field_type_compare(ret_field_type, packet_header_field_type) == 0, - "Custom packet header field is of the expected type"); - ok(!bt_ctf_field_unsigned_integer_set_value(packet_header_field, + ok(!bt_ctf_field_integer_unsigned_set_value(packet_header_field, 54321), "Set custom packet header value successfully"); ok(bt_ctf_stream_set_packet_header(stream1, NULL) < 0, "bt_ctf_stream_set_packet_header handles a NULL packet header correctly"); @@ -3561,11 +2115,7 @@ int main(int argc, char **argv) test_clock_utils(); - test_trace_stream_class_clock(); - - test_create_writer_vs_non_writer_mode(); - - test_instanciate_event_before_stream(writer); + test_instanciate_event_before_stream(writer, clock); append_simple_event(stream_class, stream1, clock); @@ -3577,14 +2127,12 @@ int main(int argc, char **argv) test_empty_stream(writer); - test_custom_event_header_stream(writer); + test_custom_event_header_stream(writer, clock); metadata_string = bt_ctf_writer_get_metadata_string(writer); ok(metadata_string, "Get metadata string"); bt_ctf_writer_flush_metadata(writer); - validate_metadata(argv[1], metadata_path); - validate_trace(argv[2], trace_path); bt_put(clock); bt_put(ret_stream_class); @@ -3603,6 +2151,11 @@ int main(int argc, char **argv) free(metadata_string); bt_put(stream_class); + validate_trace(argv[1], trace_path); + recursive_rmdir(trace_path); + g_free(trace_path); + g_free(metadata_path); + return 0; }