"destroy" method -> "finalize" method

[babeltrace.git] / tests / lib / test-plugin-plugins / sfs.c

diff --git a/tests/lib/test-plugin-plugins/sfs.c b/tests/lib/test-plugin-plugins/sfs.c
index f86b848b3a5adbc4a613692edc6d529f05572943..ba8dcba1a979785cb95b5224310e4f5793f55c8f 100644 (file)
--- a/tests/lib/test-plugin-plugins/sfs.c
+++ b/tests/lib/test-plugin-plugins/sfs.c
@@ -21,51 +21,53 @@
 #include <babeltrace/ref.h>
 #include <assert.h>
 
-static enum bt_component_status sink_consume(struct bt_component *component)
+static enum bt_component_status sink_consume(
+               struct bt_private_component *private_component)
 {
        return BT_COMPONENT_STATUS_OK;
 }
 
 static enum bt_notification_iterator_status dummy_iterator_init_method(
-               struct bt_component *component,
-               struct bt_notification_iterator *iterator,
-               void *init_method_data)
+               struct bt_private_component *private_component,
+               struct bt_private_port *private_port,
+               struct bt_private_notification_iterator *private_iterator)
 {
        return BT_NOTIFICATION_ITERATOR_STATUS_OK;
 }
 
-static void dummy_iterator_destroy_method(
-               struct bt_notification_iterator *iterator)
+static void dummy_iterator_finalize_method(
+               struct bt_private_notification_iterator *private_iterator)
 {
 }
 
 static struct bt_notification *dummy_iterator_get_method(
-               struct bt_notification_iterator *iterator)
+               struct bt_private_notification_iterator *private_iterator)
 {
        return NULL;
 }
 
 static enum bt_notification_iterator_status dummy_iterator_next_method(
-               struct bt_notification_iterator *iterator)
+               struct bt_private_notification_iterator *private_iterator)
 {
        return BT_NOTIFICATION_ITERATOR_STATUS_OK;
 }
 
 static enum bt_notification_iterator_status dummy_iterator_seek_time_method(
-               struct bt_notification_iterator *iterator, int64_t time)
+               struct bt_private_notification_iterator *private_iterator,
+               int64_t time)
 {
        return BT_NOTIFICATION_ITERATOR_STATUS_OK;
 }
 
-static struct bt_value *query_info_method(
+static struct bt_value *query_method(
                struct bt_component_class *component_class,
-               const char *action, struct bt_value *params)
+               const char *object, struct bt_value *params)
 {
        int ret;
        struct bt_value *results = bt_value_array_create();
 
        assert(results);
-       ret = bt_value_array_append_string(results, action);
+       ret = bt_value_array_append_string(results, object);
        assert(ret == 0);
        ret = bt_value_array_append(results, params);
        assert(ret == 0);
@@ -83,8 +85,8 @@ BT_PLUGIN_SOURCE_COMPONENT_CLASS(source, dummy_iterator_get_method,
 BT_PLUGIN_SOURCE_COMPONENT_CLASS_DESCRIPTION(source, "A source.");
 BT_PLUGIN_SOURCE_COMPONENT_CLASS_NOTIFICATION_ITERATOR_INIT_METHOD(source,
        dummy_iterator_init_method);
-BT_PLUGIN_SOURCE_COMPONENT_CLASS_NOTIFICATION_ITERATOR_DESTROY_METHOD(source,
-       dummy_iterator_destroy_method);
+BT_PLUGIN_SOURCE_COMPONENT_CLASS_NOTIFICATION_ITERATOR_FINALIZE_METHOD(source,
+       dummy_iterator_finalize_method);
 BT_PLUGIN_SOURCE_COMPONENT_CLASS_NOTIFICATION_ITERATOR_SEEK_TIME_METHOD(source,
        dummy_iterator_seek_time_method);
 
@@ -102,8 +104,8 @@ BT_PLUGIN_FILTER_COMPONENT_CLASS(filter, dummy_iterator_get_method,
 BT_PLUGIN_FILTER_COMPONENT_CLASS_DESCRIPTION(filter, "A filter.");
 BT_PLUGIN_FILTER_COMPONENT_CLASS_NOTIFICATION_ITERATOR_INIT_METHOD(filter,
        dummy_iterator_init_method);
-BT_PLUGIN_FILTER_COMPONENT_CLASS_NOTIFICATION_ITERATOR_DESTROY_METHOD(filter,
-       dummy_iterator_destroy_method);
+BT_PLUGIN_FILTER_COMPONENT_CLASS_NOTIFICATION_ITERATOR_FINALIZE_METHOD(filter,
+       dummy_iterator_finalize_method);
 BT_PLUGIN_FILTER_COMPONENT_CLASS_NOTIFICATION_ITERATOR_SEEK_TIME_METHOD(filter,
        dummy_iterator_seek_time_method);
-BT_PLUGIN_FILTER_COMPONENT_CLASS_QUERY_INFO_METHOD(filter, query_info_method);
+BT_PLUGIN_FILTER_COMPONENT_CLASS_QUERY_METHOD(filter, query_method);