X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=tests%2Flib%2Ftest_ctf_writer.c;h=2eac697c7b17becb7c6d1f8d53c79fb1d100c288;hb=3bfc4183e4026c21bad8c817125b1f6d31d6d89d;hp=ad4dc1918ae872366ee7c88fd4dd26a00de9bf48;hpb=f3534905684ef28f99ab7f60d85dbe84a5645297;p=babeltrace.git diff --git a/tests/lib/test_ctf_writer.c b/tests/lib/test_ctf_writer.c index ad4dc191..2eac697c 100644 --- a/tests/lib/test_ctf_writer.c +++ b/tests/lib/test_ctf_writer.c @@ -32,15 +32,14 @@ #include #include #include +#include #include #include #include -#include #include #include #include #include -#include #include #include "tap/tap.h" #include @@ -50,7 +49,7 @@ #define METADATA_LINE_SIZE 512 #define SEQUENCE_TEST_LENGTH 10 #define ARRAY_TEST_LENGTH 5 -#define PACKET_RESIZE_TEST_LENGTH 100000 +#define PACKET_RESIZE_TEST_DEF_LENGTH 100000 #define DEFAULT_CLOCK_FREQ 1000000000 #define DEFAULT_CLOCK_PRECISION 1 @@ -60,9 +59,18 @@ #define DEFAULT_CLOCK_TIME 0 #define DEFAULT_CLOCK_VALUE 0 -#define NR_TESTS 621 +#define NR_TESTS 623 + +struct bt_utsname { + char sysname[BABELTRACE_HOST_NAME_MAX]; + char nodename[BABELTRACE_HOST_NAME_MAX]; + char release[BABELTRACE_HOST_NAME_MAX]; + char version[BABELTRACE_HOST_NAME_MAX]; + char machine[BABELTRACE_HOST_NAME_MAX]; +}; static int64_t current_time = 42; +static unsigned int packet_resize_test_length = PACKET_RESIZE_TEST_DEF_LENGTH; /* Return 1 if uuids match, zero if different. */ static @@ -90,83 +98,46 @@ 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; + gchar *standard_error = NULL; + gint exit_status; + char *argv[] = {parser_path, trace_path, NULL}; - if (!trace_path) { + if (!parser_path || !trace_path) { ret = -1; 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."); + 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 { - 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; - } + /* 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, parser_path, trace_path, NULL); - perror("# Could not launch the babeltrace process"); - exit(-1); + if (ret != 0) { + diag("Babeltrace returned an error."); + diag_multiline(standard_error); + goto result; } + 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 @@ -319,8 +290,8 @@ 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, + 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", @@ -1971,7 +1942,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); @@ -2006,7 +1977,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, @@ -2430,7 +2401,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; @@ -2453,6 +2424,7 @@ void test_create_writer_vs_non_writer_mode(void) 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"); } @@ -2622,6 +2594,7 @@ void test_create_writer_vs_non_writer_mode(void) bt_put(packet); bt_put(packet2); recursive_rmdir(trace_path); + g_free(trace_path); } static @@ -2719,7 +2692,13 @@ void test_static_trace(void) static void trace_is_static_listener(struct bt_ctf_trace *trace, void *data) { - *((int *) data) = 1; + *((int *) data) |= 1; +} + +static +void trace_listener_removed(struct bt_ctf_trace *trace, void *data) +{ + *((int *) data) |= 2; } static @@ -2739,18 +2718,19 @@ void test_trace_is_static_listener(void) trace = bt_ctf_trace_create(); assert(trace); ret = bt_ctf_trace_add_is_static_listener(NULL, - trace_is_static_listener, &called1); + 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, &called1); + 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, &called1); + 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, &called2); + 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, &called3); + 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)"); @@ -2760,21 +2740,22 @@ void test_trace_is_static_listener(void) 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, &called4); + 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 == 0, "\"trace is static\" listener not called before the trace is made static (2)"); + 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, &called1); + 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 == 0, "\"trace is static\" listener not called when the trace is made static (2)"); + 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; @@ -2782,9 +2763,9 @@ void test_trace_is_static_listener(void) called3 = 0; called4 = 0; bt_put(trace); - ok(called1 == 0, "\"trace is static\" listener not called after the trace is put (1)"); + 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 == 0, "\"trace is static\" listener not called after the trace is put (3)"); + 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)"); } @@ -2821,14 +2802,15 @@ void test_trace_uuid(void) 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; @@ -2836,8 +2818,8 @@ int main(int argc, char **argv) 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; @@ -2865,14 +2847,20 @@ int main(int argc, char **argv) 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"); @@ -2892,13 +2880,9 @@ int main(int argc, char **argv) "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"); @@ -3022,12 +3006,6 @@ int main(int argc, char **argv) "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); @@ -3497,6 +3475,9 @@ int main(int argc, char **argv) validate_trace(argv[1], trace_path); - //recursive_rmdir(trace_path); + recursive_rmdir(trace_path); + g_free(trace_path); + g_free(metadata_path); + return 0; }