X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=tests%2Flib%2Ftest_ctf_writer.c;h=d45953d3823a98096e6f526c63575df79936aa92;hb=74fb045227fb3f01c59bd469c76f466fbd7a25a0;hp=c756c55484a368cccd0fe867407b894ad8f6e875;hpb=a3d8579b8aab73e557495a934c7c00490fda9a2d;p=babeltrace.git diff --git a/tests/lib/test_ctf_writer.c b/tests/lib/test_ctf_writer.c index c756c554..d45953d3 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 @@ -27,29 +27,29 @@ #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 -#include +#include "common.h" #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,43 +59,18 @@ #define DEFAULT_CLOCK_TIME 0 #define DEFAULT_CLOCK_VALUE 0 -#define NR_TESTS 605 +#define NR_TESTS 623 -static int64_t current_time = 42; - -static -void delete_trace(const char *trace_path) -{ - /* Remove all trace files and delete temporary trace directory */ - struct dirent *entry; - DIR *trace_dir = opendir(trace_path); - - if (!trace_dir) { - perror("# opendir"); - return; - } - - while ((entry = readdir(trace_dir))) { - struct stat st; - char filename[PATH_MAX]; - - if (snprintf(filename, sizeof(filename), "%s/%s", - trace_path, entry->d_name) <= 0) { - continue; - } - - if (stat(filename, &st)) { - continue; - } - - if (S_ISREG(st.st_mode)) { - unlinkat(bt_dirfd(trace_dir), entry->d_name, 0); - } - } +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]; +}; - rmdir(trace_path); - closedir(trace_dir); -} +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 @@ -120,203 +95,49 @@ 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; + gchar *standard_error = NULL; + gint exit_status; + char *argv[] = {parser_path, trace_path, 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, + &standard_error, + &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; - } + /* 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 - 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; - - if (!trace_path) { - ret = -1; + if (ret != 0) { + diag("Babeltrace returned an error."); + diag_multiline(standard_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"); - } - } + g_free(standard_error); } static @@ -353,7 +174,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; @@ -364,11 +184,13 @@ 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); @@ -414,44 +236,53 @@ 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"); + iter = bt_ctf_field_type_enumeration_find_mappings_by_signed_value(NULL, -42); + ok(iter == NULL, "bt_ctf_field_type_enumeration_find_mappings_by_signed_value handles a NULL field type correctly"); + + iter = bt_ctf_field_type_enumeration_find_mappings_by_signed_value(enum_type, -4200000); + ret = bt_ctf_field_type_enumeration_mapping_iterator_next(iter); + ok(iter && ret, "bt_ctf_field_type_enumeration_find_mappings_by_signed_value rejects non-mapped values"); + BT_PUT(iter); + + iter = bt_ctf_field_type_enumeration_find_mappings_by_signed_value(enum_type, 3); + ok(iter != NULL, "bt_ctf_field_type_enumeration_find_mappings_by_signed_value succeeds with mapped value"); + ret = bt_ctf_field_type_enumeration_mapping_iterator_next(iter); + ok(!ret && bt_ctf_field_type_enumeration_mapping_iterator_get_signed(iter, NULL, NULL, NULL) == 0, + "bt_ctf_field_type_enumeration_mapping_iterator_get_signed handles mapped values correctly"); + BT_PUT(iter); 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, + ok(bt_ctf_field_type_enumeration_get_mapping_signed(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, + "bt_ctf_field_type_enumeration_get_mapping_signed handles a NULL enumeration correctly"); + ok(bt_ctf_field_type_enumeration_get_mapping_signed(enum_type, 0, NULL, + &ret_range_start_int64_t, &ret_range_end_int64_t) == 0, + "bt_ctf_field_type_enumeration_get_mapping_signed handles a NULL string correctly"); + ok(bt_ctf_field_type_enumeration_get_mapping_signed(enum_type, 0, &ret_char, + NULL, &ret_range_end_int64_t) == 0, + "bt_ctf_field_type_enumeration_get_mapping_signed handles a NULL start correctly"); + ok(bt_ctf_field_type_enumeration_get_mapping_signed(enum_type, 0, &ret_char, + &ret_range_start_int64_t, NULL) == 0, + "bt_ctf_field_type_enumeration_get_mapping_signed handles a NULL end correctly"); + /* Assumes entries are sorted by range_start values. */ + ok(bt_ctf_field_type_enumeration_get_mapping_signed(enum_type, 6, &ret_char, &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_get_mapping_signed 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_get_mapping_signed 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_get_mapping_signed 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_get_mapping_signed returns a correct mapping end"); ok(bt_ctf_field_type_enumeration_add_mapping_unsigned(enum_type_unsigned, "escaping; \"test\"", 0, 0) == 0, @@ -462,12 +293,12 @@ void append_simple_event(struct bt_ctf_stream_class *stream_class, ok(bt_ctf_field_type_enumeration_add_mapping_unsigned(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"); + 42, 42) == 0, "bt_ctf_field_type_enumeration_add_mapping_unsigned accepts single-value ranges"); + ok(bt_ctf_field_type_enumeration_add_mapping_unsigned(enum_type_unsigned, mapping_name_test, + 43, 51) == 0, "bt_ctf_field_type_enumeration_add_mapping_unsigned accepts 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"); + 7, 8) == 0, "bt_ctf_field_type_enumeration_add_mapping_unsigned accepts 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"); ok(bt_ctf_event_class_add_field(simple_event_class, enum_type_unsigned, @@ -475,22 +306,22 @@ void append_simple_event(struct bt_ctf_stream_class *stream_class, 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, + &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, + 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, + &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_get_mapping_unsigned(enum_type_unsigned, 4, &ret_char, &ret_range_start_uint64_t, &ret_range_end_uint64_t) == 0, "bt_ctf_field_type_enumeration_get_mapping_unsigned returns a value"); ok(!strcmp(ret_char, mapping_name_test), @@ -507,17 +338,13 @@ 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), @@ -527,7 +354,8 @@ void append_simple_event(struct bt_ctf_stream_class *stream_class, "bt_ctf_event_class_get_context_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 @@ -559,11 +387,11 @@ void append_simple_event(struct bt_ctf_stream_class *stream_class, "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, + ok(bt_ctf_stream_class_get_event_class_by_index(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, + ok(bt_ctf_stream_class_get_event_class_by_index(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); @@ -577,28 +405,10 @@ 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); ok(bt_ctf_event_set_payload(simple_event, "integer_field", @@ -619,20 +429,28 @@ 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"); + + iter = bt_ctf_field_enumeration_get_mappings(NULL); + ok(!iter, "bt_ctf_field_enumeration_get_mappings handles NULL correctly"); + iter = bt_ctf_field_enumeration_get_mappings(enum_field); + ok(!iter, "bt_ctf_field_enumeration_get_mappings 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, -42) == 0, "Set signed enumeration container value"); - ret_char = bt_ctf_field_enumeration_get_mapping_name(enum_field); + iter = bt_ctf_field_enumeration_get_mappings(enum_field); + ok(iter, "bt_ctf_field_enumeration_get_mappings returns an iterator to matching mappings"); + ret = bt_ctf_field_type_enumeration_mapping_iterator_next(iter); + ok(!ret, "bt_ctf_field_enumeration_get_mappings returned a non-empty match"); + ret = bt_ctf_field_type_enumeration_mapping_iterator_get_signed(iter, &ret_char, NULL, NULL); + ok(!ret && ret_char, "bt_ctf_field_type_enumeration_mapping_iterator_get_signed return a mapping name"); + assert(ret_char); ok(!strcmp(ret_char, mapping_name_negative_test), - "bt_ctf_field_enumeration_get_mapping_name returns the correct mapping name with an signed container"); + "bt_ctf_field_enumeration_get_single_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); @@ -644,9 +462,13 @@ void append_simple_event(struct bt_ctf_stream_class *stream_class, 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); + iter = bt_ctf_field_enumeration_get_mappings(enum_field_unsigned); + assert(iter); + ret = bt_ctf_field_type_enumeration_mapping_iterator_next(iter); + assert(!ret); + (void) bt_ctf_field_type_enumeration_mapping_iterator_get_unsigned(iter, &ret_char, NULL, NULL); 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"); + "bt_ctf_field_type_enumeration_mapping_iterator_get_unsigned returns the correct mapping name with an unsigned container"); ok(bt_ctf_clock_set_time(clock, current_time) == 0, "Set clock time"); @@ -734,23 +556,14 @@ 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; + int i, ret; struct event_class_attrs_counts ; const char *complex_test_event_string = "Complex Test Event"; const char *test_string_1 = "Test "; @@ -791,7 +604,7 @@ void append_complex_event(struct bt_ctf_stream_class *stream_class, struct bt_ctf_stream_class *ret_stream_class; struct bt_ctf_event_class *ret_event_class; struct bt_ctf_field *packet_context, *packet_context_field; - struct bt_value *obj; + struct bt_ctf_field_type_enumeration_mapping_iterator *iter = NULL; ok(bt_ctf_field_type_set_alignment(int_16_type, 0), "bt_ctf_field_type_set_alignment handles 0-alignment correctly"); @@ -801,10 +614,13 @@ 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, @@ -823,12 +639,14 @@ void append_complex_event(struct bt_ctf_stream_class *stream_class, 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); @@ -837,31 +655,47 @@ 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"); + iter = bt_ctf_field_type_enumeration_find_mappings_by_name(NULL, "INT16_TYPE"); + ok(iter == NULL, "bt_ctf_field_type_enumeration_find_mappings_by_name handles a NULL field type correctly"); + + iter = bt_ctf_field_type_enumeration_find_mappings_by_name(enum_variant_type, "INT16_TYPE"); + ok(iter != NULL, "bt_ctf_field_type_enumeration_find_mappings_by_name returns a non-NULL iterator"); + ret = bt_ctf_field_type_enumeration_mapping_iterator_next(iter); + ok(!ret, "bt_ctf_field_type_enumeration_find_mappings_by_name handles an existing mapping correctly"); + ok(bt_ctf_field_type_enumeration_mapping_iterator_get_unsigned(iter, NULL, NULL, NULL) == 0, + "bt_ctf_field_type_enumeration_mapping_iterator_get_unsigned handles mapped values correctly"); + BT_PUT(iter); + + iter = bt_ctf_field_type_enumeration_find_mappings_by_name(enum_variant_type, NULL); + ret = bt_ctf_field_type_enumeration_mapping_iterator_next(iter); + ok(iter && ret, "bt_ctf_field_type_enumeration_find_mappings_by_name handles a NULL name correctly"); + BT_PUT(iter); + + iter = bt_ctf_field_type_enumeration_find_mappings_by_unsigned_value(NULL, 1); + ok(iter == NULL, "bt_ctf_field_type_enumeration_find_mappings_by_unsigned_value handles a NULL field type correctly"); + + iter = bt_ctf_field_type_enumeration_find_mappings_by_unsigned_value(enum_variant_type, -42); + ret = bt_ctf_field_type_enumeration_mapping_iterator_next(iter); + ok(iter && ret, "bt_ctf_field_type_enumeration_find_mappings_by_unsigned_value handles invalid values correctly"); + ok(bt_ctf_field_type_enumeration_mapping_iterator_get_unsigned(iter, NULL, NULL, NULL) != 0, + "bt_ctf_field_type_enumeration_mapping_iterator_get_unsigned handles invalid values correctly"); + BT_PUT(iter); + + iter = bt_ctf_field_type_enumeration_find_mappings_by_unsigned_value(enum_variant_type, 5); + ret = bt_ctf_field_type_enumeration_mapping_iterator_next(iter); + ok(iter != NULL && !ret, "bt_ctf_field_type_enumeration_find_mappings_by_unsigned_value handles valid values correctly"); + ok(bt_ctf_field_type_enumeration_mapping_iterator_get_unsigned(iter, NULL, NULL, NULL) == 0, + "bt_ctf_field_type_enumeration_mapping_iterator_get_unsigned handles valid values correctly"); + BT_PUT(iter); 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_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"); ok(bt_ctf_field_type_variant_get_tag_type(NULL) == NULL, "bt_ctf_field_type_variant_get_tag_type handles NULL correctly"); @@ -909,17 +743,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, "a_string"), "Add a_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, ""), @@ -955,114 +790,32 @@ 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(NULL) == BT_CTF_EVENT_CLASS_LOG_LEVEL_UNKNOWN, + "bt_ctf_event_class_get_log_level handles a NULL event class correctly"); + 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(!bt_ctf_event_class_get_emf_uri(NULL), + "bt_ctf_event_class_get_emf_uri handles a NULL event class correctly"); + 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), @@ -1077,25 +830,25 @@ void append_complex_event(struct bt_ctf_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, + ok(bt_ctf_event_class_get_payload_type_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, + ok(bt_ctf_event_class_get_payload_type_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, + ok(bt_ctf_event_class_get_payload_type_field_by_index(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, + ok(bt_ctf_event_class_get_payload_type_field_by_index(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, + ok(bt_ctf_event_class_get_payload_type_field_by_index(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, + ok(bt_ctf_event_class_get_payload_type_field_by_index(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, + ok(bt_ctf_event_class_get_payload_type_field_by_index(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, @@ -1395,6 +1148,7 @@ void field_copy_tests() struct bt_ctf_field *a_3_copy = NULL; struct bt_ctf_field *a_4_copy = NULL; struct bt_ctf_field *strct_copy = NULL; + struct bt_ctf_field_type_enumeration_mapping_iterator *e_iter = NULL; uint64_t uint64_t_val; const char *str_val; double double_val; @@ -1722,7 +1476,10 @@ void field_copy_tests() "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); + e_iter = bt_ctf_field_enumeration_get_mappings(e_copy); + (void) bt_ctf_field_type_enumeration_mapping_iterator_next(e_iter); + (void) bt_ctf_field_type_enumeration_mapping_iterator_get_signed(e_iter, + &str_val, NULL, NULL); ok(str_val && !strcmp(str_val, "LABEL2"), "bt_ctf_field_copy creates a valid enum field copy"); @@ -1845,6 +1602,7 @@ void field_copy_tests() bt_put(a_3_copy); bt_put(a_4_copy); bt_put(strct_copy); + bt_put(e_iter); } static @@ -1920,10 +1678,10 @@ void type_field_tests() "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_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) == @@ -1950,7 +1708,9 @@ void type_field_tests() "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); @@ -1958,7 +1718,7 @@ 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, @@ -1996,7 +1756,7 @@ void type_field_tests() 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, @@ -2196,7 +1956,7 @@ void packet_resize_test(struct bt_ctf_stream_class *stream_class, "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); @@ -2231,7 +1991,7 @@ void packet_resize_test(struct bt_ctf_stream_class *stream_class, } } - events_appended = !!(i == PACKET_RESIZE_TEST_LENGTH); + 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, @@ -2294,6 +2054,11 @@ void test_empty_stream(struct bt_ctf_writer *writer) goto end; } + 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(NULL) == NULL, "bt_ctf_stream_class_get_trace handles NULL correctly"); ok(bt_ctf_stream_class_get_trace(stream_class) == NULL, @@ -2319,11 +2084,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, @@ -2333,18 +2097,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"); @@ -2509,8 +2261,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); @@ -2525,11 +2275,10 @@ 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; @@ -2538,20 +2287,6 @@ void test_instanciate_event_before_stream(struct bt_ctf_writer *writer) struct bt_ctf_field_type *integer_type = 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"); @@ -2630,7 +2365,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); @@ -2638,7 +2372,6 @@ end: bt_put(event); bt_put(integer_type); bt_put(integer); - bt_put(clock); } static @@ -2648,55 +2381,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) { @@ -2719,7 +2415,7 @@ static void test_create_writer_vs_non_writer_mode(void) { int ret; - char trace_path[] = "/tmp/ctfwriter_XXXXXX"; + gchar *trace_path; const char *writer_stream_name = "writer stream instance"; struct bt_ctf_writer *writer = NULL; struct bt_ctf_trace *writer_trace = NULL; @@ -2738,10 +2434,11 @@ void test_create_writer_vs_non_writer_mode(void) 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_clock_class *non_writer_clock_class = NULL; struct bt_ctf_packet *packet = NULL; struct bt_ctf_packet *packet2 = NULL; + trace_path = g_build_filename(g_get_tmp_dir(), "ctfwriter_XXXXXX", NULL); if (!bt_mkdtemp(trace_path)) { perror("# perror"); } @@ -2753,6 +2450,12 @@ void test_create_writer_vs_non_writer_mode(void) /* Create writer, writer stream class, stream, and clock */ writer = bt_ctf_writer_create(trace_path); assert(writer); + writer_clock = bt_ctf_clock_create("writer_clock"); + assert(writer_clock); + ret = bt_ctf_writer_add_clock(writer, writer_clock); + assert(!ret); + ret = bt_ctf_writer_set_byte_order(writer, BT_CTF_BYTE_ORDER_LITTLE_ENDIAN); + assert(!ret); 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"); @@ -2760,16 +2463,14 @@ void test_create_writer_vs_non_writer_mode(void) ret = bt_ctf_stream_class_set_event_header_type(writer_sc, empty_struct_ft); assert(!ret); + ret = bt_ctf_stream_class_set_clock(writer_sc, writer_clock); + 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(); @@ -2779,13 +2480,18 @@ void test_create_writer_vs_non_writer_mode(void) ret = bt_ctf_stream_class_set_event_header_type(non_writer_sc, empty_struct_ft); assert(!ret); + ret = bt_ctf_stream_class_set_packet_context_type(non_writer_sc, NULL); + 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); + non_writer_clock_class = + bt_ctf_clock_class_create("non_writer_clock_class", + 1000000000); + assert(non_writer_clock_class); + ret = bt_ctf_trace_add_clock_class(non_writer_trace, + non_writer_clock_class); assert(!ret); /* Create event class and event */ @@ -2813,24 +2519,6 @@ void test_create_writer_vs_non_writer_mode(void) 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. @@ -2916,10 +2604,11 @@ void test_create_writer_vs_non_writer_mode(void) bt_put(int_field); bt_put(empty_struct_ft); bt_put(writer_clock); - bt_put(non_writer_clock); + bt_put(non_writer_clock_class); bt_put(packet); bt_put(packet2); - delete_trace(trace_path); + recursive_rmdir(trace_path); + g_free(trace_path); } static @@ -2936,40 +2625,220 @@ 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); } +void test_set_clock_non_writer_stream_class(void) +{ + struct bt_ctf_clock *clock; + struct bt_ctf_trace *trace; + struct bt_ctf_stream_class *sc; + int ret; + + clock = bt_ctf_clock_create("the_clock"); + assert(clock); + + trace = bt_ctf_trace_create(); + assert(trace); + + sc = bt_ctf_stream_class_create(NULL); + assert(sc); + + ret = bt_ctf_stream_class_set_clock(sc, clock); + assert(ret == 0); + + ret = bt_ctf_trace_add_stream_class(trace, sc); + ok(ret < 0, + "bt_ctf_trace_add_stream_class() fails with a stream class with a registered clock"); + + bt_put(clock); + bt_put(trace); + bt_put(sc); +} + +static +void test_static_trace(void) +{ + struct bt_ctf_trace *trace; + struct bt_ctf_stream_class *stream_class; + struct bt_ctf_stream_class *stream_class2; + struct bt_ctf_stream *stream; + struct bt_ctf_clock_class *clock_class; + int ret; + + trace = bt_ctf_trace_create(); + assert(trace); + stream_class = bt_ctf_stream_class_create(NULL); + assert(stream_class); + ret = bt_ctf_stream_class_set_packet_context_type(stream_class, NULL); + assert(ret == 0); + ret = bt_ctf_trace_add_stream_class(trace, stream_class); + assert(ret == 0); + stream = bt_ctf_stream_create(stream_class, "hello"); + ok(stream, "bt_ctf_stream_create() succeeds with a non-static trace"); + bt_put(stream); + ok(!bt_ctf_trace_is_static(trace), + "bt_ctf_trace_is_static() returns the expected value"); + ok(bt_ctf_trace_set_is_static(trace) == 0, + "bt_ctf_trace_set_is_static() succeeds"); + ok(bt_ctf_trace_is_static(trace), + "bt_ctf_trace_is_static() returns the expected value"); + clock_class = bt_ctf_clock_class_create("yes", 1000000000); + assert(clock_class); + stream_class2 = bt_ctf_stream_class_create(NULL); + assert(stream_class2); + ok(bt_ctf_trace_add_stream_class(trace, stream_class2), + "bt_ctf_trace_add_stream_class() fails with a static trace"); + ok(bt_ctf_trace_add_clock_class(trace, clock_class), + "bt_ctf_trace_add_clock_class() fails with a static trace"); + ok(!bt_ctf_stream_create(stream_class, "hello2"), + "bt_ctf_stream_create() fails with a static trace"); + + bt_put(trace); + bt_put(stream_class); + bt_put(stream_class2); + bt_put(clock_class); +} + +static +void trace_is_static_listener(struct bt_ctf_trace *trace, void *data) +{ + *((int *) data) |= 1; +} + +static +void trace_listener_removed(struct bt_ctf_trace *trace, void *data) +{ + *((int *) data) |= 2; +} + +static +void test_trace_is_static_listener(void) +{ + struct bt_ctf_trace *trace; + int ret; + int called1 = 0; + int called2 = 0; + int called3 = 0; + int called4 = 0; + int listener1_id; + int listener2_id; + int listener3_id; + int listener4_id; + + trace = bt_ctf_trace_create(); + assert(trace); + ret = bt_ctf_trace_add_is_static_listener(NULL, + trace_is_static_listener, trace_listener_removed, &called1); + ok(ret < 0, "bt_ctf_trace_add_is_static_listener() handles NULL (trace)"); + ret = bt_ctf_trace_add_is_static_listener(trace, NULL, + trace_listener_removed, &called1); + ok(ret < 0, "bt_ctf_trace_add_is_static_listener() handles NULL (listener)"); + listener1_id = bt_ctf_trace_add_is_static_listener(trace, + trace_is_static_listener, trace_listener_removed, &called1); + ok(listener1_id >= 0, "bt_ctf_trace_add_is_static_listener() succeeds (1)"); + listener2_id = bt_ctf_trace_add_is_static_listener(trace, + trace_is_static_listener, trace_listener_removed, &called2); + ok(listener2_id >= 0, "bt_ctf_trace_add_is_static_listener() succeeds (2)"); + listener3_id = bt_ctf_trace_add_is_static_listener(trace, + trace_is_static_listener, trace_listener_removed, &called3); + ok(listener3_id >= 0, "bt_ctf_trace_add_is_static_listener() succeeds (3)"); + ret = bt_ctf_trace_remove_is_static_listener(NULL, 0); + ok(ret < 0, "bt_ctf_trace_remove_is_static_listener() handles NULL (trace)"); + ret = bt_ctf_trace_remove_is_static_listener(trace, -2); + ok(ret < 0, "bt_ctf_trace_remove_is_static_listener() handles invalid ID (negative)"); + ret = bt_ctf_trace_remove_is_static_listener(trace, 77); + ok(ret < 0, "bt_ctf_trace_remove_is_static_listener() handles invalid ID (non existing)"); + ret = bt_ctf_trace_remove_is_static_listener(trace, listener2_id); + ok(ret == 0, "bt_ctf_trace_remove_is_static_listener() succeeds"); + ok(called2 == 2, "bt_ctf_trace_remove_is_static_listener() calls the remove listener"); + listener4_id = bt_ctf_trace_add_is_static_listener(trace, + trace_is_static_listener, NULL, &called4); + ok(listener4_id >= 0, "bt_ctf_trace_add_is_static_listener() succeeds (4)"); + ok(called1 == 0, "\"trace is static\" listener not called before the trace is made static (1)"); + ok(called2 == 2, "\"trace is static\" listener not called before the trace is made static (2)"); + ok(called3 == 0, "\"trace is static\" listener not called before the trace is made static (3)"); + ok(called4 == 0, "\"trace is static\" listener not called before the trace is made static (4)"); + ret = bt_ctf_trace_set_is_static(trace); + assert(ret == 0); + ret = bt_ctf_trace_add_is_static_listener(trace, + trace_is_static_listener, trace_listener_removed, &called1); + ok(ret < 0, + "bt_ctf_trace_add_is_static_listener() fails when the trace is static"); + ok(called1 == 1, "\"trace is static\" listener called when the trace is made static (1)"); + ok(called2 == 2, "\"trace is static\" listener not called when the trace is made static (2)"); + ok(called3 == 1, "\"trace is static\" listener called when the trace is made static (3)"); + ok(called4 == 1, "\"trace is static\" listener called when the trace is made static (4)"); + called1 = 0; + called2 = 0; + called3 = 0; + called4 = 0; + bt_put(trace); + ok(called1 == 2, "\"trace is static\" listener not called after the trace is put (1)"); + ok(called2 == 0, "\"trace is static\" listener not called after the trace is put (2)"); + ok(called3 == 2, "\"trace is static\" listener not called after the trace is put (3)"); + ok(called4 == 0, "\"trace is static\" listener not called after the trace is put (4)"); +} + +static +void test_trace_uuid(void) +{ + struct bt_ctf_trace *trace; + const unsigned char uuid[] = { + 0x35, 0x92, 0x63, 0xab, 0xb4, 0xbe, 0x40, 0xb4, + 0xb2, 0x60, 0xd3, 0xf1, 0x3b, 0xb0, 0xd8, 0x59, + }; + const unsigned char *ret_uuid; + + trace = bt_ctf_trace_create(); + assert(trace); + ok(!bt_ctf_trace_get_uuid(NULL), + "bt_ctf_trace_get_uuid() handles NULL"); + ok(!bt_ctf_trace_get_uuid(trace), + "bt_ctf_trace_get_uuid() returns NULL initially"); + ok(bt_ctf_trace_set_uuid(NULL, uuid), + "bt_ctf_trace_set_uuid() handles NULL (trace)"); + ok(bt_ctf_trace_set_uuid(trace, NULL), + "bt_ctf_trace_set_uuid() handles NULL (UUID)"); + ok(bt_ctf_trace_set_uuid(trace, uuid) == 0, + "bt_ctf_trace_set_uuid() succeeds with a valid UUID"); + ret_uuid = bt_ctf_trace_get_uuid(trace); + ok(ret_uuid, "bt_ctf_trace_get_uuid() returns a UUID"); + assert(ret_uuid); + ok(memcmp(uuid, ret_uuid, 16) == 0, + "bt_ctf_trace_get_uuid() returns the expected UUID"); + + bt_put(trace); +} + 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 }; @@ -2987,19 +2856,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"); @@ -3007,21 +2882,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"); @@ -3082,41 +2957,37 @@ int main(int argc, char **argv) "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, + ok(bt_ctf_trace_get_environment_field_name_by_index(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, + ok(bt_ctf_trace_get_environment_field_name_by_index(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, + ok(bt_ctf_trace_get_environment_field_value_by_index(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, + ok(bt_ctf_trace_get_environment_field_value_by_index(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"); @@ -3143,18 +3014,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); @@ -3175,7 +3040,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); @@ -3237,22 +3101,8 @@ int main(int argc, char **argv) ok(bt_ctf_clock_get_is_absolute(clock) == !!is_absolute, "bt_ctf_clock_get_precision returns the correct is_absolute attribute once it is set"); - ok(bt_ctf_clock_get_time(clock, &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"); @@ -3272,10 +3122,6 @@ int main(int argc, char **argv) "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"); @@ -3307,7 +3153,7 @@ int main(int argc, char **argv) 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 succesfully"); + "bt_ctf_clock_set_uuid sets a new uuid successfully"); ret_uuid = bt_ctf_clock_get_uuid(clock); ok(ret_uuid, "bt_ctf_clock_get_uuid returns a UUID after setting a new one"); @@ -3360,7 +3206,7 @@ int main(int argc, char **argv) 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( @@ -3368,7 +3214,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 = @@ -3377,7 +3223,7 @@ 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); @@ -3388,7 +3234,7 @@ int main(int argc, char **argv) packet_header_type = bt_ctf_trace_get_packet_header_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, + ok(bt_ctf_field_type_get_type_id(packet_header_type) == BT_CTF_FIELD_TYPE_ID_STRUCT, "bt_ctf_trace_get_packet_header_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"); @@ -3410,8 +3256,6 @@ int main(int argc, char **argv) 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), "Set a trace packet_header_type successfully"); @@ -3422,13 +3266,11 @@ int main(int argc, char **argv) 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, @@ -3444,9 +3286,6 @@ int main(int argc, char **argv) /* 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"); @@ -3454,9 +3293,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"); @@ -3471,39 +3307,49 @@ int main(int argc, char **argv) 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), + ok(bt_ctf_trace_get_clock_class_count(NULL) < 0, + "bt_ctf_trace_get_clock_class_count correctly handles NULL"); + ok(bt_ctf_trace_get_clock_class_count(trace) == 1, + "bt_ctf_trace_get_clock_class_count returns the correct number of clocks"); + ok(!bt_ctf_trace_get_clock_class_by_index(NULL, 0), + "bt_ctf_trace_get_clock_class correctly handles NULL"); + ok(!bt_ctf_trace_get_clock_class_by_index(trace, 1), + "bt_ctf_trace_get_clock_class correctly handles out of bound accesses"); + 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); + ok(!bt_ctf_trace_get_clock_class_by_name(trace, NULL), + "bt_ctf_trace_get_clock_class_by_name correctly handles NULL (trace)"); + ok(!bt_ctf_trace_get_clock_class_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), + ok(!bt_ctf_trace_get_clock_class_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"), + 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, @@ -3595,11 +3441,11 @@ 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_set_clock_non_writer_stream_class(); + + test_instanciate_event_before_stream(writer, clock); append_simple_event(stream_class, stream1, clock); @@ -3611,14 +3457,18 @@ int main(int argc, char **argv) test_empty_stream(writer); - test_custom_event_header_stream(writer); + test_custom_event_header_stream(writer, clock); + + test_static_trace(); + + test_trace_is_static_listener(); + + test_trace_uuid(); 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); @@ -3637,6 +3487,11 @@ int main(int argc, char **argv) free(metadata_string); bt_put(stream_class); - delete_trace(trace_path); + validate_trace(argv[1], trace_path); + + recursive_rmdir(trace_path); + g_free(trace_path); + g_free(metadata_path); + return 0; }