X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;ds=sidebyside;f=tests%2Flib%2Ftest_bt_notification_iterator.c;h=645b8850609cc559720a28144eb9752dd86d84af;hb=56e18c4ce186892c36d7f2cb5078087425e60134;hp=5ccb91cbb40bc904a71b8e75fd563752208d825e;hpb=bf55043c2e742cafb86d3a3404d0d35c4cf294a3;p=babeltrace.git diff --git a/tests/lib/test_bt_notification_iterator.c b/tests/lib/test_bt_notification_iterator.c index 5ccb91cb..645b8850 100644 --- a/tests/lib/test_bt_notification_iterator.c +++ b/tests/lib/test_bt_notification_iterator.c @@ -22,15 +22,14 @@ #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 @@ -70,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, @@ -89,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; @@ -117,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 { @@ -171,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; @@ -280,49 +273,22 @@ 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)); BT_ASSERT(test_events); /* Metadata */ - empty_struct_ft = bt_field_type_structure_create(); - BT_ASSERT(empty_struct_ft); trace = bt_trace_create(); BT_ASSERT(trace); - ret = bt_trace_set_packet_header_field_type(trace, empty_struct_ft); - BT_ASSERT(ret == 0); - src_empty_cc_prio_map = bt_clock_class_priority_map_create(); - BT_ASSERT(src_empty_cc_prio_map); - src_stream_class = bt_stream_class_create("my-stream-class"); + src_stream_class = bt_stream_class_create(trace); BT_ASSERT(src_stream_class); - ret = bt_stream_class_set_packet_context_field_type(src_stream_class, - empty_struct_ft); - BT_ASSERT(ret == 0); - ret = bt_stream_class_set_event_header_field_type(src_stream_class, - empty_struct_ft); - BT_ASSERT(ret == 0); - ret = bt_stream_class_set_event_context_field_type(src_stream_class, - empty_struct_ft); - BT_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); - BT_ASSERT(ret == 0); - ret = bt_event_class_set_payload_field_type(src_event_class, - empty_struct_ft); - BT_ASSERT(ret == 0); - ret = bt_stream_class_add_event_class(src_stream_class, - src_event_class); - BT_ASSERT(ret == 0); - ret = bt_trace_add_stream_class(trace, src_stream_class); - BT_ASSERT(ret == 0); - src_stream1 = bt_stream_create(src_stream_class, "stream-1", 0); + 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, "stream-2", 1); + src_stream2 = bt_stream_create(src_stream_class); BT_ASSERT(src_stream2); src_stream1_packet1 = bt_packet_create(src_stream1); BT_ASSERT(src_stream1_packet1); @@ -343,7 +309,6 @@ void init_static_data(void) } bt_put(trace); - bt_put(empty_struct_ft); } static @@ -353,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); @@ -410,54 +374,52 @@ void src_iter_next_seq_one(struct src_iter_user_data *user_data, struct bt_packet *event_packet = NULL; switch (user_data->seq[user_data->at]) { - case SEQ_INACTIVITY: - *notif = bt_notification_inactivity_create(graph, - src_empty_cc_prio_map); - break; case SEQ_STREAM1_BEGIN: - *notif = bt_notification_stream_begin_create(graph, + *notif = bt_notification_stream_begin_create(cur_notif_iter, src_stream1); break; case SEQ_STREAM2_BEGIN: - *notif = bt_notification_stream_begin_create(graph, + *notif = bt_notification_stream_begin_create(cur_notif_iter, src_stream2); break; case SEQ_STREAM1_END: - *notif = bt_notification_stream_end_create(graph, src_stream1); + *notif = bt_notification_stream_end_create(cur_notif_iter, + src_stream1); break; case SEQ_STREAM2_END: - *notif = bt_notification_stream_end_create(graph, src_stream2); + *notif = bt_notification_stream_end_create(cur_notif_iter, + src_stream2); break; case SEQ_STREAM1_PACKET1_BEGIN: - *notif = bt_notification_packet_begin_create(graph, + *notif = bt_notification_packet_begin_create(cur_notif_iter, src_stream1_packet1); break; case SEQ_STREAM1_PACKET2_BEGIN: - *notif = bt_notification_packet_begin_create(graph, + *notif = bt_notification_packet_begin_create(cur_notif_iter, src_stream1_packet2); break; case SEQ_STREAM2_PACKET1_BEGIN: - *notif = bt_notification_packet_begin_create(graph, + *notif = bt_notification_packet_begin_create(cur_notif_iter, src_stream2_packet1); break; case SEQ_STREAM2_PACKET2_BEGIN: - *notif = bt_notification_packet_begin_create(graph, + *notif = bt_notification_packet_begin_create(cur_notif_iter, src_stream2_packet2); break; case SEQ_STREAM1_PACKET1_END: - *notif = bt_notification_packet_end_create(graph, + *notif = bt_notification_packet_end_create(cur_notif_iter, src_stream1_packet1); break; case SEQ_STREAM1_PACKET2_END: - *notif = bt_notification_packet_end_create(graph, + *notif = bt_notification_packet_end_create(cur_notif_iter, src_stream1_packet2); break; case SEQ_STREAM2_PACKET1_END: - *notif = bt_notification_packet_end_create(graph, + *notif = bt_notification_packet_end_create(cur_notif_iter, src_stream2_packet1); break; case SEQ_STREAM2_PACKET2_END: - *notif = bt_notification_packet_end_create(graph, + *notif = bt_notification_packet_end_create(cur_notif_iter, src_stream2_packet2); break; case SEQ_EVENT_STREAM1_PACKET1: @@ -477,8 +439,8 @@ void src_iter_next_seq_one(struct src_iter_user_data *user_data, } if (event_packet) { - *notif = bt_notification_event_create(graph, src_event_class, - event_packet, src_empty_cc_prio_map); + *notif = bt_notification_event_create(cur_notif_iter, + src_event_class, event_packet); } BT_ASSERT(*notif); @@ -524,6 +486,7 @@ enum bt_notification_iterator_status src_iter_next( bt_private_connection_private_notification_iterator_get_user_data(priv_iterator); BT_ASSERT(user_data); + cur_notif_iter = priv_iterator; return src_iter_next_seq(user_data, notifs, capacity, count); } @@ -562,9 +525,6 @@ void append_test_events_from_notification(struct bt_notification *notification) 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 =