union {
struct {
- struct bt_component *comp;
- struct bt_port *self_port;
- struct bt_port *other_port;
+ const struct bt_component *comp;
+ const struct bt_port *self_port;
+ const struct bt_port *other_port;
} src_comp_accept_output_port_connection;
struct {
- struct bt_component *comp;
- struct bt_port *self_port;
- struct bt_port *other_port;
+ const struct bt_component *comp;
+ const struct bt_port *self_port;
+ const struct bt_port *other_port;
} sink_comp_accept_input_port_connection;
struct {
- struct bt_component *comp;
- struct bt_port *self_port;
- struct bt_port *other_port;
+ const struct bt_component *comp;
+ const struct bt_port *self_port;
+ const struct bt_port *other_port;
} src_comp_output_port_connected;
struct {
- struct bt_component *comp;
- struct bt_port *self_port;
- struct bt_port *other_port;
+ const struct bt_component *comp;
+ const struct bt_port *self_port;
+ const struct bt_port *other_port;
} sink_comp_input_port_connected;
struct {
- struct bt_component *comp;
- struct bt_port *self_port;
+ const struct bt_component *comp;
+ const struct bt_port *self_port;
} src_comp_output_port_disconnected;
struct {
- struct bt_component *comp;
- struct bt_port *self_port;
+ const struct bt_component *comp;
+ const struct bt_port *self_port;
} sink_comp_input_port_disconnected;
struct {
- struct bt_component *comp;
- struct bt_port *port;
+ const struct bt_component *comp;
+ const struct bt_port *port;
} graph_src_output_port_added;
struct {
- struct bt_component *comp;
- struct bt_port *port;
+ const struct bt_component *comp;
+ const struct bt_port *port;
} graph_sink_input_port_added;
struct {
- struct bt_component *comp;
- struct bt_port *port;
+ const struct bt_component *comp;
+ const struct bt_port *port;
} graph_src_output_port_removed;
struct {
- struct bt_component *comp;
- struct bt_port *port;
+ const struct bt_component *comp;
+ const struct bt_port *port;
} graph_sink_input_port_removed;
struct {
- struct bt_component *upstream_comp;
- struct bt_component *downstream_comp;
- struct bt_port *upstream_port;
- struct bt_port *downstream_port;
+ const struct bt_component *upstream_comp;
+ const struct bt_component *downstream_comp;
+ const struct bt_port *upstream_port;
+ const struct bt_port *downstream_port;
} graph_src_sink_ports_connected;
struct {
- struct bt_component *upstream_comp;
- struct bt_component *downstream_comp;
- struct bt_port *upstream_port;
- struct bt_port *downstream_port;
+ const struct bt_component *upstream_comp;
+ const struct bt_component *downstream_comp;
+ const struct bt_port *upstream_port;
+ const struct bt_port *downstream_port;
} graph_src_sink_ports_disconnected;
} data;
};
static GArray *events;
-static struct bt_private_component_class_source *src_comp_class;
-static struct bt_private_component_class_sink *sink_comp_class;
+static struct bt_component_class_source *src_comp_class;
+static struct bt_component_class_sink *sink_comp_class;
static enum test current_test;
static
static
enum bt_self_notification_iterator_status src_iter_next(
struct bt_self_notification_iterator *self_iterator,
- bt_notification_array notifs, uint64_t capacity,
+ bt_notification_array_const notifs, uint64_t capacity,
uint64_t *count)
{
return BT_SELF_NOTIFICATION_ITERATOR_STATUS_ERROR;
enum bt_self_component_status src_accept_output_port_connection(
struct bt_self_component_source *self_comp,
struct bt_self_component_port_output *self_comp_port,
- struct bt_port_input *other_port)
+ const struct bt_port_input *other_port)
{
struct event event = {
.type = SRC_COMP_ACCEPT_OUTPUT_PORT_CONNECTION,
.self_port = bt_self_component_port_as_port(
bt_self_component_port_output_as_self_component_port(
self_comp_port)),
- .other_port = bt_port_input_as_port(other_port),
+ .other_port = bt_port_input_as_port_const(other_port),
},
};
enum bt_self_component_status sink_accept_input_port_connection(
struct bt_self_component_sink *self_comp,
struct bt_self_component_port_input *self_comp_port,
- struct bt_port_output *other_port)
+ const struct bt_port_output *other_port)
{
struct event event = {
.type = SINK_COMP_ACCEPT_INPUT_PORT_CONNECTION,
.self_port = bt_self_component_port_as_port(
bt_self_component_port_input_as_self_component_port(
self_comp_port)),
- .other_port = bt_port_output_as_port(other_port),
+ .other_port = bt_port_output_as_port_const(other_port),
},
};
enum bt_self_component_status src_output_port_connected(
struct bt_self_component_source *self_comp,
struct bt_self_component_port_output *self_comp_port,
- struct bt_port_input *other_port)
+ const struct bt_port_input *other_port)
{
int ret;
struct event event = {
.self_port = bt_self_component_port_as_port(
bt_self_component_port_output_as_self_component_port(
self_comp_port)),
- .other_port = bt_port_input_as_port(other_port),
+ .other_port = bt_port_input_as_port_const(other_port),
},
};
enum bt_self_component_status sink_input_port_connected(
struct bt_self_component_sink *self_comp,
struct bt_self_component_port_input *self_comp_port,
- struct bt_port_output *other_port)
+ const struct bt_port_output *other_port)
{
struct event event = {
.type = SINK_COMP_INPUT_PORT_CONNECTED,
.self_port = bt_self_component_port_as_port(
bt_self_component_port_input_as_self_component_port(
self_comp_port)),
- .other_port = bt_port_output_as_port(other_port),
+ .other_port = bt_port_output_as_port_const(other_port),
},
};
}
static
-void graph_src_output_port_added(struct bt_component_source *comp,
- struct bt_port_output *port, void *data)
+void graph_src_output_port_added(const struct bt_component_source *comp,
+ const struct bt_port_output *port, void *data)
{
struct event event = {
.type = GRAPH_SRC_OUTPUT_PORT_ADDED,
.data.graph_src_output_port_added = {
- .comp = bt_component_source_as_component(comp),
- .port = bt_port_output_as_port(port),
+ .comp = bt_component_source_as_component_const(comp),
+ .port = bt_port_output_as_port_const(port),
},
};
}
static
-void graph_sink_input_port_added(struct bt_component_sink *comp,
- struct bt_port_input *port, void *data)
+void graph_sink_input_port_added(const struct bt_component_sink *comp,
+ const struct bt_port_input *port, void *data)
{
struct event event = {
.type = GRAPH_SINK_INPUT_PORT_ADDED,
.data.graph_sink_input_port_added = {
- .comp = bt_component_sink_as_component(comp),
- .port = bt_port_input_as_port(port),
+ .comp = bt_component_sink_as_component_const(comp),
+ .port = bt_port_input_as_port_const(port),
},
};
}
static
-void graph_src_output_port_removed(struct bt_component_source *comp,
- struct bt_port_output *port, void *data)
+void graph_src_output_port_removed(const struct bt_component_source *comp,
+ const struct bt_port_output *port, void *data)
{
struct event event = {
.type = GRAPH_SRC_OUTPUT_PORT_REMOVED,
.data.graph_src_output_port_removed = {
- .comp = bt_component_source_as_component(comp),
- .port = bt_port_output_as_port(port),
+ .comp = bt_component_source_as_component_const(comp),
+ .port = bt_port_output_as_port_const(port),
},
};
}
static
-void graph_sink_input_port_removed(struct bt_component_sink *comp,
- struct bt_port_input *port, void *data)
+void graph_sink_input_port_removed(const struct bt_component_sink *comp,
+ const struct bt_port_input *port, void *data)
{
struct event event = {
.type = GRAPH_SINK_INPUT_PORT_REMOVED,
.data.graph_sink_input_port_removed = {
- .comp = bt_component_sink_as_component(comp),
- .port = bt_port_input_as_port(port),
+ .comp = bt_component_sink_as_component_const(comp),
+ .port = bt_port_input_as_port_const(port),
},
};
}
static
-void graph_src_sink_ports_connected(struct bt_component_source *upstream_comp,
- struct bt_component_sink *downstream_comp,
- struct bt_port_output *upstream_port,
- struct bt_port_input *downstream_port, void *data)
+void graph_src_sink_ports_connected(const struct bt_component_source *upstream_comp,
+ const struct bt_component_sink *downstream_comp,
+ const struct bt_port_output *upstream_port,
+ const struct bt_port_input *downstream_port, void *data)
{
struct event event = {
.type = GRAPH_SRC_SINK_PORTS_CONNECTED,
.data.graph_src_sink_ports_connected = {
.upstream_comp =
- bt_component_source_as_component(upstream_comp),
- .downstream_comp =
- bt_component_sink_as_component(downstream_comp),
- .upstream_port =
- bt_port_output_as_port(upstream_port),
- .downstream_port =
- bt_port_input_as_port(downstream_port),
+ bt_component_source_as_component_const(upstream_comp),
+ .downstream_comp =
+ bt_component_sink_as_component_const(downstream_comp),
+ .upstream_port =
+ bt_port_output_as_port_const(upstream_port),
+ .downstream_port =
+ bt_port_input_as_port_const(downstream_port),
},
};
}
static
-void graph_src_sink_ports_disconnected(struct bt_component_source *upstream_comp,
- struct bt_component_sink *downstream_comp,
- struct bt_port_output *upstream_port,
- struct bt_port_input *downstream_port, void *data)
+void graph_src_sink_ports_disconnected(const struct bt_component_source *upstream_comp,
+ const struct bt_component_sink *downstream_comp,
+ const struct bt_port_output *upstream_port,
+ const struct bt_port_input *downstream_port, void *data)
{
struct event event = {
.type = GRAPH_SRC_SINK_PORTS_DISCONNECTED,
.data.graph_src_sink_ports_disconnected = {
.upstream_comp =
- bt_component_source_as_component(upstream_comp),
- .downstream_comp =
- bt_component_sink_as_component(downstream_comp),
- .upstream_port =
- bt_port_output_as_port(upstream_port),
- .downstream_port =
- bt_port_input_as_port(downstream_port),
+ bt_component_source_as_component_const(upstream_comp),
+ .downstream_comp =
+ bt_component_sink_as_component_const(downstream_comp),
+ .upstream_port =
+ bt_port_output_as_port_const(upstream_port),
+ .downstream_port =
+ bt_port_input_as_port_const(downstream_port),
},
};
{
int ret;
- src_comp_class = bt_private_component_class_source_create(
+ src_comp_class = bt_component_class_source_create(
"src", src_iter_next);
BT_ASSERT(src_comp_class);
- ret = bt_private_component_class_source_set_init_method(
+ ret = bt_component_class_source_set_init_method(
src_comp_class, src_init);
BT_ASSERT(ret == 0);
- ret = bt_private_component_class_source_set_accept_output_port_connection_method(
+ ret = bt_component_class_source_set_accept_output_port_connection_method(
src_comp_class, src_accept_output_port_connection);
BT_ASSERT(ret == 0);
- ret = bt_private_component_class_source_set_output_port_connected_method(
+ ret = bt_component_class_source_set_output_port_connected_method(
src_comp_class, src_output_port_connected);
BT_ASSERT(ret == 0);
- ret = bt_private_component_class_source_set_output_port_disconnected_method(
+ ret = bt_component_class_source_set_output_port_disconnected_method(
src_comp_class, src_output_port_disconnected);
BT_ASSERT(ret == 0);
- sink_comp_class = bt_private_component_class_sink_create("sink",
+ sink_comp_class = bt_component_class_sink_create("sink",
sink_consume);
BT_ASSERT(sink_comp_class);
- ret = bt_private_component_class_sink_set_init_method(sink_comp_class,
+ ret = bt_component_class_sink_set_init_method(sink_comp_class,
sink_init);
BT_ASSERT(ret == 0);
- ret = bt_private_component_class_sink_set_accept_input_port_connection_method(
+ ret = bt_component_class_sink_set_accept_input_port_connection_method(
sink_comp_class, sink_accept_input_port_connection);
BT_ASSERT(ret == 0);
- ret = bt_private_component_class_sink_set_input_port_connected_method(
+ ret = bt_component_class_sink_set_input_port_connected_method(
sink_comp_class, sink_input_port_connected);
BT_ASSERT(ret == 0);
- ret = bt_private_component_class_sink_set_input_port_disconnected_method(
+ ret = bt_component_class_sink_set_input_port_disconnected_method(
sink_comp_class, sink_input_port_disconnected);
BT_ASSERT(ret == 0);
events = g_array_new(FALSE, TRUE, sizeof(struct event));
}
static
-struct bt_component_source *create_src(struct bt_private_graph *graph)
+const struct bt_component_source *create_src(struct bt_graph *graph)
{
- struct bt_component_source *comp;
+ const struct bt_component_source *comp;
int ret;
- ret = bt_private_graph_add_source_component(graph,
- bt_private_component_class_source_as_component_class_source(
- src_comp_class),
+ ret = bt_graph_add_source_component(graph, src_comp_class,
"src-comp", NULL, &comp);
BT_ASSERT(ret == 0);
return comp;
}
static
-struct bt_component_sink *create_sink(struct bt_private_graph *graph)
+const struct bt_component_sink *create_sink(struct bt_graph *graph)
{
- struct bt_component_sink *comp;
+ const struct bt_component_sink *comp;
int ret;
- ret = bt_private_graph_add_sink_component(graph,
- bt_private_component_class_sink_as_component_class_sink(
- sink_comp_class),
+ ret = bt_graph_add_sink_component(graph, sink_comp_class,
"sink-comp", NULL, &comp);
BT_ASSERT(ret == 0);
return comp;
}
static
-struct bt_private_graph *create_graph(void)
+struct bt_graph *create_graph(void)
{
- struct bt_private_graph *graph = bt_private_graph_create();
+ struct bt_graph *graph = bt_graph_create();
int ret;
BT_ASSERT(graph);
- ret = bt_private_graph_add_source_component_output_port_added_listener(
+ ret = bt_graph_add_source_component_output_port_added_listener(
graph, graph_src_output_port_added, NULL, NULL, NULL);
BT_ASSERT(ret >= 0);
- ret = bt_private_graph_add_sink_component_input_port_added_listener(
+ ret = bt_graph_add_sink_component_input_port_added_listener(
graph, graph_sink_input_port_added, NULL, NULL, NULL);
BT_ASSERT(ret >= 0);
- ret = bt_private_graph_add_source_component_output_port_removed_listener(
+ ret = bt_graph_add_source_component_output_port_removed_listener(
graph, graph_src_output_port_removed, NULL, NULL, NULL);
BT_ASSERT(ret >= 0);
- ret = bt_private_graph_add_sink_component_input_port_removed_listener(
+ ret = bt_graph_add_sink_component_input_port_removed_listener(
graph, graph_sink_input_port_removed, NULL, NULL, NULL);
BT_ASSERT(ret >= 0);
- ret = bt_private_graph_add_source_sink_component_ports_connected_listener(
+ ret = bt_graph_add_source_sink_component_ports_connected_listener(
graph, graph_src_sink_ports_connected, NULL, NULL, NULL);
BT_ASSERT(ret >= 0);
- ret = bt_private_graph_add_source_sink_component_ports_disconnected_listener(
+ ret = bt_graph_add_source_sink_component_ports_disconnected_listener(
graph, graph_src_sink_ports_disconnected, NULL, NULL, NULL);
BT_ASSERT(ret >= 0);
return graph;
void test_sink_removes_port_in_consume_then_src_removes_disconnected_port(void)
{
int ret;
- struct bt_component_source *src;
- struct bt_component_sink *sink;
- struct bt_component *gsrc;
- struct bt_component *gsink;
- struct bt_private_graph *graph;
- struct bt_port_output *src_def_port;
- struct bt_port_input *sink_def_port;
- struct bt_port *gsrc_def_port;
- struct bt_port *gsink_def_port;
+ const struct bt_component_source *src;
+ const struct bt_component_sink *sink;
+ const struct bt_component *gsrc;
+ const struct bt_component *gsink;
+ struct bt_graph *graph;
+ const struct bt_port_output *src_def_port;
+ const struct bt_port_input *sink_def_port;
+ const struct bt_port *gsrc_def_port;
+ const struct bt_port *gsink_def_port;
struct event event;
enum bt_graph_status status;
size_t src_accept_port_connection_pos;
BT_ASSERT(graph);
src = create_src(graph);
sink = create_sink(graph);
- src_def_port = bt_component_source_borrow_output_port_by_name(src, "out");
+ src_def_port = bt_component_source_borrow_output_port_by_name_const(src,
+ "out");
BT_ASSERT(src_def_port);
- sink_def_port = bt_component_sink_borrow_input_port_by_name(sink, "in");
+ sink_def_port = bt_component_sink_borrow_input_port_by_name_const(sink,
+ "in");
BT_ASSERT(sink_def_port);
- status = bt_private_graph_connect_ports(graph, src_def_port,
+ status = bt_graph_connect_ports(graph, src_def_port,
sink_def_port, NULL);
BT_ASSERT(status == 0);
- gsrc = bt_component_source_as_component(src);
- gsink = bt_component_sink_as_component(sink);
- gsrc_def_port = bt_port_output_as_port(src_def_port);
- gsink_def_port = bt_port_input_as_port(sink_def_port);
+ gsrc = bt_component_source_as_component_const(src);
+ gsink = bt_component_sink_as_component_const(sink);
+ gsrc_def_port = bt_port_output_as_port_const(src_def_port);
+ gsink_def_port = bt_port_input_as_port_const(sink_def_port);
/* We're supposed to have 7 events so far */
ok(events->len == 7, "we have the expected number of events (before consume)");
/* Consume sink once */
clear_events();
- ret = bt_private_graph_consume(graph);
+ ret = bt_graph_consume(graph);
BT_ASSERT(ret == 0);
/* We're supposed to have 5 new events */
void test_sink_removes_port_in_consume(void)
{
int ret;
- struct bt_component_source *src;
- struct bt_component_sink *sink;
- struct bt_component *gsrc;
- struct bt_component *gsink;
- struct bt_private_graph *graph;
- struct bt_port_output *src_def_port;
- struct bt_port_input *sink_def_port;
- struct bt_port *gsrc_def_port;
- struct bt_port *gsink_def_port;
+ const struct bt_component_source *src;
+ const struct bt_component_sink *sink;
+ const struct bt_component *gsrc;
+ const struct bt_component *gsink;
+ struct bt_graph *graph;
+ const struct bt_port_output *src_def_port;
+ const struct bt_port_input *sink_def_port;
+ const struct bt_port *gsrc_def_port;
+ const struct bt_port *gsink_def_port;
struct event event;
enum bt_graph_status status;
size_t src_accept_port_connection_pos;
BT_ASSERT(graph);
src = create_src(graph);
sink = create_sink(graph);
- src_def_port = bt_component_source_borrow_output_port_by_name(src, "out");
+ src_def_port = bt_component_source_borrow_output_port_by_name_const(src,
+ "out");
BT_ASSERT(src_def_port);
- sink_def_port = bt_component_sink_borrow_input_port_by_name(sink, "in");
+ sink_def_port = bt_component_sink_borrow_input_port_by_name_const(sink,
+ "in");
BT_ASSERT(sink_def_port);
- status = bt_private_graph_connect_ports(graph, src_def_port,
+ status = bt_graph_connect_ports(graph, src_def_port,
sink_def_port, NULL);
BT_ASSERT(status == 0);
- gsrc = bt_component_source_as_component(src);
- gsink = bt_component_sink_as_component(sink);
- gsrc_def_port = bt_port_output_as_port(src_def_port);
- gsink_def_port = bt_port_input_as_port(sink_def_port);
+ gsrc = bt_component_source_as_component_const(src);
+ gsink = bt_component_sink_as_component_const(sink);
+ gsrc_def_port = bt_port_output_as_port_const(src_def_port);
+ gsink_def_port = bt_port_input_as_port_const(sink_def_port);
/* We're supposed to have 7 events so far */
ok(events->len == 7, "we have the expected number of events (before consume)");
/* Consume sink once */
clear_events();
- ret = bt_private_graph_consume(graph);
+ ret = bt_graph_consume(graph);
BT_ASSERT(ret == 0);
/* We're supposed to have 4 new events */
static
void test_src_adds_port_in_port_connected(void)
{
- struct bt_component_source *src;
- struct bt_component_sink *sink;
- struct bt_component *gsrc;
- struct bt_component *gsink;
- struct bt_private_graph *graph;
- struct bt_port_output *src_def_port;
- struct bt_port_output *src_hello_port;
- struct bt_port_input *sink_def_port;
- struct bt_port *gsrc_def_port;
- struct bt_port *gsrc_hello_port;
- struct bt_port *gsink_def_port;
+ const struct bt_component_source *src;
+ const struct bt_component_sink *sink;
+ const struct bt_component *gsrc;
+ const struct bt_component *gsink;
+ struct bt_graph *graph;
+ const struct bt_port_output *src_def_port;
+ const struct bt_port_output *src_hello_port;
+ const struct bt_port_input *sink_def_port;
+ const struct bt_port *gsrc_def_port;
+ const struct bt_port *gsrc_hello_port;
+ const struct bt_port *gsink_def_port;
struct event event;
enum bt_graph_status status;
size_t src_accept_port_connection_pos;
BT_ASSERT(graph);
src = create_src(graph);
sink = create_sink(graph);
- src_def_port = bt_component_source_borrow_output_port_by_name(src, "out");
+ src_def_port = bt_component_source_borrow_output_port_by_name_const(src,
+ "out");
BT_ASSERT(src_def_port);
- sink_def_port = bt_component_sink_borrow_input_port_by_name(sink, "in");
+ sink_def_port = bt_component_sink_borrow_input_port_by_name_const(sink,
+ "in");
BT_ASSERT(sink_def_port);
- status = bt_private_graph_connect_ports(graph, src_def_port,
+ status = bt_graph_connect_ports(graph, src_def_port,
sink_def_port, NULL);
BT_ASSERT(status == 0);
- src_hello_port = bt_component_source_borrow_output_port_by_name(src,
- "hello");
+ src_hello_port = bt_component_source_borrow_output_port_by_name_const(src,
+ "hello");
BT_ASSERT(src_hello_port);
- gsrc = bt_component_source_as_component(src);
- gsink = bt_component_sink_as_component(sink);
- gsrc_def_port = bt_port_output_as_port(src_def_port);
- gsrc_hello_port = bt_port_output_as_port(src_hello_port);
- gsink_def_port = bt_port_input_as_port(sink_def_port);
+ gsrc = bt_component_source_as_component_const(src);
+ gsink = bt_component_sink_as_component_const(sink);
+ gsrc_def_port = bt_port_output_as_port_const(src_def_port);
+ gsrc_hello_port = bt_port_output_as_port_const(src_hello_port);
+ gsink_def_port = bt_port_input_as_port_const(sink_def_port);
/* We're supposed to have 8 events */
ok(events->len == 8, "we have the expected number of events");
static
void test_simple(void)
{
- struct bt_component_source *src;
- struct bt_component_sink *sink;
- struct bt_component *gsrc;
- struct bt_component *gsink;
- struct bt_private_graph *graph;
- struct bt_port_output *src_def_port;
- struct bt_port_input *sink_def_port;
- struct bt_port *gsrc_def_port;
- struct bt_port *gsink_def_port;
+ const struct bt_component_source *src;
+ const struct bt_component_sink *sink;
+ const struct bt_component *gsrc;
+ const struct bt_component *gsink;
+ struct bt_graph *graph;
+ const struct bt_port_output *src_def_port;
+ const struct bt_port_input *sink_def_port;
+ const struct bt_port *gsrc_def_port;
+ const struct bt_port *gsink_def_port;
struct event event;
enum bt_graph_status status;
size_t src_accept_port_connection_pos;
BT_ASSERT(graph);
src = create_src(graph);
sink = create_sink(graph);
- src_def_port = bt_component_source_borrow_output_port_by_name(src, "out");
+ src_def_port = bt_component_source_borrow_output_port_by_name_const(src,
+ "out");
BT_ASSERT(src_def_port);
- sink_def_port = bt_component_sink_borrow_input_port_by_name(sink, "in");
+ sink_def_port = bt_component_sink_borrow_input_port_by_name_const(sink,
+ "in");
BT_ASSERT(sink_def_port);
- status = bt_private_graph_connect_ports(graph, src_def_port,
+ status = bt_graph_connect_ports(graph, src_def_port,
sink_def_port, NULL);
BT_ASSERT(status == 0);
- gsrc = bt_component_source_as_component(src);
- gsink = bt_component_sink_as_component(sink);
- gsrc_def_port = bt_port_output_as_port(src_def_port);
- gsink_def_port = bt_port_input_as_port(sink_def_port);
+ gsrc = bt_component_source_as_component_const(src);
+ gsink = bt_component_sink_as_component_const(sink);
+ gsrc_def_port = bt_port_output_as_port_const(src_def_port);
+ gsink_def_port = bt_port_input_as_port_const(sink_def_port);
/* We're supposed to have 7 events */
ok(events->len == 7, "we have the expected number of events");
static
void test_src_port_connected_error(void)
{
- struct bt_component_source *src;
- struct bt_component_sink *sink;
- struct bt_component *gsrc;
- struct bt_component *gsink;
- struct bt_private_graph *graph;
- struct bt_port_output *src_def_port;
- struct bt_port_input *sink_def_port;
- struct bt_port *gsrc_def_port;
- struct bt_port *gsink_def_port;
- struct bt_connection *conn = NULL;
+ const struct bt_component_source *src;
+ const struct bt_component_sink *sink;
+ const struct bt_component *gsrc;
+ const struct bt_component *gsink;
+ struct bt_graph *graph;
+ const struct bt_port_output *src_def_port;
+ const struct bt_port_input *sink_def_port;
+ const struct bt_port *gsrc_def_port;
+ const struct bt_port *gsink_def_port;
+ const struct bt_connection *conn = NULL;
struct event event;
enum bt_graph_status status;
size_t src_accept_port_connection_pos;
BT_ASSERT(graph);
src = create_src(graph);
sink = create_sink(graph);
- src_def_port = bt_component_source_borrow_output_port_by_name(src, "out");
+ src_def_port = bt_component_source_borrow_output_port_by_name_const(src,
+ "out");
BT_ASSERT(src_def_port);
- sink_def_port = bt_component_sink_borrow_input_port_by_name(sink, "in");
+ sink_def_port = bt_component_sink_borrow_input_port_by_name_const(sink,
+ "in");
BT_ASSERT(sink_def_port);
- status = bt_private_graph_connect_ports(graph, src_def_port,
+ status = bt_graph_connect_ports(graph, src_def_port,
sink_def_port, &conn);
ok(status != BT_GRAPH_STATUS_OK,
- "bt_private_graph_connect_ports() returns an error");
+ "bt_graph_connect_ports() returns an error");
ok(!conn, "returned connection is still NULL");
- gsrc = bt_component_source_as_component(src);
- gsink = bt_component_sink_as_component(sink);
- gsrc_def_port = bt_port_output_as_port(src_def_port);
- gsink_def_port = bt_port_input_as_port(sink_def_port);
+ gsrc = bt_component_source_as_component_const(src);
+ gsink = bt_component_sink_as_component_const(sink);
+ gsrc_def_port = bt_port_output_as_port_const(src_def_port);
+ gsink_def_port = bt_port_input_as_port_const(sink_def_port);
/* We're supposed to have 5 events */
ok(events->len == 5, "we have the expected number of events");
static
void test_sink_port_connected_error(void)
{
- struct bt_component_source *src;
- struct bt_component_sink *sink;
- struct bt_component *gsrc;
- struct bt_component *gsink;
- struct bt_private_graph *graph;
- struct bt_port_output *src_def_port;
- struct bt_port_input *sink_def_port;
- struct bt_port *gsrc_def_port;
- struct bt_port *gsink_def_port;
- struct bt_connection *conn = NULL;
+ const struct bt_component_source *src;
+ const struct bt_component_sink *sink;
+ const struct bt_component *gsrc;
+ const struct bt_component *gsink;
+ struct bt_graph *graph;
+ const struct bt_port_output *src_def_port;
+ const struct bt_port_input *sink_def_port;
+ const struct bt_port *gsrc_def_port;
+ const struct bt_port *gsink_def_port;
+ const struct bt_connection *conn = NULL;
struct event event;
enum bt_graph_status status;
size_t src_accept_port_connection_pos;
BT_ASSERT(graph);
src = create_src(graph);
sink = create_sink(graph);
- src_def_port = bt_component_source_borrow_output_port_by_name(src, "out");
+ src_def_port = bt_component_source_borrow_output_port_by_name_const(src,
+ "out");
BT_ASSERT(src_def_port);
- sink_def_port = bt_component_sink_borrow_input_port_by_name(sink, "in");
+ sink_def_port = bt_component_sink_borrow_input_port_by_name_const(sink,
+ "in");
BT_ASSERT(sink_def_port);
- status = bt_private_graph_connect_ports(graph, src_def_port,
+ status = bt_graph_connect_ports(graph, src_def_port,
sink_def_port, &conn);
ok(status != BT_GRAPH_STATUS_OK,
- "bt_private_graph_connect_ports() returns an error");
+ "bt_graph_connect_ports() returns an error");
ok(!conn, "returned connection is still NULL");
- gsrc = bt_component_source_as_component(src);
- gsink = bt_component_sink_as_component(sink);
- gsrc_def_port = bt_port_output_as_port(src_def_port);
- gsink_def_port = bt_port_input_as_port(sink_def_port);
+ gsrc = bt_component_source_as_component_const(src);
+ gsink = bt_component_sink_as_component_const(sink);
+ gsrc_def_port = bt_port_output_as_port_const(src_def_port);
+ gsink_def_port = bt_port_input_as_port_const(sink_def_port);
/* We're supposed to have 5 events */
ok(events->len == 7, "we have the expected number of events");
static
void test_empty_graph(void)
{
- struct bt_private_graph *graph;
+ struct bt_graph *graph;
prepare_test(TEST_EMPTY_GRAPH, "empty graph");
graph = create_graph();
projects / babeltrace.git / blobdiff