X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=tests%2Fplugins%2Ftest-utils-muxer.c;h=292ee0fec6f4bc8432b985c4017438114ecc00d2;hb=b6a0d2d9bd21345c993fe7d1c9dee5ec17d15b0c;hp=50f5be5de37bfcf46991a3dd3d33b01039831ece;hpb=3e9b00233085bfafb21da3746f41d7d1876920dd;p=babeltrace.git diff --git a/tests/plugins/test-utils-muxer.c b/tests/plugins/test-utils-muxer.c index 50f5be5d..292ee0fe 100644 --- a/tests/plugins/test-utils-muxer.c +++ b/tests/plugins/test-utils-muxer.c @@ -18,39 +18,11 @@ #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 -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include #include #include "tap/tap.h" @@ -102,13 +74,13 @@ static enum test current_test; static GArray *test_events; static struct bt_clock_class_priority_map *src_cc_prio_map; static struct bt_clock_class_priority_map *src_empty_cc_prio_map; -static struct bt_ctf_clock_class *src_clock_class; -static struct bt_ctf_stream_class *src_stream_class; -static struct bt_ctf_event_class *src_event_class; -static struct bt_ctf_packet *src_packet0; -static struct bt_ctf_packet *src_packet1; -static struct bt_ctf_packet *src_packet2; -static struct bt_ctf_packet *src_packet3; +static struct bt_clock_class *src_clock_class; +static struct bt_stream_class *src_stream_class; +static struct bt_event_class *src_event_class; +static struct bt_packet *src_packet0; +static struct bt_packet *src_packet1; +static struct bt_packet *src_packet2; +static struct bt_packet *src_packet3; enum { SEQ_END = -1, @@ -121,7 +93,7 @@ struct src_iter_user_data { size_t iter_index; int64_t *seq; size_t at; - struct bt_ctf_packet *packet; + struct bt_packet *packet; }; struct sink_user_data { @@ -151,21 +123,20 @@ static int64_t seq4[] = { }; static int64_t seq1_with_again[] = { - 24, 53, 97, 105, 119, 210, SEQ_AGAIN, SEQ_AGAIN, 222, 240, 292, - 317, 353, 407, 433, 473, 487, 504, 572, 615, 708, 766, 850, 852, - 931, 951, 956, 996, SEQ_END, + 24, 53, 97, 105, 119, 210, SEQ_AGAIN, 222, 240, 292, 317, 353, + 407, 433, 473, 487, 504, 572, 615, 708, 766, 850, 852, 931, 951, + 956, 996, SEQ_END, }; static int64_t seq2_with_again[] = { 51, 59, 68, 77, 91, 121, 139, 170, 179, 266, 352, 454, 478, 631, - 644, 668, 714, 744, 750, 778, 790, 836, SEQ_AGAIN, SEQ_AGAIN, - SEQ_END, + 644, 668, 714, 744, 750, 778, 790, 836, SEQ_AGAIN, SEQ_END, }; static int64_t seq3_with_again[] = { 8, 71, 209, 254, 298, 320, 350, 393, 419, 624, 651, SEQ_AGAIN, - SEQ_AGAIN, 678, 717, 731, 733, 788, 819, 820, 857, 892, 903, - 944, 998, SEQ_END, + 678, 717, 731, 733, 788, 819, 820, 857, 892, 903, 944, 998, + SEQ_END, }; static int64_t seq4_with_again[] = { @@ -302,6 +273,10 @@ bool compare_test_events(const struct test_event *expected_events) } if (i != test_events->len) { + if (debug) { + fprintf(stderr, ":: Length mismatch\n"); + } + return false; } @@ -312,29 +287,29 @@ static void init_static_data(void) { int ret; - struct bt_ctf_trace *trace; - struct bt_ctf_stream *stream; - struct bt_ctf_field_type *empty_struct_ft; + struct bt_trace *trace; + struct bt_stream *stream; + struct bt_field_type *empty_struct_ft; /* Test events */ test_events = g_array_new(FALSE, TRUE, sizeof(struct test_event)); assert(test_events); /* Metadata */ - empty_struct_ft = bt_ctf_field_type_structure_create(); + empty_struct_ft = bt_field_type_structure_create(); assert(empty_struct_ft); - trace = bt_ctf_trace_create(); + trace = bt_trace_create(); assert(trace); - ret = bt_ctf_trace_set_native_byte_order(trace, - BT_CTF_BYTE_ORDER_LITTLE_ENDIAN); + ret = bt_trace_set_native_byte_order(trace, + BT_BYTE_ORDER_LITTLE_ENDIAN); assert(ret == 0); - ret = bt_ctf_trace_set_packet_header_type(trace, empty_struct_ft); + ret = bt_trace_set_packet_header_type(trace, empty_struct_ft); assert(ret == 0); - src_clock_class = bt_ctf_clock_class_create("my-clock"); + src_clock_class = bt_clock_class_create("my-clock", 1000000000); assert(src_clock_class); - ret = bt_ctf_clock_class_set_is_absolute(src_clock_class, 1); + ret = bt_clock_class_set_is_absolute(src_clock_class, 1); assert(ret == 0); - ret = bt_ctf_trace_add_clock_class(trace, src_clock_class); + ret = bt_trace_add_clock_class(trace, src_clock_class); assert(ret == 0); src_empty_cc_prio_map = bt_clock_class_priority_map_create(); assert(src_empty_cc_prio_map); @@ -343,47 +318,47 @@ void init_static_data(void) ret = bt_clock_class_priority_map_add_clock_class(src_cc_prio_map, src_clock_class, 0); assert(ret == 0); - src_stream_class = bt_ctf_stream_class_create("my-stream-class"); + src_stream_class = bt_stream_class_create("my-stream-class"); assert(src_stream_class); - ret = bt_ctf_stream_class_set_packet_context_type(src_stream_class, + ret = bt_stream_class_set_packet_context_type(src_stream_class, empty_struct_ft); assert(ret == 0); - ret = bt_ctf_stream_class_set_event_header_type(src_stream_class, + ret = bt_stream_class_set_event_header_type(src_stream_class, empty_struct_ft); assert(ret == 0); - ret = bt_ctf_stream_class_set_event_context_type(src_stream_class, + ret = bt_stream_class_set_event_context_type(src_stream_class, empty_struct_ft); assert(ret == 0); - src_event_class = bt_ctf_event_class_create("my-event-class"); - ret = bt_ctf_event_class_set_context_type(src_event_class, + src_event_class = bt_event_class_create("my-event-class"); + ret = bt_event_class_set_context_type(src_event_class, empty_struct_ft); assert(ret == 0); - ret = bt_ctf_event_class_set_context_type(src_event_class, + ret = bt_event_class_set_context_type(src_event_class, empty_struct_ft); assert(ret == 0); - ret = bt_ctf_stream_class_add_event_class(src_stream_class, + ret = bt_stream_class_add_event_class(src_stream_class, src_event_class); assert(ret == 0); - ret = bt_ctf_trace_add_stream_class(trace, src_stream_class); + ret = bt_trace_add_stream_class(trace, src_stream_class); assert(ret == 0); - stream = bt_ctf_stream_create(src_stream_class, "stream0"); + stream = bt_stream_create(src_stream_class, "stream0"); assert(stream); - src_packet0 = bt_ctf_packet_create(stream); + src_packet0 = bt_packet_create(stream); assert(src_packet0); bt_put(stream); - stream = bt_ctf_stream_create(src_stream_class, "stream1"); + stream = bt_stream_create(src_stream_class, "stream1"); assert(stream); - src_packet1 = bt_ctf_packet_create(stream); + src_packet1 = bt_packet_create(stream); assert(src_packet0); bt_put(stream); - stream = bt_ctf_stream_create(src_stream_class, "stream2"); + stream = bt_stream_create(src_stream_class, "stream2"); assert(stream); - src_packet2 = bt_ctf_packet_create(stream); + src_packet2 = bt_packet_create(stream); assert(src_packet0); bt_put(stream); - stream = bt_ctf_stream_create(src_stream_class, "stream3"); + stream = bt_stream_create(src_stream_class, "stream3"); assert(stream); - src_packet3 = bt_ctf_packet_create(stream); + src_packet3 = bt_packet_create(stream); assert(src_packet0); bt_put(stream); @@ -411,10 +386,10 @@ void fini_static_data(void) static void src_iter_finalize( - struct bt_private_notification_iterator *private_notification_iterator) + struct bt_private_connection_private_notification_iterator *private_notification_iterator) { struct src_iter_user_data *user_data = - bt_private_notification_iterator_get_user_data( + bt_private_connection_private_notification_iterator_get_user_data( private_notification_iterator); if (user_data) { @@ -424,18 +399,18 @@ void src_iter_finalize( static enum bt_notification_iterator_status src_iter_init( - struct bt_private_notification_iterator *priv_notif_iter, + struct bt_private_connection_private_notification_iterator *priv_notif_iter, struct bt_private_port *private_port) { struct src_iter_user_data *user_data = g_new0(struct src_iter_user_data, 1); - struct bt_port *port = bt_port_from_private_port(private_port); + struct bt_port *port = bt_port_from_private(private_port); const char *port_name; int ret; assert(user_data); assert(port); - ret = bt_private_notification_iterator_set_user_data(priv_notif_iter, + ret = bt_private_connection_private_notification_iterator_set_user_data(priv_notif_iter, user_data); assert(ret == 0); port_name = bt_port_get_name(port); @@ -457,7 +432,7 @@ enum bt_notification_iterator_status src_iter_init( user_data->packet = src_packet3; break; default: - assert(false); + abort(); } switch (current_test) { @@ -499,30 +474,31 @@ enum bt_notification_iterator_status src_iter_init( } break; default: - assert(false); + abort(); } return BT_NOTIFICATION_ITERATOR_STATUS_OK; } static -struct bt_ctf_event *src_create_event(struct bt_ctf_packet *packet, +struct bt_event *src_create_event(struct bt_packet *packet, int64_t ts_ns) { - struct bt_ctf_event *event = bt_ctf_event_create(src_event_class); + struct bt_event *event = bt_event_create(src_event_class); int ret; assert(event); - ret = bt_ctf_event_set_packet(event, packet); + ret = bt_event_set_packet(event, packet); assert(ret == 0); if (ts_ns != -1) { - struct bt_ctf_clock_value *clock_value; + struct bt_clock_value *clock_value; - clock_value = bt_ctf_clock_value_create(src_clock_class, + clock_value = bt_clock_value_create(src_clock_class, (uint64_t) ts_ns); assert(clock_value); - ret = bt_ctf_event_set_clock_value(event, clock_value); + ret = bt_event_set_clock_value(event, clock_value); + assert(ret == 0); bt_put(clock_value); } @@ -530,10 +506,10 @@ struct bt_ctf_event *src_create_event(struct bt_ctf_packet *packet, } static -struct bt_notification_iterator_next_return src_iter_next_seq( +struct bt_notification_iterator_next_method_return src_iter_next_seq( struct src_iter_user_data *user_data) { - struct bt_notification_iterator_next_return next_return = { + struct bt_notification_iterator_next_method_return next_return = { .status = BT_NOTIFICATION_ITERATOR_STATUS_OK, }; int64_t cur_ts_ns; @@ -562,7 +538,7 @@ struct bt_notification_iterator_next_return src_iter_next_seq( break; default: { - struct bt_ctf_event *event = src_create_event( + struct bt_event *event = src_create_event( user_data->packet, cur_ts_ns); assert(event); @@ -582,17 +558,18 @@ struct bt_notification_iterator_next_return src_iter_next_seq( } static -struct bt_notification_iterator_next_return src_iter_next( - struct bt_private_notification_iterator *priv_iterator) +struct bt_notification_iterator_next_method_return src_iter_next( + struct bt_private_connection_private_notification_iterator *priv_iterator) { - struct bt_notification_iterator_next_return next_return = { - .status = BT_NOTIFICATION_ITERATOR_STATUS_OK, + struct bt_notification_iterator_next_method_return next_return = { .notification = NULL, + .status = BT_NOTIFICATION_ITERATOR_STATUS_OK, }; struct src_iter_user_data *user_data = - bt_private_notification_iterator_get_user_data(priv_iterator); + bt_private_connection_private_notification_iterator_get_user_data(priv_iterator); struct bt_private_component *private_component = - bt_private_notification_iterator_get_private_component(priv_iterator); + bt_private_connection_private_notification_iterator_get_private_component(priv_iterator); + int ret; assert(user_data); assert(private_component); @@ -606,7 +583,7 @@ struct bt_notification_iterator_next_return src_iter_next( user_data->packet); assert(next_return.notification); } else if (user_data->at < 6) { - struct bt_ctf_event *event = src_create_event( + struct bt_event *event = src_create_event( user_data->packet, -1); assert(event); @@ -631,16 +608,12 @@ struct bt_notification_iterator_next_return src_iter_next( break; case TEST_SINGLE_END_THEN_MULTIPLE_FULL: if (user_data->iter_index == 0) { - struct bt_private_port *priv_port; - - priv_port = bt_private_component_source_add_output_private_port( - private_component, "out1", NULL); - assert(priv_port); - bt_put(priv_port); - priv_port = bt_private_component_source_add_output_private_port( - private_component, "out2", NULL); - assert(priv_port); - bt_put(priv_port); + ret = bt_private_component_source_add_output_private_port( + private_component, "out1", NULL, NULL); + assert(ret == 0); + ret = bt_private_component_source_add_output_private_port( + private_component, "out2", NULL, NULL); + assert(ret == 0); next_return.status = BT_NOTIFICATION_ITERATOR_STATUS_END; } else { next_return = src_iter_next_seq(user_data); @@ -652,16 +625,12 @@ struct bt_notification_iterator_next_return src_iter_next( next_return.status = BT_NOTIFICATION_ITERATOR_STATUS_AGAIN; user_data->at++; } else { - struct bt_private_port *priv_port; - - priv_port = bt_private_component_source_add_output_private_port( - private_component, "out1", NULL); - assert(priv_port); - bt_put(priv_port); - priv_port = bt_private_component_source_add_output_private_port( - private_component, "out2", NULL); - assert(priv_port); - bt_put(priv_port); + ret = bt_private_component_source_add_output_private_port( + private_component, "out1", NULL, NULL); + assert(ret == 0); + ret = bt_private_component_source_add_output_private_port( + private_component, "out2", NULL, NULL); + assert(ret == 0); next_return.status = BT_NOTIFICATION_ITERATOR_STATUS_END; } } else { @@ -669,7 +638,7 @@ struct bt_notification_iterator_next_return src_iter_next( } break; default: - assert(false); + abort(); } bt_put(private_component); @@ -681,18 +650,9 @@ enum bt_component_status src_init( struct bt_private_component *private_component, struct bt_value *params, void *init_method_data) { - struct bt_private_port *priv_port; int ret; size_t nb_ports; - priv_port = bt_private_component_source_get_default_output_private_port( - private_component); - if (priv_port) { - ret = bt_private_port_remove_from_component(priv_port); - assert(ret == 0); - bt_put(priv_port); - } - switch (current_test) { case TEST_NO_TS: nb_ports = 2; @@ -707,31 +667,27 @@ enum bt_component_status src_init( } if (nb_ports >= 1) { - priv_port = bt_private_component_source_add_output_private_port( - private_component, "out0", NULL); - assert(priv_port); - bt_put(priv_port); + ret = bt_private_component_source_add_output_private_port( + private_component, "out0", NULL, NULL); + assert(ret == 0); } if (nb_ports >= 2) { - priv_port = bt_private_component_source_add_output_private_port( - private_component, "out1", NULL); - assert(priv_port); - bt_put(priv_port); + ret = bt_private_component_source_add_output_private_port( + private_component, "out1", NULL, NULL); + assert(ret == 0); } if (nb_ports >= 3) { - priv_port = bt_private_component_source_add_output_private_port( - private_component, "out2", NULL); - assert(priv_port); - bt_put(priv_port); + ret = bt_private_component_source_add_output_private_port( + private_component, "out2", NULL, NULL); + assert(ret == 0); } if (nb_ports >= 4) { - priv_port = bt_private_component_source_add_output_private_port( - private_component, "out3", NULL); - assert(priv_port); - bt_put(priv_port); + ret = bt_private_component_source_add_output_private_port( + private_component, "out3", NULL, NULL); + assert(ret == 0); } return BT_COMPONENT_STATUS_OK; @@ -784,7 +740,7 @@ enum bt_component_status sink_consume( switch (bt_notification_get_type(notification)) { case BT_NOTIFICATION_TYPE_EVENT: { - struct bt_ctf_event *event; + struct bt_event *event; struct bt_clock_class_priority_map *cc_prio_map; test_event.type = TEST_EV_TYPE_NOTIF_EVENT; @@ -796,16 +752,16 @@ enum bt_component_status sink_consume( assert(event); if (bt_clock_class_priority_map_get_clock_class_count(cc_prio_map) > 0) { - struct bt_ctf_clock_value *clock_value; - struct bt_ctf_clock_class *clock_class = + struct bt_clock_value *clock_value; + struct bt_clock_class *clock_class = bt_clock_class_priority_map_get_highest_priority_clock_class( cc_prio_map); assert(clock_class); - clock_value = bt_ctf_event_get_clock_value(event, + clock_value = bt_event_get_clock_value(event, clock_class); assert(clock_value); - ret = bt_ctf_clock_value_get_value_ns_from_epoch( + ret = bt_clock_value_get_value_ns_from_epoch( clock_value, &test_event.ts_ns); assert(ret == 0); bt_put(clock_value); @@ -828,8 +784,8 @@ enum bt_component_status sink_consume( assert(cc_prio_map); if (bt_clock_class_priority_map_get_clock_class_count(cc_prio_map) > 0) { - struct bt_ctf_clock_value *clock_value; - struct bt_ctf_clock_class *clock_class = + struct bt_clock_value *clock_value; + struct bt_clock_class *clock_class = bt_clock_class_priority_map_get_highest_priority_clock_class( cc_prio_map); @@ -838,7 +794,7 @@ enum bt_component_status sink_consume( bt_notification_inactivity_get_clock_value( notification, clock_class); assert(clock_value); - ret = bt_ctf_clock_value_get_value_ns_from_epoch( + ret = bt_clock_value_get_value_ns_from_epoch( clock_value, &test_event.ts_ns); assert(ret == 0); bt_put(clock_value); @@ -885,12 +841,13 @@ void sink_port_connected(struct bt_private_component *private_component, bt_private_port_get_private_connection(self_private_port); struct sink_user_data *user_data = bt_private_component_get_user_data( private_component); + enum bt_connection_status conn_status; assert(user_data); assert(priv_conn); - user_data->notif_iter = - bt_private_connection_create_notification_iterator(priv_conn); - assert(user_data->notif_iter); + conn_status = bt_private_connection_create_notification_iterator( + priv_conn, NULL, &user_data->notif_iter); + assert(conn_status == 0); bt_put(priv_conn); } @@ -906,6 +863,9 @@ enum bt_component_status sink_init( ret = bt_private_component_set_user_data(private_component, user_data); assert(ret == 0); + ret = bt_private_component_sink_add_input_private_port( + private_component, "in", NULL, NULL); + assert(ret == 0); return BT_COMPONENT_STATUS_OK; } @@ -922,7 +882,8 @@ void sink_finalize(struct bt_private_component *private_component) } static -void create_source_muxer_sink(struct bt_component **source, +void create_source_muxer_sink(struct bt_graph *graph, + struct bt_component **source, struct bt_component **muxer, struct bt_component **sink) { @@ -945,15 +906,15 @@ void create_source_muxer_sink(struct bt_component **source, ret = bt_component_class_source_set_notification_iterator_finalize_method( src_comp_class, src_iter_finalize); assert(ret == 0); - *source = bt_component_create(src_comp_class, "source", NULL); - assert(*source); + ret = bt_graph_add_component(graph, src_comp_class, "source", NULL, source); + assert(ret == 0); /* Create muxer component */ muxer_comp_class = bt_plugin_find_component_class("utils", "muxer", BT_COMPONENT_CLASS_TYPE_FILTER); assert(muxer_comp_class); - *muxer = bt_component_create(muxer_comp_class, "muxer", NULL); - assert(*muxer); + ret = bt_graph_add_component(graph, muxer_comp_class, "muxer", NULL, muxer); + assert(ret == 0); /* Create sink component */ sink_comp_class = bt_component_class_sink_create("sink", sink_consume); @@ -965,7 +926,8 @@ void create_source_muxer_sink(struct bt_component **source, ret = bt_component_class_set_port_connected_method(sink_comp_class, sink_port_connected); assert(ret == 0); - *sink = bt_component_create(sink_comp_class, "sink", NULL); + ret = bt_graph_add_component(graph, sink_comp_class, "sink", NULL, sink); + assert(ret == 0); bt_put(src_comp_class); bt_put(muxer_comp_class); @@ -985,15 +947,14 @@ void do_std_test(enum test test, const char *name, struct bt_graph *graph; int64_t i; int64_t count; - void *conn; enum bt_graph_status graph_status = BT_GRAPH_STATUS_OK; clear_test_events(); current_test = test; diag("test: %s", name); - create_source_muxer_sink(&src_comp, &muxer_comp, &sink_comp); graph = bt_graph_create(); assert(graph); + create_source_muxer_sink(graph, &src_comp, &muxer_comp, &sink_comp); /* Connect source output ports to muxer input ports */ if (with_upstream) { @@ -1007,10 +968,9 @@ void do_std_test(enum test test, const char *name, downstream_port = bt_component_filter_get_input_port_by_index( muxer_comp, i); assert(downstream_port); - conn = bt_graph_connect_ports(graph, - upstream_port, downstream_port); - assert(conn); - bt_put(conn); + graph_status = bt_graph_connect_ports(graph, + upstream_port, downstream_port, NULL); + assert(graph_status == 0); bt_put(upstream_port); bt_put(downstream_port); } @@ -1020,11 +980,11 @@ void do_std_test(enum test test, const char *name, upstream_port = bt_component_filter_get_output_port_by_name(muxer_comp, "out"); assert(upstream_port); - downstream_port = bt_component_sink_get_default_input_port(sink_comp); + downstream_port = bt_component_sink_get_input_port_by_name(sink_comp, "in"); assert(downstream_port); - conn = bt_graph_connect_ports(graph, upstream_port, downstream_port); - assert(conn); - bt_put(conn); + graph_status = bt_graph_connect_ports(graph, upstream_port, + downstream_port, NULL); + assert(graph_status == 0); bt_put(upstream_port); bt_put(downstream_port); @@ -1342,9 +1302,9 @@ void connect_port_to_first_avail_muxer_port(struct bt_graph *graph, struct bt_component *muxer_comp) { struct bt_port *avail_muxer_port = NULL; - void *conn; int64_t i; int64_t count; + enum bt_graph_status graph_status; count = bt_component_filter_get_input_port_count(muxer_comp); assert(count >= 0); @@ -1364,9 +1324,9 @@ void connect_port_to_first_avail_muxer_port(struct bt_graph *graph, } } - conn = bt_graph_connect_ports(graph, source_port, avail_muxer_port); - assert(conn); - bt_put(conn); + graph_status = bt_graph_connect_ports(graph, source_port, + avail_muxer_port, NULL); + assert(graph_status == 0); bt_put(avail_muxer_port); } @@ -1402,7 +1362,6 @@ void test_single_end_then_multiple_full(void) struct bt_graph *graph; int64_t i; int64_t count; - void *conn; int ret; enum bt_graph_status graph_status = BT_GRAPH_STATUS_OK; struct graph_listener_data graph_listener_data; @@ -1467,17 +1426,17 @@ void test_single_end_then_multiple_full(void) clear_test_events(); current_test = TEST_SINGLE_END_THEN_MULTIPLE_FULL; diag("test: single end then multiple full"); - create_source_muxer_sink(&src_comp, &muxer_comp, &sink_comp); graph = bt_graph_create(); assert(graph); + create_source_muxer_sink(graph, &src_comp, &muxer_comp, &sink_comp); graph_listener_data.graph = graph; graph_listener_data.source = src_comp; graph_listener_data.muxer = muxer_comp; graph_listener_data.sink = sink_comp; ret = bt_graph_add_port_added_listener(graph, - graph_port_added_listener_connect_to_avail_muxer_port, + graph_port_added_listener_connect_to_avail_muxer_port, NULL, &graph_listener_data); - assert(ret == 0); + assert(ret >= 0); /* Connect source output ports to muxer input ports */ count = bt_component_source_get_output_port_count(src_comp); @@ -1496,11 +1455,11 @@ void test_single_end_then_multiple_full(void) upstream_port = bt_component_filter_get_output_port_by_name(muxer_comp, "out"); assert(upstream_port); - downstream_port = bt_component_sink_get_default_input_port(sink_comp); + downstream_port = bt_component_sink_get_input_port_by_name(sink_comp, "in"); assert(downstream_port); - conn = bt_graph_connect_ports(graph, upstream_port, downstream_port); - assert(conn); - bt_put(conn); + graph_status = bt_graph_connect_ports(graph, upstream_port, + downstream_port, NULL); + assert(graph_status == 0); bt_put(upstream_port); bt_put(downstream_port); @@ -1530,7 +1489,6 @@ void test_single_again_end_then_multiple_full(void) struct bt_graph *graph; int64_t i; int64_t count; - void *conn; int ret; enum bt_graph_status graph_status = BT_GRAPH_STATUS_OK; struct graph_listener_data graph_listener_data; @@ -1596,17 +1554,17 @@ void test_single_again_end_then_multiple_full(void) clear_test_events(); current_test = TEST_SINGLE_AGAIN_END_THEN_MULTIPLE_FULL; diag("test: single again then end then multiple full"); - create_source_muxer_sink(&src_comp, &muxer_comp, &sink_comp); graph = bt_graph_create(); assert(graph); + create_source_muxer_sink(graph, &src_comp, &muxer_comp, &sink_comp); graph_listener_data.graph = graph; graph_listener_data.source = src_comp; graph_listener_data.muxer = muxer_comp; graph_listener_data.sink = sink_comp; ret = bt_graph_add_port_added_listener(graph, - graph_port_added_listener_connect_to_avail_muxer_port, + graph_port_added_listener_connect_to_avail_muxer_port, NULL, &graph_listener_data); - assert(ret == 0); + assert(ret >= 0); /* Connect source output ports to muxer input ports */ count = bt_component_source_get_output_port_count(src_comp); @@ -1625,11 +1583,11 @@ void test_single_again_end_then_multiple_full(void) upstream_port = bt_component_filter_get_output_port_by_name(muxer_comp, "out"); assert(upstream_port); - downstream_port = bt_component_sink_get_default_input_port(sink_comp); + downstream_port = bt_component_sink_get_input_port_by_name(sink_comp, "in"); assert(downstream_port); - conn = bt_graph_connect_ports(graph, upstream_port, downstream_port); - assert(conn); - bt_put(conn); + graph_status = bt_graph_connect_ports(graph, upstream_port, + downstream_port, NULL); + assert(graph_status == 0); bt_put(upstream_port); bt_put(downstream_port);