X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=tests%2Flib%2Ftest-plugin-plugins%2Fsfs.c;h=92ee2ca2419dfa17f9225de60b1be31a22bbb1fe;hb=da91b29ad2964b85601e25843f1dca92f6c97406;hp=943efbebf25b8f9f2ab47cf602bc521f7656b90e;hpb=6ba0b073d3cc5040234aad3ab820b7ca4022e3e9;p=babeltrace.git

diff --git a/tests/lib/test-plugin-plugins/sfs.c b/tests/lib/test-plugin-plugins/sfs.c
index 943efbeb..92ee2ca2 100644
--- a/tests/lib/test-plugin-plugins/sfs.c
+++ b/tests/lib/test-plugin-plugins/sfs.c
@@ -16,49 +16,86 @@
  */
 
 #include <babeltrace/plugin/plugin-dev.h>
-#include <babeltrace/component/component.h>
+#include <babeltrace/graph/component-class.h>
+#include <babeltrace/values.h>
+#include <babeltrace/private-values.h>
+#include <babeltrace/object.h>
+#include <babeltrace/assert-internal.h>
+#include <babeltrace/assert-internal.h>
 
-static int sink_value = 42;
-
-static enum bt_component_status sink_run(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_component_status comp_class_sink_init(
-		struct bt_component *component, struct bt_value *params)
+static enum bt_notification_iterator_status dummy_iterator_init_method(
+		struct bt_private_connection_private_notification_iterator *private_iterator,
+		struct bt_private_port *private_port)
 {
-	enum bt_component_status ret;
-
-	ret = bt_component_set_private_data(component, &sink_value);
-	if (ret != BT_COMPONENT_STATUS_OK) {
-		return BT_COMPONENT_STATUS_ERROR;
-	}
+	return BT_NOTIFICATION_ITERATOR_STATUS_OK;
+}
 
-	ret = bt_component_sink_set_consume_cb(component, sink_run);
-	if (ret != BT_COMPONENT_STATUS_OK) {
-		return BT_COMPONENT_STATUS_ERROR;
-	}
+static void dummy_iterator_finalize_method(
+		struct bt_private_connection_private_notification_iterator *private_iterator)
+{
+}
 
-	return BT_COMPONENT_STATUS_OK;
+static enum bt_notification_iterator_status dummy_iterator_next_method(
+		struct bt_private_connection_private_notification_iterator *private_iterator,
+		bt_notification_array notifs, uint64_t capacity,
+		uint64_t *count)
+{
+	return BT_NOTIFICATION_ITERATOR_STATUS_ERROR;
 }
 
-static enum bt_component_status comp_class_dummy_init(
-		struct bt_component *component, struct bt_value *params)
+static struct bt_component_class_query_method_return query_method(
+		struct bt_component_class *component_class,
+		struct bt_query_executor *query_exec,
+		const char *object, struct bt_value *params)
 {
-	return BT_COMPONENT_STATUS_OK;
+	struct bt_private_value *results = bt_private_value_array_create();
+	struct bt_component_class_query_method_return ret = {
+		.status = BT_QUERY_STATUS_OK,
+		.result = bt_value_borrow_from_private(results),
+	};
+	int iret;
+
+	BT_ASSERT(ret.result);
+	iret = bt_private_value_array_append_string_element(results, object);
+	BT_ASSERT(iret == 0);
+	iret = bt_private_value_array_append_element(results, params);
+	BT_ASSERT(iret == 0);
+	return ret;
 }
 
+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_COMPONENT_CLASS(BT_COMPONENT_TYPE_SOURCE, source, comp_class_dummy_init);
-BT_PLUGIN_COMPONENT_CLASS_DESCRIPTION(BT_COMPONENT_TYPE_SOURCE, source, "A source.");
+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_FINALIZE_METHOD(source,
+	dummy_iterator_finalize_method);
 
-BT_PLUGIN_COMPONENT_CLASS(BT_COMPONENT_TYPE_SINK, sink, comp_class_sink_init);
-BT_PLUGIN_COMPONENT_CLASS_DESCRIPTION(BT_COMPONENT_TYPE_SINK, sink, "A sink.");
+BT_PLUGIN_SINK_COMPONENT_CLASS(sink, sink_consume);
+BT_PLUGIN_SINK_COMPONENT_CLASS_DESCRIPTION(sink, "A sink.");
+BT_PLUGIN_SINK_COMPONENT_CLASS_HELP(sink,
+	"Bacon ipsum dolor amet strip steak cupim pastrami venison shoulder.\n"
+	"Prosciutto beef ribs flank meatloaf pancetta brisket kielbasa drumstick\n"
+	"venison tenderloin cow tail. Beef short loin shoulder meatball, sirloin\n"
+	"ground round brisket salami cupim pork bresaola turkey bacon boudin.\n"
+);
 
-BT_PLUGIN_COMPONENT_CLASS(BT_COMPONENT_TYPE_FILTER, filter, comp_class_dummy_init);
-BT_PLUGIN_COMPONENT_CLASS_DESCRIPTION(BT_COMPONENT_TYPE_FILTER, filter, "A filter.");
+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_FINALIZE_METHOD(filter,
+	dummy_iterator_finalize_method);
+BT_PLUGIN_FILTER_COMPONENT_CLASS_QUERY_METHOD(filter, query_method);