X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=tests%2Flib%2Ftest-plugin-plugins%2Fsfs.c;h=46e3eec0be7dfaab5eb4fa6f03a46225ea43f096;hb=e2f7325d1e58710ee928373592adcee466f93d06;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..46e3eec0 100644
--- a/tests/lib/test-plugin-plugins/sfs.c
+++ b/tests/lib/test-plugin-plugins/sfs.c
@@ -15,60 +15,79 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include <babeltrace/plugin/plugin-dev.h>
-#include <babeltrace/component/component.h>
+#include <babeltrace/babeltrace.h>
+#include <babeltrace/assert-internal.h>
 
-static enum bt_component_status sink_consume(struct bt_component *component)
+static enum bt_self_component_status sink_consume(
+		struct bt_self_component_sink *self_comp)
 {
-	return BT_COMPONENT_STATUS_OK;
+	return BT_SELF_COMPONENT_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 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)
 {
-	return BT_NOTIFICATION_ITERATOR_STATUS_OK;
+	return BT_SELF_NOTIFICATION_ITERATOR_STATUS_OK;
 }
 
-static void dummy_iterator_destroy_method(
-		struct bt_notification_iterator *iterator)
+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)
 {
+	return BT_SELF_NOTIFICATION_ITERATOR_STATUS_OK;
 }
 
-static struct bt_notification *dummy_iterator_get_method(
-		struct bt_notification_iterator *iterator)
+static void dummy_iterator_finalize_method(
+		struct bt_self_notification_iterator *self_notif_iter)
 {
-	return NULL;
 }
 
-static enum bt_notification_iterator_status dummy_iterator_next_method(
-		struct bt_notification_iterator *iterator)
+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,
+		uint64_t *count)
 {
-	return BT_NOTIFICATION_ITERATOR_STATUS_OK;
+	return BT_SELF_NOTIFICATION_ITERATOR_STATUS_ERROR;
 }
 
-static enum bt_notification_iterator_status dummy_iterator_seek_time_method(
-		struct bt_notification_iterator *iterator, int64_t time)
+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)
 {
-	return BT_NOTIFICATION_ITERATOR_STATUS_OK;
+	struct bt_value *res = bt_value_array_create();
+	struct 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_object_put_ref(val);
+	return BT_QUERY_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);
+	src_dummy_iterator_init_method);
+BT_PLUGIN_SOURCE_COMPONENT_CLASS_NOTIFICATION_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.");
@@ -79,12 +98,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);
+	flt_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, flt_query_method);