#include <stdlib.h>
#include <string.h>
#include <stdbool.h>
-#include <assert.h>
+#include <babeltrace/assert-internal.h>
#include <glib.h>
#include "tap/tap.h"
}
static
-struct bt_notification_iterator_next_method_return src_iter_next(
- struct bt_private_connection_private_notification_iterator *priv_iterator)
+enum bt_notification_iterator_status src_iter_next(
+ struct bt_private_connection_private_notification_iterator *priv_iterator,
+ bt_notification_array notifs, uint64_t capacity,
+ uint64_t *count)
{
- struct bt_notification_iterator_next_method_return ret = {
- .status = BT_NOTIFICATION_ITERATOR_STATUS_ERROR,
- };
-
- return ret;
+ return BT_NOTIFICATION_ITERATOR_STATUS_ERROR;
}
static
struct event event = {
.type = COMP_ACCEPT_PORT_CONNECTION,
.data.comp_accept_port_connection = {
- .comp = bt_component_from_private(private_component),
- .self_port = bt_port_from_private(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;
}
struct event event = {
.type = COMP_PORT_CONNECTED,
.data.comp_port_connected = {
- .comp = bt_component_from_private(private_component),
- .self_port = bt_port_from_private(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:
ret = bt_private_component_source_add_output_private_port(
private_component, "hello", NULL, NULL);
- assert(ret == 0);
+ BT_ASSERT(ret == 0);
break;
default:
break;
struct event event = {
.type = COMP_PORT_DISCONNECTED,
.data.comp_port_disconnected = {
- .comp = bt_component_from_private(private_component),
- .port = bt_port_from_private(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) {
case TEST_SINK_REMOVES_PORT_IN_CONSUME_THEN_SRC_REMOVES_DISCONNECTED_PORT:
ret = bt_private_port_remove_from_component(private_port);
- assert(ret == 0);
+ BT_ASSERT(ret == 0);
default:
break;
}
ret = bt_private_component_source_add_output_private_port(
priv_comp, "out", NULL, NULL);
- assert(ret == 0);
+ BT_ASSERT(ret == 0);
return BT_COMPONENT_STATUS_OK;
}
case TEST_SINK_REMOVES_PORT_IN_CONSUME_THEN_SRC_REMOVES_DISCONNECTED_PORT:
def_port = bt_private_component_sink_get_input_private_port_by_name(
priv_component, "in");
- assert(def_port);
+ BT_ASSERT(def_port);
ret = bt_private_port_remove_from_component(def_port);
- assert(ret == 0);
+ BT_ASSERT(ret == 0);
bt_put(def_port);
break;
default:
struct event event = {
.type = COMP_PORT_CONNECTED,
.data.comp_port_connected = {
- .comp = bt_component_from_private(private_component),
- .self_port = bt_port_from_private(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);
}
struct event event = {
.type = COMP_PORT_DISCONNECTED,
.data.comp_port_disconnected = {
- .comp = bt_component_from_private(private_component),
- .port = bt_port_from_private(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);
}
ret = bt_private_component_sink_add_input_private_port(priv_comp,
"in", NULL, NULL);
- assert(ret == 0);
+ BT_ASSERT(ret == 0);
return BT_COMPONENT_STATUS_OK;
}
{
struct bt_component *comp = bt_port_get_component(port);
- assert(comp);
+ BT_ASSERT(comp);
bt_put(comp);
struct event event = {
bt_port_get_component(downstream_port);
struct bt_connection *conn = bt_port_get_connection(upstream_port);
- assert(upstream_comp);
- assert(downstream_comp);
- assert(conn);
+ BT_ASSERT(upstream_comp);
+ BT_ASSERT(downstream_comp);
+ BT_ASSERT(conn);
bt_put(upstream_comp);
bt_put(downstream_comp);
bt_put(conn);
int ret;
src_comp_class = bt_component_class_source_create("src", src_iter_next);
- assert(src_comp_class);
+ BT_ASSERT(src_comp_class);
ret = bt_component_class_set_init_method(src_comp_class, src_init);
- assert(ret == 0);
+ BT_ASSERT(ret == 0);
ret = bt_component_class_set_accept_port_connection_method(
src_comp_class, accept_port_connection);
- assert(ret == 0);
+ BT_ASSERT(ret == 0);
ret = bt_component_class_set_port_connected_method(src_comp_class,
src_port_connected);
- assert(ret == 0);
+ BT_ASSERT(ret == 0);
ret = bt_component_class_set_port_disconnected_method(
src_comp_class, src_port_disconnected);
- assert(ret == 0);
+ BT_ASSERT(ret == 0);
sink_comp_class = bt_component_class_sink_create("sink", sink_consume);
- assert(sink_comp_class);
+ BT_ASSERT(sink_comp_class);
ret = bt_component_class_set_init_method(sink_comp_class, sink_init);
- assert(ret == 0);
+ BT_ASSERT(ret == 0);
ret = bt_component_class_set_accept_port_connection_method(
sink_comp_class, accept_port_connection);
- assert(ret == 0);
+ BT_ASSERT(ret == 0);
ret = bt_component_class_set_port_connected_method(sink_comp_class,
sink_port_connected);
- assert(ret == 0);
+ BT_ASSERT(ret == 0);
ret = bt_component_class_set_port_disconnected_method(sink_comp_class,
sink_port_disconnected);
- assert(ret == 0);
+ BT_ASSERT(ret == 0);
bt_component_class_freeze(src_comp_class);
bt_component_class_freeze(sink_comp_class);
events = g_array_new(FALSE, TRUE, sizeof(struct event));
- assert(events);
+ BT_ASSERT(events);
}
static
ret = bt_graph_add_component(graph, src_comp_class, "src-comp", NULL,
&comp);
- assert(ret == 0);
+ BT_ASSERT(ret == 0);
return comp;
}
ret = bt_graph_add_component(graph, sink_comp_class, "sink-comp",
NULL, &comp);
- assert(ret == 0);
+ BT_ASSERT(ret == 0);
return comp;
}
struct bt_graph *graph = bt_graph_create();
int ret;
- assert(graph);
+ BT_ASSERT(graph);
ret = bt_graph_add_port_added_listener(graph, graph_port_added, NULL,
NULL);
- assert(ret >= 0);
+ BT_ASSERT(ret >= 0);
ret = bt_graph_add_port_removed_listener(graph, graph_port_removed,
NULL, NULL);
- assert(ret >= 0);
+ BT_ASSERT(ret >= 0);
ret = bt_graph_add_ports_connected_listener(graph,
graph_ports_connected, NULL, NULL);
- assert(ret >= 0);
+ BT_ASSERT(ret >= 0);
ret = bt_graph_add_ports_disconnected_listener(graph,
graph_ports_disconnected, NULL, NULL);
- assert(ret >= 0);
+ BT_ASSERT(ret >= 0);
return graph;
}
prepare_test(TEST_SINK_REMOVES_PORT_IN_CONSUME_THEN_SRC_REMOVES_DISCONNECTED_PORT,
"sink removes port in consume, then source removes disconnected port");
graph = create_graph();
- assert(graph);
+ BT_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);
+ BT_ASSERT(src_def_port);
sink_def_port = bt_component_sink_get_input_port_by_name(sink, "in");
- assert(sink_def_port);
+ BT_ASSERT(sink_def_port);
status = bt_graph_connect_ports(graph, src_def_port, sink_def_port,
&conn);
- assert(status == 0);
- assert(conn);
+ BT_ASSERT(status == 0);
+ BT_ASSERT(conn);
/* 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_graph_consume(graph);
- assert(ret == 0);
+ BT_ASSERT(ret == 0);
/* We're supposed to have 5 new events */
ok(events->len == 5, "we have the expected number of events (after consume)");
prepare_test(TEST_SINK_REMOVES_PORT_IN_CONSUME,
"sink removes port in consume");
graph = create_graph();
- assert(graph);
+ BT_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);
+ BT_ASSERT(src_def_port);
sink_def_port = bt_component_sink_get_input_port_by_name(sink, "in");
- assert(sink_def_port);
+ BT_ASSERT(sink_def_port);
status = bt_graph_connect_ports(graph, src_def_port, sink_def_port,
&conn);
- assert(status == 0);
+ BT_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)");
/* Consume sink once */
clear_events();
ret = bt_graph_consume(graph);
- assert(ret == 0);
+ BT_ASSERT(ret == 0);
/* We're supposed to have 4 new events */
ok(events->len == 4, "we have the expected number of events (after consume)");
prepare_test(TEST_SRC_ADDS_PORT_IN_PORT_CONNECTED,
"source adds port in port connected");
graph = create_graph();
- assert(graph);
+ BT_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);
+ BT_ASSERT(src_def_port);
sink_def_port = bt_component_sink_get_input_port_by_name(sink, "in");
- assert(sink_def_port);
+ BT_ASSERT(sink_def_port);
status = bt_graph_connect_ports(graph, src_def_port, sink_def_port,
&conn);
- assert(status == 0);
+ BT_ASSERT(status == 0);
src_hello_port = bt_component_source_get_output_port_by_name(src,
"hello");
- assert(src_hello_port);
+ BT_ASSERT(src_hello_port);
/* We're supposed to have 8 events */
ok(events->len == 8, "we have the expected number of events");
prepare_test(TEST_SIMPLE, "simple");
graph = create_graph();
- assert(graph);
+ BT_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);
+ BT_ASSERT(src_def_port);
sink_def_port = bt_component_sink_get_input_port_by_name(sink, "in");
- assert(sink_def_port);
+ BT_ASSERT(sink_def_port);
status = bt_graph_connect_ports(graph, src_def_port, sink_def_port,
&conn);
- assert(status == 0);
+ BT_ASSERT(status == 0);
/* We're supposed to have 7 events */
ok(events->len == 7, "we have the expected number of events");