#define NR_TESTS 37
-struct user {
+struct bt_user {
bt_trace_class *tc;
bt_stream_class *sc;
bt_event_class *ec;
bt_stream_class *weak_sc1 = NULL, *weak_sc2 = NULL;
bt_event_class *weak_ec1 = NULL, *weak_ec2 = NULL,
*weak_ec3 = NULL;
- struct user user_a = { 0 }, user_b = { 0 }, user_c = { 0 };
+ struct bt_user user_a = { 0 }, user_b = { 0 }, user_c = { 0 };
/* The only reference which exists at this point is on TC1. */
tc1 = create_tc1(self_comp);
}
static
-bt_component_class_init_method_status src_init(
+bt_component_class_initialize_method_status src_init(
bt_self_component_source *self_comp,
bt_self_component_source_configuration *config,
const bt_value *params, void *init_method_data)
{
test_example_scenario(self_comp);
- return BT_COMPONENT_CLASS_INIT_METHOD_STATUS_OK;
+ return BT_COMPONENT_CLASS_INITIALIZE_METHOD_STATUS_OK;
}
static
-bt_component_class_message_iterator_next_method_status src_iter_next(
+bt_message_iterator_class_next_method_status src_iter_next(
bt_self_message_iterator *self_iterator,
bt_message_array_const msgs, uint64_t capacity,
uint64_t *count)
{
- return BT_COMPONENT_CLASS_MESSAGE_ITERATOR_NEXT_METHOD_STATUS_ERROR;
+ return BT_MESSAGE_ITERATOR_CLASS_NEXT_METHOD_STATUS_ERROR;
}
static void test_example_scenario_in_graph(void)
{
+ bt_message_iterator_class *msg_iter_cls;
bt_component_class_source *comp_cls;
bt_graph *graph;
int ret;
- comp_cls = bt_component_class_source_create("src", src_iter_next);
+ msg_iter_cls = bt_message_iterator_class_create(src_iter_next);
+ BT_ASSERT(msg_iter_cls);
+
+ comp_cls = bt_component_class_source_create("src", msg_iter_cls);
BT_ASSERT(comp_cls);
- ret = bt_component_class_source_set_init_method(comp_cls, src_init);
+ ret = bt_component_class_source_set_initialize_method(comp_cls, src_init);
BT_ASSERT(ret == 0);
graph = bt_graph_create(0);
ret = bt_graph_add_source_component(graph, comp_cls, "src-comp",
BT_ASSERT(ret == 0);
bt_graph_put_ref(graph);
bt_component_class_source_put_ref(comp_cls);
+ bt_message_iterator_class_put_ref(msg_iter_cls);
}
static void create_writer_user_full(struct writer_user *user)