X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=tests%2Flib%2Ftest-plugin-plugins%2Fsfs.c;h=229d0ede1e1dc622fb327cbd6cd1228fd273119f;hb=8d8b141db4c46135a35be19e4a1c192f6a36d67b;hp=3928be23179ac8baaaf0cf3a050fd095c7ebe4aa;hpb=cbb9e0b1ec169269733bcd689294b1fd8be59a2c;p=babeltrace.git

diff --git a/tests/lib/test-plugin-plugins/sfs.c b/tests/lib/test-plugin-plugins/sfs.c
index 3928be23..229d0ede 100644
--- a/tests/lib/test-plugin-plugins/sfs.c
+++ b/tests/lib/test-plugin-plugins/sfs.c
@@ -15,47 +15,99 @@
  * 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 int sink_value = 42;
-
-static enum bt_component_status sink_run(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_component_status comp_class_sink_init(
-		struct bt_component *component, struct bt_value *params)
+static bt_component_class_message_iterator_init_method_status
+src_dummy_iterator_init_method(
+		bt_self_message_iterator *self_msg_iter,
+		bt_self_message_iterator_configuration *config,
+		bt_self_component_source *self_comp,
+		bt_self_component_port_output *self_port)
 {
-	enum bt_component_status ret;
+	return BT_COMPONENT_CLASS_MESSAGE_ITERATOR_INIT_METHOD_STATUS_OK;
+}
 
-	ret = bt_component_set_private_data(component, &sink_value);
-	if (ret != BT_COMPONENT_STATUS_OK) {
-		return BT_COMPONENT_STATUS_ERROR;
-	}
+static bt_component_class_message_iterator_init_method_status
+flt_dummy_iterator_init_method(
+		bt_self_message_iterator *self_msg_iter,
+		bt_self_message_iterator_configuration *config,
+		bt_self_component_filter *self_comp,
+		bt_self_component_port_output *self_port)
+{
+	return BT_COMPONENT_CLASS_MESSAGE_ITERATOR_INIT_METHOD_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(
+		bt_self_message_iterator *self_msg_iter)
+{
+}
 
-	return BT_COMPONENT_STATUS_OK;
+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_COMPONENT_CLASS_MESSAGE_ITERATOR_NEXT_METHOD_STATUS_OK;
 }
 
-static enum bt_component_status comp_class_dummy_init(
-		struct bt_component *component, struct bt_value *params)
+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_COMPONENT_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_NAME("test-sfs");
+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_next_method);
+BT_PLUGIN_SOURCE_COMPONENT_CLASS_DESCRIPTION(source, "A source.");
+BT_PLUGIN_SOURCE_COMPONENT_CLASS_MESSAGE_ITERATOR_INIT_METHOD(source,
+	src_dummy_iterator_init_method);
+BT_PLUGIN_SOURCE_COMPONENT_CLASS_MESSAGE_ITERATOR_FINALIZE_METHOD(source,
+	dummy_iterator_finalize_method);
+
+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_CLASSES_BEGIN
-BT_PLUGIN_COMPONENT_CLASS_SOURCE_ENTRY("source", "A source", comp_class_dummy_init)
-BT_PLUGIN_COMPONENT_CLASS_SINK_ENTRY("sink", "A sink", comp_class_sink_init)
-BT_PLUGIN_COMPONENT_CLASS_FILTER_ENTRY("filter", "A filter", comp_class_dummy_init)
-BT_PLUGIN_COMPONENT_CLASSES_END
+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,
+	flt_dummy_iterator_init_method);
+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);