Graph API: split into private and public APIs

[babeltrace.git] / tests / lib / test_graph_topo.c

diff --git a/tests/lib/test_graph_topo.c b/tests/lib/test_graph_topo.c
index c34821a60cab0e67b14c235636b7d2c31a85f150..bb29db0b1a5a9eac4d5fb4dcbcc2eff5f27ee88c 100644 (file)
--- a/tests/lib/test_graph_topo.c
+++ b/tests/lib/test_graph_topo.c
@@ -17,13 +17,14 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include <babeltrace/ref.h>
+#include <babeltrace/object.h>
 #include <babeltrace/graph/component-class.h>
 #include <babeltrace/graph/component-class-source.h>
 #include <babeltrace/graph/component-class-sink.h>
 #include <babeltrace/graph/component.h>
 #include <babeltrace/graph/component-source.h>
 #include <babeltrace/graph/component-sink.h>
+#include <babeltrace/graph/private-graph.h>
 #include <babeltrace/graph/graph.h>
 #include <babeltrace/graph/connection.h>
 #include <babeltrace/graph/port.h>
@@ -399,7 +400,7 @@ enum bt_component_status sink_consume(
                BT_ASSERT(def_port);
                ret = bt_private_port_remove_from_component(def_port);
                BT_ASSERT(ret == 0);
-               bt_put(def_port);
+               bt_object_put_ref(def_port);
                break;
        default:
                break;
@@ -466,7 +467,7 @@ void graph_port_added(struct bt_port *port,
        struct bt_component *comp = bt_port_get_component(port);
 
        BT_ASSERT(comp);
-       bt_put(comp);
+       bt_object_put_ref(comp);
 
        struct event event = {
                .type = GRAPH_PORT_ADDED,
@@ -507,9 +508,9 @@ void graph_ports_connected(struct bt_port *upstream_port,
        BT_ASSERT(upstream_comp);
        BT_ASSERT(downstream_comp);
        BT_ASSERT(conn);
-       bt_put(upstream_comp);
-       bt_put(downstream_comp);
-       bt_put(conn);
+       bt_object_put_ref(upstream_comp);
+       bt_object_put_ref(downstream_comp);
+       bt_object_put_ref(conn);
 
        struct event event = {
                .type = GRAPH_PORTS_CONNECTED,
@@ -585,52 +586,52 @@ void init_test(void)
 static
 void fini_test(void)
 {
-       bt_put(src_comp_class);
-       bt_put(sink_comp_class);
+       bt_object_put_ref(src_comp_class);
+       bt_object_put_ref(sink_comp_class);
        g_array_free(events, TRUE);
 }
 
 static
-struct bt_component *create_src(struct bt_graph *graph)
+struct bt_component *create_src(struct bt_private_graph *graph)
 {
        struct bt_component *comp;
        int ret;
 
-       ret = bt_graph_add_component(graph, src_comp_class, "src-comp", NULL,
+       ret = bt_private_graph_add_component(graph, src_comp_class, "src-comp", NULL,
                &comp);
        BT_ASSERT(ret == 0);
        return comp;
 }
 
 static
-struct bt_component *create_sink(struct bt_graph *graph)
+struct bt_component *create_sink(struct bt_private_graph *graph)
 {
        struct bt_component *comp;
        int ret;
 
-       ret = bt_graph_add_component(graph, sink_comp_class, "sink-comp",
+       ret = bt_private_graph_add_component(graph, sink_comp_class, "sink-comp",
                NULL, &comp);
        BT_ASSERT(ret == 0);
        return comp;
 }
 
 static
-struct bt_graph *create_graph(void)
+struct bt_private_graph *create_graph(void)
 {
-       struct bt_graph *graph = bt_graph_create();
+       struct bt_private_graph *graph = bt_private_graph_create();
        int ret;
 
        BT_ASSERT(graph);
-       ret = bt_graph_add_port_added_listener(graph, graph_port_added, NULL,
+       ret = bt_private_graph_add_port_added_listener(graph, graph_port_added, NULL,
                NULL);
        BT_ASSERT(ret >= 0);
-       ret = bt_graph_add_port_removed_listener(graph, graph_port_removed,
+       ret = bt_private_graph_add_port_removed_listener(graph, graph_port_removed,
                NULL, NULL);
        BT_ASSERT(ret >= 0);
-       ret = bt_graph_add_ports_connected_listener(graph,
+       ret = bt_private_graph_add_ports_connected_listener(graph,
                graph_ports_connected, NULL, NULL);
        BT_ASSERT(ret >= 0);
-       ret = bt_graph_add_ports_disconnected_listener(graph,
+       ret = bt_private_graph_add_ports_disconnected_listener(graph,
                graph_ports_disconnected, NULL, NULL);
        BT_ASSERT(ret >= 0);
        return graph;
@@ -650,7 +651,7 @@ void test_sink_removes_port_in_port_connected_then_src_removes_disconnected_port
        int ret;
        struct bt_component *src;
        struct bt_component *sink;
-       struct bt_graph *graph;
+       struct bt_private_graph *graph;
        struct bt_port *src_def_port;
        struct bt_port *sink_def_port;
        struct bt_connection *conn;
@@ -677,7 +678,7 @@ void test_sink_removes_port_in_port_connected_then_src_removes_disconnected_port
        BT_ASSERT(src_def_port);
        sink_def_port = bt_component_sink_get_input_port_by_name(sink, "in");
        BT_ASSERT(sink_def_port);
-       status = bt_graph_connect_ports(graph, src_def_port, sink_def_port,
+       status = bt_private_graph_connect_ports(graph, src_def_port, sink_def_port,
                &conn);
        BT_ASSERT(status == 0);
        BT_ASSERT(conn);
@@ -751,7 +752,7 @@ void test_sink_removes_port_in_port_connected_then_src_removes_disconnected_port
 
        /* Consume sink once */
        clear_events();
-       ret = bt_graph_consume(graph);
+       ret = bt_private_graph_consume(graph);
        BT_ASSERT(ret == 0);
 
        /* We're supposed to have 5 new events */
@@ -814,12 +815,12 @@ void test_sink_removes_port_in_port_connected_then_src_removes_disconnected_port
        ok(graph_port_removed_src_pos < graph_port_removed_sink_pos,
                "event order is good (13)");
 
-       bt_put(graph);
-       bt_put(sink);
-       bt_put(src);
-       bt_put(conn);
-       bt_put(src_def_port);
-       bt_put(sink_def_port);
+       bt_object_put_ref(graph);
+       bt_object_put_ref(sink);
+       bt_object_put_ref(src);
+       bt_object_put_ref(conn);
+       bt_object_put_ref(src_def_port);
+       bt_object_put_ref(sink_def_port);
 }
 
 static
@@ -828,7 +829,7 @@ void test_sink_removes_port_in_port_connected(void)
        int ret;
        struct bt_component *src;
        struct bt_component *sink;
-       struct bt_graph *graph;
+       struct bt_private_graph *graph;
        struct bt_port *src_def_port;
        struct bt_port *sink_def_port;
        struct bt_connection *conn;
@@ -854,7 +855,7 @@ void test_sink_removes_port_in_port_connected(void)
        BT_ASSERT(src_def_port);
        sink_def_port = bt_component_sink_get_input_port_by_name(sink, "in");
        BT_ASSERT(sink_def_port);
-       status = bt_graph_connect_ports(graph, src_def_port, sink_def_port,
+       status = bt_private_graph_connect_ports(graph, src_def_port, sink_def_port,
                &conn);
        BT_ASSERT(status == 0);
 
@@ -927,7 +928,7 @@ void test_sink_removes_port_in_port_connected(void)
 
        /* Consume sink once */
        clear_events();
-       ret = bt_graph_consume(graph);
+       ret = bt_private_graph_consume(graph);
        BT_ASSERT(ret == 0);
 
        /* We're supposed to have 4 new events */
@@ -975,12 +976,12 @@ void test_sink_removes_port_in_port_connected(void)
        ok(graph_ports_disconnected_pos < graph_port_removed_sink_pos,
                "event order is good (11)");
 
-       bt_put(graph);
-       bt_put(sink);
-       bt_put(src);
-       bt_put(conn);
-       bt_put(src_def_port);
-       bt_put(sink_def_port);
+       bt_object_put_ref(graph);
+       bt_object_put_ref(sink);
+       bt_object_put_ref(src);
+       bt_object_put_ref(conn);
+       bt_object_put_ref(src_def_port);
+       bt_object_put_ref(sink_def_port);
 }
 
 static
@@ -988,7 +989,7 @@ void test_src_adds_port_in_port_connected(void)
 {
        struct bt_component *src;
        struct bt_component *sink;
-       struct bt_graph *graph;
+       struct bt_private_graph *graph;
        struct bt_port *src_def_port;
        struct bt_port *sink_def_port;
        struct bt_port *src_hello_port;
@@ -1012,7 +1013,7 @@ void test_src_adds_port_in_port_connected(void)
        BT_ASSERT(src_def_port);
        sink_def_port = bt_component_sink_get_input_port_by_name(sink, "in");
        BT_ASSERT(sink_def_port);
-       status = bt_graph_connect_ports(graph, src_def_port, sink_def_port,
+       status = bt_private_graph_connect_ports(graph, src_def_port, sink_def_port,
                &conn);
        BT_ASSERT(status == 0);
        src_hello_port = bt_component_source_get_output_port_by_name(src,
@@ -1097,13 +1098,13 @@ void test_src_adds_port_in_port_connected(void)
        ok(graph_port_added_src_pos < graph_ports_connected_pos,
                "event order is good (6)");
 
-       bt_put(graph);
-       bt_put(sink);
-       bt_put(src);
-       bt_put(conn);
-       bt_put(src_def_port);
-       bt_put(sink_def_port);
-       bt_put(src_hello_port);
+       bt_object_put_ref(graph);
+       bt_object_put_ref(sink);
+       bt_object_put_ref(src);
+       bt_object_put_ref(conn);
+       bt_object_put_ref(src_def_port);
+       bt_object_put_ref(sink_def_port);
+       bt_object_put_ref(src_hello_port);
 }
 
 static
@@ -1111,7 +1112,7 @@ void test_simple(void)
 {
        struct bt_component *src;
        struct bt_component *sink;
-       struct bt_graph *graph;
+       struct bt_private_graph *graph;
        struct bt_port *src_def_port;
        struct bt_port *sink_def_port;
        struct bt_connection *conn;
@@ -1132,7 +1133,7 @@ void test_simple(void)
        BT_ASSERT(src_def_port);
        sink_def_port = bt_component_sink_get_input_port_by_name(sink, "in");
        BT_ASSERT(sink_def_port);
-       status = bt_graph_connect_ports(graph, src_def_port, sink_def_port,
+       status = bt_private_graph_connect_ports(graph, src_def_port, sink_def_port,
                &conn);
        BT_ASSERT(status == 0);
 
@@ -1203,12 +1204,12 @@ void test_simple(void)
        ok(sink_accept_port_connection_pos < sink_port_connected_pos,
                "event order is good (4)");
 
-       bt_put(graph);
-       bt_put(sink);
-       bt_put(src);
-       bt_put(conn);
-       bt_put(src_def_port);
-       bt_put(sink_def_port);
+       bt_object_put_ref(graph);
+       bt_object_put_ref(sink);
+       bt_object_put_ref(src);
+       bt_object_put_ref(conn);
+       bt_object_put_ref(src_def_port);
+       bt_object_put_ref(sink_def_port);
 }
 
 static
@@ -1216,7 +1217,7 @@ void test_src_port_connected_error(void)
 {
        struct bt_component *src;
        struct bt_component *sink;
-       struct bt_graph *graph;
+       struct bt_private_graph *graph;
        struct bt_port *src_def_port;
        struct bt_port *sink_def_port;
        struct bt_connection *conn = NULL;
@@ -1234,10 +1235,10 @@ void test_src_port_connected_error(void)
        BT_ASSERT(src_def_port);
        sink_def_port = bt_component_sink_get_input_port_by_name(sink, "in");
        BT_ASSERT(sink_def_port);
-       status = bt_graph_connect_ports(graph, src_def_port, sink_def_port,
+       status = bt_private_graph_connect_ports(graph, src_def_port, sink_def_port,
                &conn);
        ok(status != BT_GRAPH_STATUS_OK,
-               "bt_graph_connect_ports() returns an error");
+               "bt_private_graph_connect_ports() returns an error");
        ok(!conn, "returned connection is NULL");
 
        /* We're supposed to have 5 events */
@@ -1282,12 +1283,12 @@ void test_src_port_connected_error(void)
        ok(src_accept_port_connection_pos < src_port_connected_pos,
                "event order is good (1)");
 
-       bt_put(graph);
-       bt_put(sink);
-       bt_put(src);
-       bt_put(conn);
-       bt_put(src_def_port);
-       bt_put(sink_def_port);
+       bt_object_put_ref(graph);
+       bt_object_put_ref(sink);
+       bt_object_put_ref(src);
+       bt_object_put_ref(conn);
+       bt_object_put_ref(src_def_port);
+       bt_object_put_ref(sink_def_port);
 }
 
 static
@@ -1295,7 +1296,7 @@ void test_sink_port_connected_error(void)
 {
        struct bt_component *src;
        struct bt_component *sink;
-       struct bt_graph *graph;
+       struct bt_private_graph *graph;
        struct bt_port *src_def_port;
        struct bt_port *sink_def_port;
        struct bt_connection *conn = NULL;
@@ -1316,10 +1317,10 @@ void test_sink_port_connected_error(void)
        BT_ASSERT(src_def_port);
        sink_def_port = bt_component_sink_get_input_port_by_name(sink, "in");
        BT_ASSERT(sink_def_port);
-       status = bt_graph_connect_ports(graph, src_def_port, sink_def_port,
+       status = bt_private_graph_connect_ports(graph, src_def_port, sink_def_port,
                &conn);
        ok(status != BT_GRAPH_STATUS_OK,
-               "bt_graph_connect_ports() returns an error");
+               "bt_private_graph_connect_ports() returns an error");
        ok(!conn, "returned connection is NULL");
 
        /* We're supposed to have 5 events */
@@ -1384,23 +1385,23 @@ void test_sink_port_connected_error(void)
        ok(sink_port_connected_pos < src_port_disconnected_pos,
                "event order is good (3)");
 
-       bt_put(graph);
-       bt_put(sink);
-       bt_put(src);
-       bt_put(conn);
-       bt_put(src_def_port);
-       bt_put(sink_def_port);
+       bt_object_put_ref(graph);
+       bt_object_put_ref(sink);
+       bt_object_put_ref(src);
+       bt_object_put_ref(conn);
+       bt_object_put_ref(src_def_port);
+       bt_object_put_ref(sink_def_port);
 }
 
 static
 void test_empty_graph(void)
 {
-       struct bt_graph *graph;
+       struct bt_private_graph *graph;
 
        prepare_test(TEST_EMPTY_GRAPH, "empty graph");
        graph = create_graph();
        ok(events->len == 0, "empty graph generates no events");
-       bt_put(graph);
+       bt_object_put_ref(graph);
 }
 
 int main(int argc, char **argv)