#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>
switch (current_test) {
case TEST_SRC_ADDS_PORT_IN_PORT_CONNECTED:
- ret = bt_private_component_source_add_output_private_port(
+ ret = bt_private_component_source_add_output_port(
private_component, "hello", NULL, NULL);
BT_ASSERT(ret == 0);
break;
{
int ret;
- ret = bt_private_component_source_add_output_private_port(
+ ret = bt_private_component_source_add_output_port(
priv_comp, "out", NULL, NULL);
BT_ASSERT(ret == 0);
return BT_COMPONENT_STATUS_OK;
switch (current_test) {
case TEST_SINK_REMOVES_PORT_IN_CONSUME:
case TEST_SINK_REMOVES_PORT_IN_CONSUME_THEN_SRC_REMOVES_DISCONNECTED_PORT:
- def_port = bt_private_component_sink_get_input_private_port_by_name(
+ def_port = bt_private_component_sink_get_input_port_by_name(
priv_component, "in");
BT_ASSERT(def_port);
ret = bt_private_port_remove_from_component(def_port);
{
int ret;
- ret = bt_private_component_sink_add_input_private_port(priv_comp,
+ ret = bt_private_component_sink_add_input_port(priv_comp,
"in", NULL, NULL);
BT_ASSERT(ret == 0);
return BT_COMPONENT_STATUS_OK;
}
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;
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;
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);
/* 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 */
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;
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);
/* 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 */
{
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;
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,
{
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;
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);
{
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;
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 */
{
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;
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 */
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();