X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;ds=sidebyside;f=tests%2Flib%2Ftest-plugin-plugins%2Fsfs.c;h=6e0e0a4b0ba1b65433db6bab93977ffe708e0b85;hb=d24d56638469189904fb6ddbb3c725817b3e9417;hp=beac97258a09d538aaf16532805d0b4ad112606c;hpb=c5b9b4417bedfbec9b5dd23b8395ccdd4eeffc44;p=babeltrace.git

diff --git a/tests/lib/test-plugin-plugins/sfs.c b/tests/lib/test-plugin-plugins/sfs.c
index beac9725..6e0e0a4b 100644
--- a/tests/lib/test-plugin-plugins/sfs.c
+++ b/tests/lib/test-plugin-plugins/sfs.c
@@ -15,52 +15,56 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include <babeltrace/babeltrace.h>
-#include <babeltrace/assert-internal.h>
+#include <babeltrace2/babeltrace.h>
+#include "common/assert.h"
 
-static enum bt_self_component_status sink_consume(
-		struct bt_self_component_sink *self_comp)
+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 enum bt_self_notification_iterator_status src_dummy_iterator_init_method(
-		struct bt_self_notification_iterator *self_notif_iter,
-		struct bt_self_component_source *self_comp,
-		struct bt_self_component_port_output *self_port)
+static bt_component_class_message_iterator_init_method_status
+src_dummy_iterator_init_method(
+		bt_self_message_iterator *self_msg_iter,
+		bt_self_component_source *self_comp,
+		bt_self_component_port_output *self_port)
 {
-	return BT_SELF_NOTIFICATION_ITERATOR_STATUS_OK;
+	return BT_COMPONENT_CLASS_MESSAGE_ITERATOR_INIT_METHOD_STATUS_OK;
 }
 
-static enum bt_self_notification_iterator_status flt_dummy_iterator_init_method(
-		struct bt_self_notification_iterator *self_notif_iter,
-		struct bt_self_component_filter *self_comp,
-		struct bt_self_component_port_output *self_port)
+static bt_component_class_message_iterator_init_method_status
+flt_dummy_iterator_init_method(
+		bt_self_message_iterator *self_msg_iter,
+		bt_self_component_filter *self_comp,
+		bt_self_component_port_output *self_port)
 {
-	return BT_SELF_NOTIFICATION_ITERATOR_STATUS_OK;
+	return BT_COMPONENT_CLASS_MESSAGE_ITERATOR_INIT_METHOD_STATUS_OK;
 }
 
 static void dummy_iterator_finalize_method(
-		struct bt_self_notification_iterator *self_notif_iter)
+		bt_self_message_iterator *self_msg_iter)
 {
 }
 
-static enum bt_self_notification_iterator_status dummy_iterator_next_method(
-		struct bt_self_notification_iterator *self_notif_iter,
-		bt_notification_array_const notifs, uint64_t capacity,
+static bt_component_class_message_iterator_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_NOTIFICATION_ITERATOR_STATUS_ERROR;
+	return BT_COMPONENT_CLASS_MESSAGE_ITERATOR_NEXT_METHOD_STATUS_OK;
 }
 
-static enum bt_query_status flt_query_method(
-		struct bt_self_component_class_filter *component_class,
-		const struct bt_query_executor *query_exec,
-		const char *object, const struct bt_value *params,
-		const struct bt_value **result)
+static bt_component_class_query_method_status flt_query_method(
+		bt_self_component_class_filter *component_class,
+		const bt_query_executor *query_exec,
+		const char *object, const bt_value *params,
+		__attribute__((unused)) bt_logging_level log_level,
+		const bt_value **result)
 {
-	struct bt_value *res = bt_value_array_create();
-	struct bt_value *val;
+	bt_value *res = bt_value_array_create();
+	bt_value *val;
 	*result = res;
 	int iret;
 
@@ -72,7 +76,7 @@ static enum 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,9 +88,9 @@ 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_NOTIFICATION_ITERATOR_INIT_METHOD(source,
+BT_PLUGIN_SOURCE_COMPONENT_CLASS_MESSAGE_ITERATOR_INIT_METHOD(source,
 	src_dummy_iterator_init_method);
-BT_PLUGIN_SOURCE_COMPONENT_CLASS_NOTIFICATION_ITERATOR_FINALIZE_METHOD(source,
+BT_PLUGIN_SOURCE_COMPONENT_CLASS_MESSAGE_ITERATOR_FINALIZE_METHOD(source,
 	dummy_iterator_finalize_method);
 
 BT_PLUGIN_SINK_COMPONENT_CLASS(sink, sink_consume);
@@ -100,8 +104,8 @@ 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_NOTIFICATION_ITERATOR_INIT_METHOD(filter,
+BT_PLUGIN_FILTER_COMPONENT_CLASS_MESSAGE_ITERATOR_INIT_METHOD(filter,
 	flt_dummy_iterator_init_method);
-BT_PLUGIN_FILTER_COMPONENT_CLASS_NOTIFICATION_ITERATOR_FINALIZE_METHOD(filter,
+BT_PLUGIN_FILTER_COMPONENT_CLASS_MESSAGE_ITERATOR_FINALIZE_METHOD(filter,
 	dummy_iterator_finalize_method);
 BT_PLUGIN_FILTER_COMPONENT_CLASS_QUERY_METHOD(filter, flt_query_method);