X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=tests%2Flib%2Ftest-plugin-plugins%2Fsfs.c;h=a425b7a763e030f1d9e4510abf86cea2eec9377f;hb=92c09281bbdf888b36746ef3af7d7a2a7f92ff68;hp=dbda1d7eb460574743ec2794e476e369dadd5de0;hpb=a889b89f1be9211d3de2d1e50a26c366e772f3b3;p=babeltrace.git

diff --git a/tests/lib/test-plugin-plugins/sfs.c b/tests/lib/test-plugin-plugins/sfs.c
index dbda1d7e..a425b7a7 100644
--- a/tests/lib/test-plugin-plugins/sfs.c
+++ b/tests/lib/test-plugin-plugins/sfs.c
@@ -15,60 +15,85 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include <babeltrace/plugin/plugin-dev.h>
-#include <babeltrace/component/component.h>
+#include <babeltrace2/babeltrace.h>
+#include "common/assert.h"
 
-static enum bt_component_status sink_consume(struct bt_component *component)
+static bt_component_class_sink_consume_method_status sink_consume(
+		bt_self_component_sink *self_comp)
 {
-	return BT_COMPONENT_STATUS_OK;
+	return BT_COMPONENT_CLASS_SINK_CONSUME_METHOD_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)
+static bt_message_iterator_class_initialize_method_status
+src_dummy_iterator_init_method(
+		bt_self_message_iterator *self_msg_iter,
+		bt_self_message_iterator_configuration *config,
+		bt_self_component *self_comp,
+		bt_self_component_port_output *self_port)
 {
-	return BT_NOTIFICATION_ITERATOR_STATUS_OK;
+	return BT_MESSAGE_ITERATOR_CLASS_INITIALIZE_METHOD_STATUS_OK;
 }
 
-static void dummy_iterator_destroy_method(
-		struct bt_notification_iterator *iterator)
+static bt_message_iterator_class_initialize_method_status
+flt_dummy_iterator_init_method(
+		bt_self_message_iterator *self_msg_iter,
+		bt_self_message_iterator_configuration *config,
+		bt_self_component *self_comp,
+		bt_self_component_port_output *self_port)
 {
+	return BT_MESSAGE_ITERATOR_CLASS_INITIALIZE_METHOD_STATUS_OK;
 }
 
-static struct bt_notification *dummy_iterator_get_method(
-		struct bt_notification_iterator *iterator)
+static void dummy_iterator_finalize_method(
+		bt_self_message_iterator *self_msg_iter)
 {
-	return NULL;
 }
 
-static enum bt_notification_iterator_status dummy_iterator_next_method(
-		struct bt_notification_iterator *iterator)
+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_NOTIFICATION_ITERATOR_STATUS_OK;
+	return BT_MESSAGE_ITERATOR_CLASS_NEXT_METHOD_STATUS_OK;
 }
 
-static enum bt_notification_iterator_status dummy_iterator_seek_time_method(
-		struct bt_notification_iterator *iterator, int64_t time)
+static bt_component_class_query_method_status flt_query_method(
+		bt_self_component_class_filter *component_class,
+		bt_private_query_executor *priv_query_exec,
+		const char *object, const bt_value *params,
+		__attribute__((unused)) void *method_data,
+		const bt_value **result)
 {
-	return BT_NOTIFICATION_ITERATOR_STATUS_OK;
+	bt_value *res = bt_value_array_create();
+	bt_value *val;
+	*result = res;
+	int iret;
+
+	BT_ASSERT(*result);
+	iret = bt_value_array_append_string_element(res, object);
+	BT_ASSERT(iret == 0);
+	iret = bt_value_copy(params, &val);
+	BT_ASSERT(iret == 0);
+	iret = bt_value_array_append_element(res, val);
+	BT_ASSERT(iret == 0);
+	bt_value_put_ref(val);
+	return BT_COMPONENT_CLASS_QUERY_METHOD_STATUS_OK;
 }
 
+BT_PLUGIN_MODULE();
 BT_PLUGIN(test_sfs);
 BT_PLUGIN_DESCRIPTION("Babeltrace plugin with source, sink, and filter component classes");
 BT_PLUGIN_AUTHOR("Janine Sutto");
 BT_PLUGIN_LICENSE("Beerware");
 BT_PLUGIN_VERSION(1, 2, 3, "yes");
 
-BT_PLUGIN_SOURCE_COMPONENT_CLASS(source, dummy_iterator_get_method,
-	dummy_iterator_next_method);
+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,
-	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_SEEK_TIME_METHOD(source,
-	dummy_iterator_seek_time_method);
+BT_PLUGIN_SOURCE_COMPONENT_CLASS_MESSAGE_ITERATOR_CLASS_INITIALIZE_METHOD(source,
+	src_dummy_iterator_init_method);
+BT_PLUGIN_SOURCE_COMPONENT_CLASS_MESSAGE_ITERATOR_CLASS_FINALIZE_METHOD(source,
+	dummy_iterator_finalize_method);
 
 BT_PLUGIN_SINK_COMPONENT_CLASS(sink, sink_consume);
 BT_PLUGIN_SINK_COMPONENT_CLASS_DESCRIPTION(sink, "A sink.");
@@ -79,12 +104,10 @@ BT_PLUGIN_SINK_COMPONENT_CLASS_HELP(sink,
 	"ground round brisket salami cupim pork bresaola turkey bacon boudin.\n"
 );
 
-BT_PLUGIN_FILTER_COMPONENT_CLASS(filter, dummy_iterator_get_method,
-	dummy_iterator_next_method);
+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,
-	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_SEEK_TIME_METHOD(filter,
-	dummy_iterator_seek_time_method);
+BT_PLUGIN_FILTER_COMPONENT_CLASS_MESSAGE_ITERATOR_CLASS_INITIALIZE_METHOD(filter,
+	flt_dummy_iterator_init_method);
+BT_PLUGIN_FILTER_COMPONENT_CLASS_MESSAGE_ITERATOR_CLASS_FINALIZE_METHOD(filter,
+	dummy_iterator_finalize_method);
+BT_PLUGIN_FILTER_COMPONENT_CLASS_QUERY_METHOD(filter, flt_query_method);