/*
- * test-ctf-writer.c
+ * test_ctf_writer.c
*
* CTF Writer test
*
- * Copyright 2013 - 2015 - Jérémie Galarneau <jeremie.galarneau@efficios.com>
+ * Copyright 2013 - 2017 - Jérémie Galarneau <jeremie.galarneau@efficios.com>
*
* 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
#define DEFAULT_CLOCK_TIME 0
#define DEFAULT_CLOCK_VALUE 0
-#define NR_TESTS 596
+#define NR_TESTS 601
static int64_t current_time = 42;
return ret;
}
-static
-void validate_metadata(char *parser_path, char *metadata_path)
-{
- int ret = 0;
- char parser_output_path[] = "/tmp/parser_output_XXXXXX";
- int parser_output_fd = -1, metadata_fd = -1;
-
- if (!metadata_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.");
- 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)
{
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_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);
+ ok(iter == NULL, "bt_ctf_field_type_enumeration_find_mappings_by_signed_value rejects non-mapped values");
+
+ 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");
+ ok(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,
- &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,
+ 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 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,
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");
+ 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,
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),
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_get_signed(iter, &ret_char, NULL, NULL);
+ ok(!ret && ret_char, "bt_ctf_field_type_enumeration_mapping_iterator_get_signed return a mapping name");
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);
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);
+ (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");
bt_put(ep_integer_field_type);
bt_put(ep_enum_field_type);
bt_put(ep_enum_field_unsigned_type);
+ bt_put(iter);
}
static
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_ctf_field_type_enumeration_mapping_iterator *iter = NULL;
struct bt_value *obj;
ok(bt_ctf_field_type_set_alignment(int_16_type, 0),
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 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);
+ ok(iter == NULL, "bt_ctf_field_type_enumeration_find_mappings_by_name handles a NULL name correctly");
+
+ 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);
+ ok(iter == NULL, "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);
+ ok(iter != NULL, "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");
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;
"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_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");
bt_put(a_3_copy);
bt_put(a_4_copy);
bt_put(strct_copy);
+ bt_put(e_iter);
}
static
/* Create writer, writer stream class, stream, and clock */
writer = bt_ctf_writer_create(trace_path);
assert(writer);
+ 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");
/* Create non-writer trace, stream class, stream, and clock */
non_writer_trace = bt_ctf_trace_create();
assert(non_writer_trace);
+ ret = bt_ctf_trace_set_byte_order(non_writer_trace,
+ BT_CTF_BYTE_ORDER_LITTLE_ENDIAN);
+ assert(!ret);
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,
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;
}
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);
free(metadata_string);
bt_put(stream_class);
- recursive_rmdir(trace_path);
+ validate_trace(argv[1], trace_path);
+
+ //recursive_rmdir(trace_path);
return 0;
}
projects / babeltrace.git / blobdiff