X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=tests%2Flib%2Ftest-plugin-plugins%2Fsfs.c;h=2a05f0f1178f665f87d5cd4f234e08dd711986d4;hb=a3f0c7db90f4cfc81090a83a7442b7bc624d5789;hp=d746afae10356890c6c2f4f213db7f2b5f503ac2;hpb=3fadfbc0c91f82c46bd36e6e0657ea93570c9db1;p=babeltrace.git

diff --git a/tests/lib/test-plugin-plugins/sfs.c b/tests/lib/test-plugin-plugins/sfs.c
index d746afae..2a05f0f1 100644
--- a/tests/lib/test-plugin-plugins/sfs.c
+++ b/tests/lib/test-plugin-plugins/sfs.c
@@ -16,28 +16,32 @@
  */
 
 #include <babeltrace2/babeltrace.h>
-#include <babeltrace2/assert-internal.h>
+#include "common/assert.h"
 
-static bt_self_component_status sink_consume(
+static bt_component_class_sink_consume_method_status sink_consume(
 		bt_self_component_sink *self_comp)
 {
-	return BT_SELF_COMPONENT_STATUS_OK;
+	return BT_COMPONENT_CLASS_SINK_CONSUME_METHOD_STATUS_OK;
 }
 
-static bt_self_message_iterator_status src_dummy_iterator_init_method(
+static bt_message_iterator_class_initialize_method_status
+src_dummy_iterator_init_method(
 		bt_self_message_iterator *self_msg_iter,
-		bt_self_component_source *self_comp,
+		bt_self_message_iterator_configuration *config,
+		bt_self_component *self_comp,
 		bt_self_component_port_output *self_port)
 {
-	return BT_SELF_MESSAGE_ITERATOR_STATUS_OK;
+	return BT_MESSAGE_ITERATOR_CLASS_INITIALIZE_METHOD_STATUS_OK;
 }
 
-static bt_self_message_iterator_status flt_dummy_iterator_init_method(
+static bt_message_iterator_class_initialize_method_status
+flt_dummy_iterator_init_method(
 		bt_self_message_iterator *self_msg_iter,
-		bt_self_component_filter *self_comp,
+		bt_self_message_iterator_configuration *config,
+		bt_self_component *self_comp,
 		bt_self_component_port_output *self_port)
 {
-	return BT_SELF_MESSAGE_ITERATOR_STATUS_OK;
+	return BT_MESSAGE_ITERATOR_CLASS_INITIALIZE_METHOD_STATUS_OK;
 }
 
 static void dummy_iterator_finalize_method(
@@ -45,18 +49,20 @@ static void dummy_iterator_finalize_method(
 {
 }
 
-static bt_self_message_iterator_status dummy_iterator_next_method(
+static bt_message_iterator_class_next_method_status
+dummy_iterator_next_method(
 		bt_self_message_iterator *self_msg_iter,
 		bt_message_array_const msgs, uint64_t capacity,
 		uint64_t *count)
 {
-	return BT_SELF_MESSAGE_ITERATOR_STATUS_ERROR;
+	return BT_MESSAGE_ITERATOR_CLASS_NEXT_METHOD_STATUS_OK;
 }
 
-static bt_query_status flt_query_method(
+static bt_component_class_query_method_status flt_query_method(
 		bt_self_component_class_filter *component_class,
-		const bt_query_executor *query_exec,
+		bt_private_query_executor *priv_query_exec,
 		const char *object, const bt_value *params,
+		__attribute__((unused)) void *method_data,
 		const bt_value **result)
 {
 	bt_value *res = bt_value_array_create();
@@ -72,7 +78,7 @@ static bt_query_status flt_query_method(
 	iret = bt_value_array_append_element(res, val);
 	BT_ASSERT(iret == 0);
 	bt_value_put_ref(val);
-	return BT_QUERY_STATUS_OK;
+	return BT_COMPONENT_CLASS_QUERY_METHOD_STATUS_OK;
 }
 
 BT_PLUGIN_MODULE();
@@ -84,7 +90,7 @@ BT_PLUGIN_VERSION(1, 2, 3, "yes");
 
 BT_PLUGIN_SOURCE_COMPONENT_CLASS(source, dummy_iterator_next_method);
 BT_PLUGIN_SOURCE_COMPONENT_CLASS_DESCRIPTION(source, "A source.");
-BT_PLUGIN_SOURCE_COMPONENT_CLASS_MESSAGE_ITERATOR_INIT_METHOD(source,
+BT_PLUGIN_SOURCE_COMPONENT_CLASS_MESSAGE_ITERATOR_INITIALIZE_METHOD(source,
 	src_dummy_iterator_init_method);
 BT_PLUGIN_SOURCE_COMPONENT_CLASS_MESSAGE_ITERATOR_FINALIZE_METHOD(source,
 	dummy_iterator_finalize_method);
@@ -100,7 +106,7 @@ BT_PLUGIN_SINK_COMPONENT_CLASS_HELP(sink,
 
 BT_PLUGIN_FILTER_COMPONENT_CLASS(filter, dummy_iterator_next_method);
 BT_PLUGIN_FILTER_COMPONENT_CLASS_DESCRIPTION(filter, "A filter.");
-BT_PLUGIN_FILTER_COMPONENT_CLASS_MESSAGE_ITERATOR_INIT_METHOD(filter,
+BT_PLUGIN_FILTER_COMPONENT_CLASS_MESSAGE_ITERATOR_INITIALIZE_METHOD(filter,
 	flt_dummy_iterator_init_method);
 BT_PLUGIN_FILTER_COMPONENT_CLASS_MESSAGE_ITERATOR_FINALIZE_METHOD(filter,
 	dummy_iterator_finalize_method);