X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=tests%2Flib%2Ftest-plugin-plugins%2Fsfs.c;h=cd44e7936055b9cba208692a0a566e9ae4aec4df;hb=0235b0db7de5bcacdb3650c92461f2ce5eb2143d;hp=b1f8aea6b9afb304d74d66325bc43374b5c4e7b7;hpb=890882eff34b4cba6f08a25f8ca56866c20b3fbe;p=babeltrace.git diff --git a/tests/lib/test-plugin-plugins/sfs.c b/tests/lib/test-plugin-plugins/sfs.c index b1f8aea6..cd44e793 100644 --- a/tests/lib/test-plugin-plugins/sfs.c +++ b/tests/lib/test-plugin-plugins/sfs.c @@ -1,94 +1,86 @@ /* - * Copyright (c) 2017 Philippe Proulx + * SPDX-License-Identifier: GPL-2.0-only * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; under version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * Copyright (C) 2017 Philippe Proulx */ -#include -#include -#include -#include -#include - -static enum bt_component_status sink_consume( - struct bt_private_component *private_component) -{ - return BT_COMPONENT_STATUS_OK; -} +#include +#include "common/assert.h" -static enum bt_notification_iterator_status dummy_iterator_init_method( - struct bt_private_component *private_component, - struct bt_private_port *private_port, - struct bt_private_notification_iterator *private_iterator) +static bt_component_class_sink_consume_method_status sink_consume( + bt_self_component_sink *self_comp) { - return BT_NOTIFICATION_ITERATOR_STATUS_OK; + return BT_COMPONENT_CLASS_SINK_CONSUME_METHOD_STATUS_OK; } -static void dummy_iterator_destroy_method( - struct bt_private_notification_iterator *private_iterator) +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_port_output *self_port) { + return BT_MESSAGE_ITERATOR_CLASS_INITIALIZE_METHOD_STATUS_OK; } -static struct bt_notification *dummy_iterator_get_method( - struct bt_private_notification_iterator *private_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_port_output *self_port) { - return NULL; + return BT_MESSAGE_ITERATOR_CLASS_INITIALIZE_METHOD_STATUS_OK; } -static enum bt_notification_iterator_status dummy_iterator_next_method( - struct bt_private_notification_iterator *private_iterator) +static void dummy_iterator_finalize_method( + bt_self_message_iterator *self_msg_iter) { - return BT_NOTIFICATION_ITERATOR_STATUS_OK; } -static enum bt_notification_iterator_status dummy_iterator_seek_time_method( - struct bt_private_notification_iterator *private_iterator, - int64_t time) +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 struct bt_value *query_method( - struct bt_component_class *component_class, - const char *object, 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) { - int ret; - struct bt_value *results = bt_value_array_create(); + bt_value *res = bt_value_array_create(); + bt_value *val; + *result = res; + int iret; - assert(results); - ret = bt_value_array_append_string(results, object); - assert(ret == 0); - ret = bt_value_array_append(results, params); - assert(ret == 0); - return results; + 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."); @@ -99,13 +91,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_QUERY_METHOD(filter, query_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);