X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=tests%2Flib%2Ftest_graph_topo.c;h=185c6c2259c601c0e255acc1de4bb37009a0ca4b;hb=5c5632787fc9cafa602c89a28966bcfd01ec0204;hp=058da9e8ce6783e85abfa3bf58d1ce1c8ce81431;hpb=b9d103befd837c4411112257c2619ef8d68225dd;p=babeltrace.git diff --git a/tests/lib/test_graph_topo.c b/tests/lib/test_graph_topo.c index 058da9e8..185c6c22 100644 --- a/tests/lib/test_graph_topo.c +++ b/tests/lib/test_graph_topo.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include #include #include #include @@ -39,7 +40,7 @@ #include "tap/tap.h" -#define NR_TESTS 69 +#define NR_TESTS 77 enum event_type { COMP_ACCEPT_PORT_CONNECTION, @@ -245,7 +246,7 @@ bool compare_events(struct event *ev_a, struct event *ev_b) } break; default: - assert(false); + abort(); } return true; @@ -280,14 +281,14 @@ size_t event_pos(struct event *event) } } - return -1ULL; + return SIZE_MAX; } 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 ret = { + struct bt_notification_iterator_next_method_return ret = { .status = BT_NOTIFICATION_ITERATOR_STATUS_ERROR, }; @@ -303,14 +304,12 @@ enum bt_component_status accept_port_connection( struct event event = { .type = COMP_ACCEPT_PORT_CONNECTION, .data.comp_accept_port_connection = { - .comp = bt_component_from_private_component(private_component), - .self_port = bt_port_from_private_port(self_private_port), + .comp = bt_component_borrow_from_private(private_component), + .self_port = bt_port_borrow_from_private(self_private_port), .other_port = other_port, }, }; - bt_put(event.data.comp_accept_port_connection.comp); - bt_put(event.data.comp_accept_port_connection.self_port); append_event(&event); return BT_COMPONENT_STATUS_OK; } @@ -320,27 +319,24 @@ void src_port_connected(struct bt_private_component *private_component, struct bt_private_port *self_private_port, struct bt_port *other_port) { - struct bt_private_port *port; + int ret; struct event event = { .type = COMP_PORT_CONNECTED, .data.comp_port_connected = { - .comp = bt_component_from_private_component(private_component), - .self_port = bt_port_from_private_port(self_private_port), + .comp = bt_component_borrow_from_private(private_component), + .self_port = bt_port_borrow_from_private(self_private_port), .other_port = other_port, }, }; - bt_put(event.data.comp_port_connected.comp); - bt_put(event.data.comp_port_connected.self_port); append_event(&event); switch (current_test) { case TEST_SRC_ADDS_PORT_IN_PORT_CONNECTED: - port = bt_private_component_source_add_output_private_port( - private_component, "hello", NULL); - assert(port); - bt_put(port); + ret = bt_private_component_source_add_output_private_port( + private_component, "hello", NULL, NULL); + assert(ret == 0); break; default: break; @@ -355,13 +351,11 @@ void src_port_disconnected(struct bt_private_component *private_component, struct event event = { .type = COMP_PORT_DISCONNECTED, .data.comp_port_disconnected = { - .comp = bt_component_from_private_component(private_component), - .port = bt_port_from_private_port(private_port), + .comp = bt_component_borrow_from_private(private_component), + .port = bt_port_borrow_from_private(private_port), }, }; - bt_put(event.data.comp_port_disconnected.comp); - bt_put(event.data.comp_port_disconnected.port); append_event(&event); switch (current_test) { @@ -377,12 +371,11 @@ static enum bt_component_status src_init(struct bt_private_component *priv_comp, struct bt_value *params, void *init_method_data) { - void *priv_port; + int ret; - priv_port = bt_private_component_source_add_output_private_port( - priv_comp, "out", NULL); - assert(priv_port); - bt_put(priv_port); + ret = bt_private_component_source_add_output_private_port( + priv_comp, "out", NULL, NULL); + assert(ret == 0); return BT_COMPONENT_STATUS_OK; } @@ -418,14 +411,12 @@ void sink_port_connected(struct bt_private_component *private_component, struct event event = { .type = COMP_PORT_CONNECTED, .data.comp_port_connected = { - .comp = bt_component_from_private_component(private_component), - .self_port = bt_port_from_private_port(self_private_port), + .comp = bt_component_borrow_from_private(private_component), + .self_port = bt_port_borrow_from_private(self_private_port), .other_port = other_port, }, }; - bt_put(event.data.comp_port_connected.comp); - bt_put(event.data.comp_port_connected.self_port); append_event(&event); } @@ -436,13 +427,11 @@ void sink_port_disconnected(struct bt_private_component *private_component, struct event event = { .type = COMP_PORT_DISCONNECTED, .data.comp_port_disconnected = { - .comp = bt_component_from_private_component(private_component), - .port = bt_port_from_private_port(private_port), + .comp = bt_component_borrow_from_private(private_component), + .port = bt_port_borrow_from_private(private_port), }, }; - bt_put(event.data.comp_port_disconnected.comp); - bt_put(event.data.comp_port_disconnected.port); append_event(&event); } @@ -450,12 +439,11 @@ static enum bt_component_status sink_init(struct bt_private_component *priv_comp, struct bt_value *params, void *init_method_data) { - void *priv_port; + int ret; - priv_port = bt_private_component_sink_add_input_private_port(priv_comp, - "in", NULL); - assert(priv_port); - bt_put(priv_port); + ret = bt_private_component_sink_add_input_private_port(priv_comp, + "in", NULL, NULL); + assert(ret == 0); return BT_COMPONENT_STATUS_OK; } @@ -591,22 +579,26 @@ void fini_test(void) } static -struct bt_component *create_src(void) +struct bt_component *create_src(struct bt_graph *graph) { - struct bt_component *comp = - bt_component_create(src_comp_class, "src-comp", NULL); + struct bt_component *comp; + int ret; - assert(comp); + ret = bt_graph_add_component(graph, src_comp_class, "src-comp", NULL, + &comp); + assert(ret == 0); return comp; } static -struct bt_component *create_sink(void) +struct bt_component *create_sink(struct bt_graph *graph) { - struct bt_component *comp = - bt_component_create(sink_comp_class, "sink-comp", NULL); + struct bt_component *comp; + int ret; - assert(comp); + ret = bt_graph_add_component(graph, sink_comp_class, "sink-comp", + NULL, &comp); + assert(ret == 0); return comp; } @@ -617,17 +609,18 @@ struct bt_graph *create_graph(void) int ret; assert(graph); - ret = bt_graph_add_port_added_listener(graph, graph_port_added, NULL); - assert(ret == 0); - ret = bt_graph_add_port_removed_listener(graph, graph_port_removed, - NULL); - assert(ret == 0); - ret = bt_graph_add_ports_connected_listener(graph, graph_ports_connected, + ret = bt_graph_add_port_added_listener(graph, graph_port_added, NULL, NULL); - assert(ret == 0); + assert(ret >= 0); + ret = bt_graph_add_port_removed_listener(graph, graph_port_removed, + NULL, NULL); + assert(ret >= 0); + ret = bt_graph_add_ports_connected_listener(graph, + graph_ports_connected, NULL, NULL); + assert(ret >= 0); ret = bt_graph_add_ports_disconnected_listener(graph, - graph_ports_disconnected, NULL); - assert(ret == 0); + graph_ports_disconnected, NULL, NULL); + assert(ret >= 0); return graph; } @@ -650,6 +643,7 @@ void test_sink_removes_port_in_port_connected_then_src_removes_disconnected_port struct bt_port *sink_def_port; struct bt_connection *conn; struct event event; + enum bt_graph_status status; size_t src_accept_port_connection_pos; size_t sink_accept_port_connection_pos; size_t src_port_connected_pos; @@ -663,18 +657,33 @@ void test_sink_removes_port_in_port_connected_then_src_removes_disconnected_port prepare_test(TEST_SINK_REMOVES_PORT_IN_CONSUME_THEN_SRC_REMOVES_DISCONNECTED_PORT, "sink removes port in consume, then source removes disconnected port"); - src = create_src(); - sink = create_sink(); graph = create_graph(); + assert(graph); + src = create_src(graph); + sink = create_sink(graph); src_def_port = bt_component_source_get_output_port_by_name(src, "out"); assert(src_def_port); sink_def_port = bt_component_sink_get_input_port_by_name(sink, "in"); assert(sink_def_port); - conn = bt_graph_connect_ports(graph, src_def_port, sink_def_port); + status = bt_graph_connect_ports(graph, src_def_port, sink_def_port, + &conn); + assert(status == 0); assert(conn); - /* We're supposed to have 5 events so far */ - ok(events->len == 5, "we have the expected number of events (before consume)"); + /* We're supposed to have 7 events so far */ + ok(events->len == 7, "we have the expected number of events (before consume)"); + + /* Source's port added */ + event.type = GRAPH_PORT_ADDED; + event.data.graph_port_added.comp = src; + event.data.graph_port_added.port = src_def_port; + ok(has_event(&event), "got the expected graph's port added event (for source, initial)"); + + /* Sink's port added */ + event.type = GRAPH_PORT_ADDED; + event.data.graph_port_added.comp = sink; + event.data.graph_port_added.port = sink_def_port; + ok(has_event(&event), "got the expected graph's port added event (for sink, initial)"); /* Source's accept port connection */ event.type = COMP_ACCEPT_PORT_CONNECTION; @@ -812,6 +821,7 @@ void test_sink_removes_port_in_port_connected(void) struct bt_port *sink_def_port; struct bt_connection *conn; struct event event; + enum bt_graph_status status; size_t src_accept_port_connection_pos; size_t sink_accept_port_connection_pos; size_t src_port_connected_pos; @@ -824,18 +834,32 @@ void test_sink_removes_port_in_port_connected(void) prepare_test(TEST_SINK_REMOVES_PORT_IN_CONSUME, "sink removes port in consume"); - src = create_src(); - sink = create_sink(); graph = create_graph(); + assert(graph); + src = create_src(graph); + sink = create_sink(graph); src_def_port = bt_component_source_get_output_port_by_name(src, "out"); assert(src_def_port); sink_def_port = bt_component_sink_get_input_port_by_name(sink, "in"); assert(sink_def_port); - conn = bt_graph_connect_ports(graph, src_def_port, sink_def_port); - assert(conn); + status = bt_graph_connect_ports(graph, src_def_port, sink_def_port, + &conn); + assert(status == 0); + + /* We're supposed to have 7 events so far */ + ok(events->len == 7, "we have the expected number of events (before consume)"); + + /* Source's port added */ + event.type = GRAPH_PORT_ADDED; + event.data.graph_port_added.comp = src; + event.data.graph_port_added.port = src_def_port; + ok(has_event(&event), "got the expected graph's port added event (for source, initial)"); - /* We're supposed to have 5 events so far */ - ok(events->len == 5, "we have the expected number of events (before consume)"); + /* Sink's port added */ + event.type = GRAPH_PORT_ADDED; + event.data.graph_port_added.comp = sink; + event.data.graph_port_added.port = sink_def_port; + ok(has_event(&event), "got the expected graph's port added event (for sink, initial)"); /* Source's accept port connection */ event.type = COMP_ACCEPT_PORT_CONNECTION; @@ -958,6 +982,7 @@ void test_src_adds_port_in_port_connected(void) struct bt_port *src_hello_port; struct bt_connection *conn; struct event event; + enum bt_graph_status status; size_t src_accept_port_connection_pos; size_t sink_accept_port_connection_pos; size_t src_port_connected_pos; @@ -967,21 +992,35 @@ void test_src_adds_port_in_port_connected(void) prepare_test(TEST_SRC_ADDS_PORT_IN_PORT_CONNECTED, "source adds port in port connected"); - src = create_src(); - sink = create_sink(); graph = create_graph(); + assert(graph); + src = create_src(graph); + sink = create_sink(graph); src_def_port = bt_component_source_get_output_port_by_name(src, "out"); assert(src_def_port); sink_def_port = bt_component_sink_get_input_port_by_name(sink, "in"); assert(sink_def_port); - conn = bt_graph_connect_ports(graph, src_def_port, sink_def_port); - assert(conn); + status = bt_graph_connect_ports(graph, src_def_port, sink_def_port, + &conn); + assert(status == 0); src_hello_port = bt_component_source_get_output_port_by_name(src, "hello"); assert(src_hello_port); - /* We're supposed to have 6 events */ - ok(events->len == 6, "we have the expected number of events"); + /* We're supposed to have 8 events */ + ok(events->len == 8, "we have the expected number of events"); + + /* Source's port added */ + event.type = GRAPH_PORT_ADDED; + event.data.graph_port_added.comp = src; + event.data.graph_port_added.port = src_def_port; + ok(has_event(&event), "got the expected graph's port added event (for source, initial)"); + + /* Sink's port added */ + event.type = GRAPH_PORT_ADDED; + event.data.graph_port_added.comp = sink; + event.data.graph_port_added.port = sink_def_port; + ok(has_event(&event), "got the expected graph's port added event (for sink, initial)"); /* Source's accept port connection */ event.type = COMP_ACCEPT_PORT_CONNECTION; @@ -1065,6 +1104,7 @@ void test_simple(void) struct bt_port *sink_def_port; struct bt_connection *conn; struct event event; + enum bt_graph_status status; size_t src_accept_port_connection_pos; size_t sink_accept_port_connection_pos; size_t src_port_connected_pos; @@ -1072,18 +1112,32 @@ void test_simple(void) size_t graph_ports_connected_pos; prepare_test(TEST_SIMPLE, "simple"); - src = create_src(); - sink = create_sink(); graph = create_graph(); + assert(graph); + src = create_src(graph); + sink = create_sink(graph); src_def_port = bt_component_source_get_output_port_by_name(src, "out"); assert(src_def_port); sink_def_port = bt_component_sink_get_input_port_by_name(sink, "in"); assert(sink_def_port); - conn = bt_graph_connect_ports(graph, src_def_port, sink_def_port); - assert(conn); + status = bt_graph_connect_ports(graph, src_def_port, sink_def_port, + &conn); + assert(status == 0); - /* We're supposed to have 5 events */ - ok(events->len == 5, "we have the expected number of events"); + /* We're supposed to have 7 events */ + ok(events->len == 7, "we have the expected number of events"); + + /* Source's port added */ + event.type = GRAPH_PORT_ADDED; + event.data.graph_port_added.comp = src; + event.data.graph_port_added.port = src_def_port; + ok(has_event(&event), "got the expected graph's port added event (for source, initial)"); + + /* Sink's port added */ + event.type = GRAPH_PORT_ADDED; + event.data.graph_port_added.comp = sink; + event.data.graph_port_added.port = sink_def_port; + ok(has_event(&event), "got the expected graph's port added event (for sink, initial)"); /* Source's accept port connection */ event.type = COMP_ACCEPT_PORT_CONNECTION;