Set private port's user data on creation

[babeltrace.git] / tests / plugins / test-utils-muxer.c

diff --git a/tests/plugins/test-utils-muxer.c b/tests/plugins/test-utils-muxer.c
index 9c369b3986a209dc26c2668ed99dd46207975a4f..50f5be5de37bfcf46991a3dd3d33b01039831ece 100644 (file)
--- a/tests/plugins/test-utils-muxer.c
+++ b/tests/plugins/test-utils-muxer.c
@@ -634,11 +634,11 @@ struct bt_notification_iterator_next_return src_iter_next(
                        struct bt_private_port *priv_port;
 
                        priv_port = bt_private_component_source_add_output_private_port(
-                               private_component, "out1");
+                               private_component, "out1", NULL);
                        assert(priv_port);
                        bt_put(priv_port);
                        priv_port = bt_private_component_source_add_output_private_port(
-                               private_component, "out2");
+                               private_component, "out2", NULL);
                        assert(priv_port);
                        bt_put(priv_port);
                        next_return.status = BT_NOTIFICATION_ITERATOR_STATUS_END;
@@ -655,11 +655,11 @@ struct bt_notification_iterator_next_return src_iter_next(
                                struct bt_private_port *priv_port;
 
                                priv_port = bt_private_component_source_add_output_private_port(
-                                       private_component, "out1");
+                                       private_component, "out1", NULL);
                                assert(priv_port);
                                bt_put(priv_port);
                                priv_port = bt_private_component_source_add_output_private_port(
-                                       private_component, "out2");
+                                       private_component, "out2", NULL);
                                assert(priv_port);
                                bt_put(priv_port);
                                next_return.status = BT_NOTIFICATION_ITERATOR_STATUS_END;
@@ -708,28 +708,28 @@ enum bt_component_status src_init(
 
        if (nb_ports >= 1) {
                priv_port = bt_private_component_source_add_output_private_port(
-                       private_component, "out0");
+                       private_component, "out0", NULL);
                assert(priv_port);
                bt_put(priv_port);
        }
 
        if (nb_ports >= 2) {
                priv_port = bt_private_component_source_add_output_private_port(
-                       private_component, "out1");
+                       private_component, "out1", NULL);
                assert(priv_port);
                bt_put(priv_port);
        }
 
        if (nb_ports >= 3) {
                priv_port = bt_private_component_source_add_output_private_port(
-                       private_component, "out2");
+                       private_component, "out2", NULL);
                assert(priv_port);
                bt_put(priv_port);
        }
 
        if (nb_ports >= 4) {
                priv_port = bt_private_component_source_add_output_private_port(
-                       private_component, "out3");
+                       private_component, "out3", NULL);
                assert(priv_port);
                bt_put(priv_port);
        }
@@ -983,10 +983,9 @@ void do_std_test(enum test test, const char *name,
        struct bt_port *upstream_port;
        struct bt_port *downstream_port;
        struct bt_graph *graph;
-       size_t i;
-       uint64_t count;
+       int64_t i;
+       int64_t count;
        void *conn;
-       int ret;
        enum bt_graph_status graph_status = BT_GRAPH_STATUS_OK;
 
        clear_test_events();
@@ -998,14 +997,14 @@ void do_std_test(enum test test, const char *name,
 
        /* Connect source output ports to muxer input ports */
        if (with_upstream) {
-               ret = bt_component_source_get_output_port_count(src_comp, &count);
-               assert(ret == 0);
+               count = bt_component_source_get_output_port_count(src_comp);
+               assert(count >= 0);
 
                for (i = 0; i < count; i++) {
-                       upstream_port = bt_component_source_get_output_port_at_index(
+                       upstream_port = bt_component_source_get_output_port_by_index(
                                src_comp, i);
                        assert(upstream_port);
-                       downstream_port = bt_component_filter_get_input_port_at_index(
+                       downstream_port = bt_component_filter_get_input_port_by_index(
                                muxer_comp, i);
                        assert(downstream_port);
                        conn = bt_graph_connect_ports(graph,
@@ -1018,7 +1017,7 @@ void do_std_test(enum test test, const char *name,
        }
 
        /* Connect muxer output port to sink input port */
-       upstream_port = bt_component_filter_get_output_port(muxer_comp,
+       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);
@@ -1344,16 +1343,15 @@ void connect_port_to_first_avail_muxer_port(struct bt_graph *graph,
 {
        struct bt_port *avail_muxer_port = NULL;
        void *conn;
-       uint64_t i;
-       uint64_t count;
-       int ret;
+       int64_t i;
+       int64_t count;
 
-       ret = bt_component_filter_get_input_port_count(muxer_comp, &count);
-       assert(ret == 0);
+       count = bt_component_filter_get_input_port_count(muxer_comp);
+       assert(count >= 0);
 
        for (i = 0; i < count; i++) {
                struct bt_port *muxer_port =
-                       bt_component_filter_get_input_port_at_index(
+                       bt_component_filter_get_input_port_by_index(
                                muxer_comp, i);
 
                assert(muxer_port);
@@ -1402,8 +1400,8 @@ void test_single_end_then_multiple_full(void)
        struct bt_port *upstream_port;
        struct bt_port *downstream_port;
        struct bt_graph *graph;
-       size_t i;
-       uint64_t count;
+       int64_t i;
+       int64_t count;
        void *conn;
        int ret;
        enum bt_graph_status graph_status = BT_GRAPH_STATUS_OK;
@@ -1482,11 +1480,11 @@ void test_single_end_then_multiple_full(void)
        assert(ret == 0);
 
        /* Connect source output ports to muxer input ports */
-       ret = bt_component_source_get_output_port_count(src_comp, &count);
+       count = bt_component_source_get_output_port_count(src_comp);
        assert(ret == 0);
 
        for (i = 0; i < count; i++) {
-               upstream_port = bt_component_source_get_output_port_at_index(
+               upstream_port = bt_component_source_get_output_port_by_index(
                        src_comp, i);
                assert(upstream_port);
                connect_port_to_first_avail_muxer_port(graph,
@@ -1495,7 +1493,7 @@ void test_single_end_then_multiple_full(void)
        }
 
        /* Connect muxer output port to sink input port */
-       upstream_port = bt_component_filter_get_output_port(muxer_comp,
+       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);
@@ -1530,8 +1528,8 @@ void test_single_again_end_then_multiple_full(void)
        struct bt_port *upstream_port;
        struct bt_port *downstream_port;
        struct bt_graph *graph;
-       size_t i;
-       uint64_t count;
+       int64_t i;
+       int64_t count;
        void *conn;
        int ret;
        enum bt_graph_status graph_status = BT_GRAPH_STATUS_OK;
@@ -1611,11 +1609,11 @@ void test_single_again_end_then_multiple_full(void)
        assert(ret == 0);
 
        /* Connect source output ports to muxer input ports */
-       ret = bt_component_source_get_output_port_count(src_comp, &count);
+       count = bt_component_source_get_output_port_count(src_comp);
        assert(ret == 0);
 
        for (i = 0; i < count; i++) {
-               upstream_port = bt_component_source_get_output_port_at_index(
+               upstream_port = bt_component_source_get_output_port_by_index(
                        src_comp, i);
                assert(upstream_port);
                connect_port_to_first_avail_muxer_port(graph,
@@ -1624,7 +1622,7 @@ void test_single_again_end_then_multiple_full(void)
        }
 
        /* Connect muxer output port to sink input port */
-       upstream_port = bt_component_filter_get_output_port(muxer_comp,
+       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);