#include <stdio.h>
#include <stdlib.h>
#include <stdint.h>
+#include <stdbool.h>
#include <inttypes.h>
#include <string.h>
#include <assert.h>
#include <babeltrace/graph/notification-packet.h>
#include <babeltrace/graph/port.h>
#include <babeltrace/graph/private-component-source.h>
+#include <babeltrace/graph/private-component-sink.h>
#include <babeltrace/graph/private-component.h>
#include <babeltrace/graph/private-connection.h>
#include <babeltrace/graph/private-notification-iterator.h>
user_data->packet = src_packet3;
break;
default:
- assert(false);
+ abort();
}
switch (current_test) {
}
break;
default:
- assert(false);
+ abort();
}
return BT_NOTIFICATION_ITERATOR_STATUS_OK;
(uint64_t) ts_ns);
assert(clock_value);
ret = bt_ctf_event_set_clock_value(event, clock_value);
+ assert(ret == 0);
bt_put(clock_value);
}
struct bt_notification_iterator_next_return src_iter_next(
struct bt_private_notification_iterator *priv_iterator)
{
- struct bt_notification_iterator_next_return next_return = {
- .status = BT_NOTIFICATION_ITERATOR_STATUS_OK,
- .notification = NULL,
- };
+ struct bt_notification_iterator_next_return next_return;
struct src_iter_user_data *user_data =
bt_private_notification_iterator_get_user_data(priv_iterator);
struct bt_private_component *private_component =
}
break;
default:
- assert(false);
+ abort();
}
bt_put(private_component);
struct bt_value *params, void *init_method_data)
{
struct bt_private_port *priv_port;
- int ret;
size_t nb_ports;
- priv_port = bt_private_component_source_get_default_output_private_port(
- private_component);
- if (priv_port) {
- ret = bt_private_port_remove_from_component(priv_port);
- assert(ret == 0);
- bt_put(priv_port);
- }
-
switch (current_test) {
case TEST_NO_TS:
nb_ports = 2;
assert(user_data);
assert(priv_conn);
user_data->notif_iter =
- bt_private_connection_create_notification_iterator(priv_conn);
+ bt_private_connection_create_notification_iterator(priv_conn,
+ NULL);
assert(user_data->notif_iter);
bt_put(priv_conn);
}
{
struct sink_user_data *user_data = g_new0(struct sink_user_data, 1);
int ret;
+ void *priv_port;
assert(user_data);
ret = bt_private_component_set_user_data(private_component,
user_data);
assert(ret == 0);
+ priv_port = bt_private_component_sink_add_input_private_port(
+ private_component, "in", NULL);
+ assert(priv_port);
+ bt_put(priv_port);
return BT_COMPONENT_STATUS_OK;
}
upstream_port = bt_component_filter_get_output_port_by_name(muxer_comp,
"out");
assert(upstream_port);
- downstream_port = bt_component_sink_get_default_input_port(sink_comp);
+ downstream_port = bt_component_sink_get_input_port_by_name(sink_comp, "in");
assert(downstream_port);
conn = bt_graph_connect_ports(graph, upstream_port, downstream_port);
assert(conn);
ret = bt_graph_add_port_added_listener(graph,
graph_port_added_listener_connect_to_avail_muxer_port,
&graph_listener_data);
- assert(ret == 0);
+ assert(ret >= 0);
/* Connect source output ports to muxer input ports */
count = bt_component_source_get_output_port_count(src_comp);
upstream_port = bt_component_filter_get_output_port_by_name(muxer_comp,
"out");
assert(upstream_port);
- downstream_port = bt_component_sink_get_default_input_port(sink_comp);
+ downstream_port = bt_component_sink_get_input_port_by_name(sink_comp, "in");
assert(downstream_port);
conn = bt_graph_connect_ports(graph, upstream_port, downstream_port);
assert(conn);
ret = bt_graph_add_port_added_listener(graph,
graph_port_added_listener_connect_to_avail_muxer_port,
&graph_listener_data);
- assert(ret == 0);
+ assert(ret >= 0);
/* Connect source output ports to muxer input ports */
count = bt_component_source_get_output_port_count(src_comp);
upstream_port = bt_component_filter_get_output_port_by_name(muxer_comp,
"out");
assert(upstream_port);
- downstream_port = bt_component_sink_get_default_input_port(sink_comp);
+ downstream_port = bt_component_sink_get_input_port_by_name(sink_comp, "in");
assert(downstream_port);
conn = bt_graph_connect_ports(graph, upstream_port, downstream_port);
assert(conn);