X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=tests%2Flib%2Ftest_bt_notification_iterator.c;h=645b8850609cc559720a28144eb9752dd86d84af;hb=56e18c4ce186892c36d7f2cb5078087425e60134;hp=be3f6dd85013aa61926bf5317454165113f0d99b;hpb=5c5632787fc9cafa602c89a28966bcfd01ec0204;p=babeltrace.git diff --git a/tests/lib/test_bt_notification_iterator.c b/tests/lib/test_bt_notification_iterator.c index be3f6dd8..645b8850 100644 --- a/tests/lib/test_bt_notification_iterator.c +++ b/tests/lib/test_bt_notification_iterator.c @@ -21,16 +21,15 @@ #include #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include @@ -41,7 +40,6 @@ #include #include #include -#include #include #include #include @@ -51,6 +49,7 @@ #include #include #include +#include #include #include #include @@ -59,7 +58,7 @@ #include "tap/tap.h" -#define NR_TESTS 6 +#define NR_TESTS 5 enum test { TEST_NO_AUTO_NOTIFS, @@ -69,7 +68,6 @@ enum test { enum test_event_type { TEST_EV_TYPE_NOTIF_UNEXPECTED, TEST_EV_TYPE_NOTIF_EVENT, - TEST_EV_TYPE_NOTIF_INACTIVITY, TEST_EV_TYPE_NOTIF_STREAM_BEGIN, TEST_EV_TYPE_NOTIF_PACKET_BEGIN, TEST_EV_TYPE_NOTIF_PACKET_END, @@ -88,7 +86,7 @@ static bool debug = false; static enum test current_test; static GArray *test_events; static struct bt_graph *graph; -static struct bt_clock_class_priority_map *src_empty_cc_prio_map; +static struct bt_private_connection_private_notification_iterator *cur_notif_iter; static struct bt_stream_class *src_stream_class; static struct bt_event_class *src_event_class; static struct bt_stream *src_stream1; @@ -116,7 +114,6 @@ enum { SEQ_EVENT_STREAM1_PACKET2 = -15, SEQ_EVENT_STREAM2_PACKET1 = -16, SEQ_EVENT_STREAM2_PACKET2 = -17, - SEQ_INACTIVITY = -18, }; struct src_iter_user_data { @@ -170,9 +167,6 @@ void print_test_event(FILE *fp, const struct test_event *event) case TEST_EV_TYPE_NOTIF_EVENT: fprintf(fp, "TEST_EV_TYPE_NOTIF_EVENT"); break; - case TEST_EV_TYPE_NOTIF_INACTIVITY: - fprintf(fp, "TEST_EV_TYPE_NOTIF_INACTIVITY"); - break; case TEST_EV_TYPE_NOTIF_STREAM_BEGIN: fprintf(fp, "TEST_EV_TYPE_NOTIF_STREAM_BEGIN"); break; @@ -246,7 +240,7 @@ bool compare_test_events(const struct test_event *expected_events) const struct test_event *expected_event = expected_events; size_t i = 0; - assert(expected_events); + BT_ASSERT(expected_events); while (true) { const struct test_event *event; @@ -279,58 +273,31 @@ bool compare_test_events(const struct test_event *expected_events) static void init_static_data(void) { - int ret; struct bt_trace *trace; - struct bt_field_type *empty_struct_ft; /* Test events */ test_events = g_array_new(FALSE, TRUE, sizeof(struct test_event)); - assert(test_events); + BT_ASSERT(test_events); /* Metadata */ - empty_struct_ft = bt_field_type_structure_create(); - assert(empty_struct_ft); trace = bt_trace_create(); - assert(trace); - ret = bt_trace_set_packet_header_field_type(trace, empty_struct_ft); - assert(ret == 0); - src_empty_cc_prio_map = bt_clock_class_priority_map_create(); - assert(src_empty_cc_prio_map); - src_stream_class = bt_stream_class_create("my-stream-class"); - assert(src_stream_class); - ret = bt_stream_class_set_packet_context_field_type(src_stream_class, - empty_struct_ft); - assert(ret == 0); - ret = bt_stream_class_set_event_header_field_type(src_stream_class, - empty_struct_ft); - assert(ret == 0); - ret = bt_stream_class_set_event_context_field_type(src_stream_class, - empty_struct_ft); - assert(ret == 0); - src_event_class = bt_event_class_create("my-event-class"); - ret = bt_event_class_set_context_field_type(src_event_class, - empty_struct_ft); - assert(ret == 0); - ret = bt_event_class_set_payload_field_type(src_event_class, - empty_struct_ft); - assert(ret == 0); - ret = bt_stream_class_add_event_class(src_stream_class, - src_event_class); - assert(ret == 0); - ret = bt_trace_add_stream_class(trace, src_stream_class); - assert(ret == 0); - src_stream1 = bt_stream_create(src_stream_class, "stream-1", 0); - assert(src_stream1); - src_stream2 = bt_stream_create(src_stream_class, "stream-2", 1); - assert(src_stream2); + BT_ASSERT(trace); + src_stream_class = bt_stream_class_create(trace); + BT_ASSERT(src_stream_class); + src_event_class = bt_event_class_create(src_stream_class); + BT_ASSERT(src_event_class); + src_stream1 = bt_stream_create(src_stream_class); + BT_ASSERT(src_stream1); + src_stream2 = bt_stream_create(src_stream_class); + BT_ASSERT(src_stream2); src_stream1_packet1 = bt_packet_create(src_stream1); - assert(src_stream1_packet1); + BT_ASSERT(src_stream1_packet1); src_stream1_packet2 = bt_packet_create(src_stream1); - assert(src_stream1_packet2); + BT_ASSERT(src_stream1_packet2); src_stream2_packet1 = bt_packet_create(src_stream2); - assert(src_stream2_packet1); + BT_ASSERT(src_stream2_packet1); src_stream2_packet2 = bt_packet_create(src_stream2); - assert(src_stream2_packet2); + BT_ASSERT(src_stream2_packet2); if (debug) { fprintf(stderr, ":: stream 1: %p\n", src_stream1); @@ -342,7 +309,6 @@ void init_static_data(void) } bt_put(trace); - bt_put(empty_struct_ft); } static @@ -352,7 +318,6 @@ void fini_static_data(void) g_array_free(test_events, TRUE); /* Metadata */ - bt_put(src_empty_cc_prio_map); bt_put(src_stream_class); bt_put(src_event_class); bt_put(src_stream1); @@ -385,10 +350,10 @@ enum bt_notification_iterator_status src_iter_init( g_new0(struct src_iter_user_data, 1); int ret; - assert(user_data); + BT_ASSERT(user_data); ret = bt_private_connection_private_notification_iterator_set_user_data( priv_notif_iter, user_data); - assert(ret == 0); + BT_ASSERT(ret == 0); switch (current_test) { case TEST_NO_AUTO_NOTIFS: @@ -403,96 +368,59 @@ enum bt_notification_iterator_status src_iter_init( } static -struct bt_notification_iterator_next_method_return src_iter_next_seq( - struct src_iter_user_data *user_data) +void src_iter_next_seq_one(struct src_iter_user_data *user_data, + struct bt_notification **notif) { - struct bt_notification_iterator_next_method_return next_return = { - .status = BT_NOTIFICATION_ITERATOR_STATUS_OK, - }; - int64_t cur_ts_ns; struct bt_packet *event_packet = NULL; - assert(user_data->seq); - cur_ts_ns = user_data->seq[user_data->at]; - - switch (cur_ts_ns) { - case SEQ_END: - next_return.status = - BT_NOTIFICATION_ITERATOR_STATUS_END; - break; - case SEQ_INACTIVITY: - next_return.notification = - bt_notification_inactivity_create(graph, - src_empty_cc_prio_map); - assert(next_return.notification); - break; + switch (user_data->seq[user_data->at]) { case SEQ_STREAM1_BEGIN: - next_return.notification = - bt_notification_stream_begin_create(graph, src_stream1); - assert(next_return.notification); + *notif = bt_notification_stream_begin_create(cur_notif_iter, + src_stream1); break; case SEQ_STREAM2_BEGIN: - next_return.notification = - bt_notification_stream_begin_create(graph, src_stream2); - assert(next_return.notification); + *notif = bt_notification_stream_begin_create(cur_notif_iter, + src_stream2); break; case SEQ_STREAM1_END: - next_return.notification = - bt_notification_stream_end_create(graph, src_stream1); - assert(next_return.notification); + *notif = bt_notification_stream_end_create(cur_notif_iter, + src_stream1); break; case SEQ_STREAM2_END: - next_return.notification = - bt_notification_stream_end_create(graph, src_stream2); - assert(next_return.notification); + *notif = bt_notification_stream_end_create(cur_notif_iter, + src_stream2); break; case SEQ_STREAM1_PACKET1_BEGIN: - next_return.notification = - bt_notification_packet_begin_create(graph, - src_stream1_packet1); - assert(next_return.notification); + *notif = bt_notification_packet_begin_create(cur_notif_iter, + src_stream1_packet1); break; case SEQ_STREAM1_PACKET2_BEGIN: - next_return.notification = - bt_notification_packet_begin_create(graph, - src_stream1_packet2); - assert(next_return.notification); + *notif = bt_notification_packet_begin_create(cur_notif_iter, + src_stream1_packet2); break; case SEQ_STREAM2_PACKET1_BEGIN: - next_return.notification = - bt_notification_packet_begin_create(graph, - src_stream2_packet1); - assert(next_return.notification); + *notif = bt_notification_packet_begin_create(cur_notif_iter, + src_stream2_packet1); break; case SEQ_STREAM2_PACKET2_BEGIN: - next_return.notification = - bt_notification_packet_begin_create(graph, - src_stream2_packet2); - assert(next_return.notification); + *notif = bt_notification_packet_begin_create(cur_notif_iter, + src_stream2_packet2); break; case SEQ_STREAM1_PACKET1_END: - next_return.notification = - bt_notification_packet_end_create(graph, - src_stream1_packet1); - assert(next_return.notification); + *notif = bt_notification_packet_end_create(cur_notif_iter, + src_stream1_packet1); break; case SEQ_STREAM1_PACKET2_END: - next_return.notification = - bt_notification_packet_end_create(graph, - src_stream1_packet2); - assert(next_return.notification); + *notif = bt_notification_packet_end_create(cur_notif_iter, + src_stream1_packet2); break; case SEQ_STREAM2_PACKET1_END: - next_return.notification = - bt_notification_packet_end_create(graph, - src_stream2_packet1); - assert(next_return.notification); + *notif = bt_notification_packet_end_create(cur_notif_iter, + src_stream2_packet1); break; case SEQ_STREAM2_PACKET2_END: - next_return.notification = - bt_notification_packet_end_create(graph, - src_stream2_packet2); - assert(next_return.notification); + *notif = bt_notification_packet_end_create(cur_notif_iter, + src_stream2_packet2); break; case SEQ_EVENT_STREAM1_PACKET1: event_packet = src_stream1_packet1; @@ -511,33 +439,55 @@ struct bt_notification_iterator_next_method_return src_iter_next_seq( } if (event_packet) { - next_return.notification = - bt_notification_event_create(graph, src_event_class, - event_packet, src_empty_cc_prio_map); - assert(next_return.notification); + *notif = bt_notification_event_create(cur_notif_iter, + src_event_class, event_packet); } - if (next_return.status != BT_NOTIFICATION_ITERATOR_STATUS_END) { - user_data->at++; + BT_ASSERT(*notif); + user_data->at++; +} + +static +enum bt_notification_iterator_status src_iter_next_seq( + struct src_iter_user_data *user_data, + bt_notification_array notifs, uint64_t capacity, + uint64_t *count) +{ + enum bt_notification_iterator_status status = + BT_NOTIFICATION_ITERATOR_STATUS_OK; + uint64_t i = 0; + + BT_ASSERT(user_data->seq); + + if (user_data->seq[user_data->at] == SEQ_END) { + status = BT_NOTIFICATION_ITERATOR_STATUS_END; + goto end; + } + + while (i < capacity && user_data->seq[user_data->at] != SEQ_END) { + src_iter_next_seq_one(user_data, ¬ifs[i]); + i++; } - return next_return; + BT_ASSERT(i > 0 && i <= capacity); + *count = i; + +end: + return status; } static -struct bt_notification_iterator_next_method_return src_iter_next( - struct bt_private_connection_private_notification_iterator *priv_iterator) +enum bt_notification_iterator_status src_iter_next( + struct bt_private_connection_private_notification_iterator *priv_iterator, + bt_notification_array notifs, uint64_t capacity, + uint64_t *count) { - struct bt_notification_iterator_next_method_return next_return = { - .status = BT_NOTIFICATION_ITERATOR_STATUS_OK, - .notification = NULL, - }; struct src_iter_user_data *user_data = bt_private_connection_private_notification_iterator_get_user_data(priv_iterator); - assert(user_data); - next_return = src_iter_next_seq(user_data); - return next_return; + BT_ASSERT(user_data); + cur_notif_iter = priv_iterator; + return src_iter_next_seq(user_data, notifs, capacity, count); } static @@ -549,7 +499,7 @@ enum bt_component_status src_init( ret = bt_private_component_source_add_output_private_port( private_component, "out", NULL, NULL); - assert(ret == 0); + BT_ASSERT(ret == 0); return BT_COMPONENT_STATUS_OK; } @@ -559,34 +509,9 @@ void src_finalize(struct bt_private_component *private_component) } static -enum bt_notification_iterator_status common_consume( - struct bt_notification_iterator *notif_iter) +void append_test_events_from_notification(struct bt_notification *notification) { - enum bt_notification_iterator_status ret; - struct bt_notification *notification = NULL; struct test_event test_event = { 0 }; - bool do_append_test_event = true; - assert(notif_iter); - - ret = bt_notification_iterator_next(notif_iter); - if (ret < 0) { - do_append_test_event = false; - goto end; - } - - switch (ret) { - case BT_NOTIFICATION_ITERATOR_STATUS_END: - test_event.type = TEST_EV_TYPE_END; - goto end; - case BT_NOTIFICATION_ITERATOR_STATUS_AGAIN: - abort(); - default: - break; - } - - notification = bt_notification_iterator_get_notification( - notif_iter); - assert(notification); switch (bt_notification_get_type(notification)) { case BT_NOTIFICATION_TYPE_EVENT: @@ -595,37 +520,34 @@ enum bt_notification_iterator_status common_consume( test_event.type = TEST_EV_TYPE_NOTIF_EVENT; event = bt_notification_event_borrow_event(notification); - assert(event); + BT_ASSERT(event); test_event.packet = bt_event_borrow_packet(event); - assert(test_event.packet); + BT_ASSERT(test_event.packet); break; } - case BT_NOTIFICATION_TYPE_INACTIVITY: - test_event.type = TEST_EV_TYPE_NOTIF_INACTIVITY; - break; case BT_NOTIFICATION_TYPE_STREAM_BEGIN: test_event.type = TEST_EV_TYPE_NOTIF_STREAM_BEGIN; test_event.stream = bt_notification_stream_begin_borrow_stream(notification); - assert(test_event.stream); + BT_ASSERT(test_event.stream); break; case BT_NOTIFICATION_TYPE_STREAM_END: test_event.type = TEST_EV_TYPE_NOTIF_STREAM_END; test_event.stream = bt_notification_stream_end_borrow_stream(notification); - assert(test_event.stream); + BT_ASSERT(test_event.stream); break; case BT_NOTIFICATION_TYPE_PACKET_BEGIN: test_event.type = TEST_EV_TYPE_NOTIF_PACKET_BEGIN; test_event.packet = bt_notification_packet_begin_borrow_packet(notification); - assert(test_event.packet); + BT_ASSERT(test_event.packet); break; case BT_NOTIFICATION_TYPE_PACKET_END: test_event.type = TEST_EV_TYPE_NOTIF_PACKET_END; test_event.packet = bt_notification_packet_end_borrow_packet(notification); - assert(test_event.packet); + BT_ASSERT(test_event.packet); break; default: test_event.type = TEST_EV_TYPE_NOTIF_UNEXPECTED; @@ -634,15 +556,57 @@ enum bt_notification_iterator_status common_consume( if (test_event.packet) { test_event.stream = bt_packet_borrow_stream(test_event.packet); - assert(test_event.stream); + BT_ASSERT(test_event.stream); } -end: - if (do_append_test_event) { + append_test_event(&test_event); +} + +static +enum bt_notification_iterator_status common_consume( + struct bt_notification_iterator *notif_iter, + bool is_output_port_notif_iter) +{ + enum bt_notification_iterator_status ret; + bt_notification_array notifications = NULL; + uint64_t count = 0; + struct test_event test_event = { 0 }; + uint64_t i; + + BT_ASSERT(notif_iter); + + if (is_output_port_notif_iter) { + ret = bt_output_port_notification_iterator_next(notif_iter, + ¬ifications, &count); + } else { + ret = bt_private_connection_notification_iterator_next( + notif_iter, ¬ifications, &count); + } + + if (ret < 0) { + goto end; + } + + switch (ret) { + case BT_NOTIFICATION_ITERATOR_STATUS_END: + test_event.type = TEST_EV_TYPE_END; append_test_event(&test_event); + goto end; + case BT_NOTIFICATION_ITERATOR_STATUS_AGAIN: + abort(); + default: + break; } - bt_put(notification); + BT_ASSERT(notifications); + BT_ASSERT(count > 0); + + for (i = 0; i < count; i++) { + append_test_events_from_notification(notifications[i]); + bt_put(notifications[i]); + } + +end: return ret; } @@ -655,8 +619,8 @@ enum bt_component_status sink_consume( bt_private_component_get_user_data(priv_component); enum bt_notification_iterator_status it_ret; - assert(user_data && user_data->notif_iter); - it_ret = common_consume(user_data->notif_iter); + BT_ASSERT(user_data && user_data->notif_iter); + it_ret = common_consume(user_data->notif_iter, false); if (it_ret < 0) { ret = BT_COMPONENT_STATUS_ERROR; @@ -679,7 +643,8 @@ end: } static -void sink_port_connected(struct bt_private_component *private_component, +enum bt_component_status sink_port_connected( + struct bt_private_component *private_component, struct bt_private_port *self_private_port, struct bt_port *other_port) { @@ -689,12 +654,13 @@ void sink_port_connected(struct bt_private_component *private_component, private_component); enum bt_connection_status conn_status; - assert(user_data); - assert(priv_conn); + BT_ASSERT(user_data); + BT_ASSERT(priv_conn); conn_status = bt_private_connection_create_notification_iterator( priv_conn, &user_data->notif_iter); - assert(conn_status == 0); + BT_ASSERT(conn_status == 0); bt_put(priv_conn); + return BT_COMPONENT_STATUS_OK; } static @@ -705,13 +671,13 @@ enum bt_component_status sink_init( struct sink_user_data *user_data = g_new0(struct sink_user_data, 1); int ret; - assert(user_data); + BT_ASSERT(user_data); ret = bt_private_component_set_user_data(private_component, user_data); - assert(ret == 0); + BT_ASSERT(ret == 0); ret = bt_private_component_sink_add_input_private_port( private_component, "in", NULL, NULL); - assert(ret == 0); + BT_ASSERT(ret == 0); return BT_COMPONENT_STATUS_OK; } @@ -739,22 +705,22 @@ void create_source_sink(struct bt_graph *graph, struct bt_component **source, if (source) { src_comp_class = bt_component_class_source_create("src", src_iter_next); - assert(src_comp_class); + BT_ASSERT(src_comp_class); ret = bt_component_class_set_init_method(src_comp_class, src_init); - assert(ret == 0); + BT_ASSERT(ret == 0); ret = bt_component_class_set_finalize_method(src_comp_class, src_finalize); - assert(ret == 0); + BT_ASSERT(ret == 0); ret = bt_component_class_source_set_notification_iterator_init_method( src_comp_class, src_iter_init); - assert(ret == 0); + BT_ASSERT(ret == 0); ret = bt_component_class_source_set_notification_iterator_finalize_method( src_comp_class, src_iter_finalize); - assert(ret == 0); + BT_ASSERT(ret == 0); ret = bt_graph_add_component(graph, src_comp_class, "source", NULL, source); - assert(ret == 0); + BT_ASSERT(ret == 0); bt_put(src_comp_class); } @@ -762,18 +728,18 @@ void create_source_sink(struct bt_graph *graph, struct bt_component **source, if (sink) { sink_comp_class = bt_component_class_sink_create("sink", sink_consume); - assert(sink_comp_class); + BT_ASSERT(sink_comp_class); ret = bt_component_class_set_init_method(sink_comp_class, sink_init); - assert(ret == 0); + BT_ASSERT(ret == 0); ret = bt_component_class_set_finalize_method(sink_comp_class, sink_finalize); ret = bt_component_class_set_port_connected_method( sink_comp_class, sink_port_connected); - assert(ret == 0); + BT_ASSERT(ret == 0); ret = bt_graph_add_component(graph, sink_comp_class, "sink", NULL, sink); - assert(ret == 0); + BT_ASSERT(ret == 0); bt_put(sink_comp_class); } } @@ -791,16 +757,16 @@ void do_std_test(enum test test, const char *name, clear_test_events(); current_test = test; diag("test: %s", name); - assert(!graph); + BT_ASSERT(!graph); graph = bt_graph_create(); - assert(graph); + BT_ASSERT(graph); create_source_sink(graph, &src_comp, &sink_comp); /* Connect source to sink */ upstream_port = bt_component_source_get_output_port_by_name(src_comp, "out"); - assert(upstream_port); + BT_ASSERT(upstream_port); downstream_port = bt_component_sink_get_input_port_by_name(sink_comp, "in"); - assert(downstream_port); + BT_ASSERT(downstream_port); graph_status = bt_graph_connect_ports(graph, upstream_port, downstream_port, NULL); bt_put(upstream_port); @@ -885,9 +851,9 @@ void test_output_port_notification_iterator(void) clear_test_events(); current_test = TEST_OUTPUT_PORT_NOTIFICATION_ITERATOR; diag("test: output port notification iterator"); - assert(!graph); + BT_ASSERT(!graph); graph = bt_graph_create(); - assert(graph); + BT_ASSERT(graph); create_source_sink(graph, &src_comp, NULL); /* Create notification iterator on source's output port */ @@ -899,7 +865,7 @@ void test_output_port_notification_iterator(void) /* Consume the notification iterator */ while (iter_status == BT_NOTIFICATION_ITERATOR_STATUS_OK) { - iter_status = common_consume(notif_iter); + iter_status = common_consume(notif_iter, true); } ok(iter_status == BT_NOTIFICATION_ITERATOR_STATUS_END, @@ -914,40 +880,6 @@ void test_output_port_notification_iterator(void) bt_put(notif_iter); } -static -void test_output_port_notification_iterator_cannot_consume(void) -{ - struct bt_component *src_comp; - struct bt_notification_iterator *notif_iter; - struct bt_port *upstream_port; - - clear_test_events(); - current_test = TEST_OUTPUT_PORT_NOTIFICATION_ITERATOR; - diag("test: cannot consume graph with existing output port notification iterator"); - assert(!graph); - graph = bt_graph_create(); - assert(graph); - create_source_sink(graph, &src_comp, NULL); - - /* Create notification iterator on source's output port */ - upstream_port = bt_component_source_get_output_port_by_name(src_comp, "out"); - notif_iter = bt_output_port_notification_iterator_create(upstream_port, - NULL); - assert(notif_iter); - bt_put(upstream_port); - - /* - * This should fail because the graph is now managed by the - * notification iterator. - */ - ok(bt_graph_run(graph) == BT_GRAPH_STATUS_CANNOT_CONSUME, - "bt_graph_run() returns BT_GRAPH_STATUS_CANNOT_CONSUME when there's an output port notification iterator"); - - bt_put(src_comp); - BT_PUT(graph); - bt_put(notif_iter); -} - #define DEBUG_ENV_VAR "TEST_BT_NOTIFICATION_ITERATOR_DEBUG" int main(int argc, char **argv) @@ -960,7 +892,6 @@ int main(int argc, char **argv) init_static_data(); test_no_auto_notifs(); test_output_port_notification_iterator(); - test_output_port_notification_iterator_cannot_consume(); fini_static_data(); return exit_status(); }