X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=include%2Fbabeltrace2%2Fgraph%2Fcomponent-class-filter.h;h=046a43bb5bfa5ad3959d3cac2f1baa27f87e24d0;hb=7c14d64103ff43ddeb43aaa04df17beb107f1f78;hp=74d92ab95c7fd0458a70b9429e1b6cc5d83bfb4f;hpb=3fadfbc0c91f82c46bd36e6e0657ea93570c9db1;p=babeltrace.git diff --git a/include/babeltrace2/graph/component-class-filter.h b/include/babeltrace2/graph/component-class-filter.h index 74d92ab9..046a43bb 100644 --- a/include/babeltrace2/graph/component-class-filter.h +++ b/include/babeltrace2/graph/component-class-filter.h @@ -1,9 +1,8 @@ -#ifndef BABELTRACE_GRAPH_COMPONENT_CLASS_FILTER_H -#define BABELTRACE_GRAPH_COMPONENT_CLASS_FILTER_H +#ifndef BABELTRACE2_GRAPH_COMPONENT_CLASS_FILTER_H +#define BABELTRACE2_GRAPH_COMPONENT_CLASS_FILTER_H /* - * Copyright 2017-2018 Philippe Proulx - * Copyright 2016 Jérémie Galarneau + * Copyright (c) 2010-2019 EfficiOS Inc. and Linux Foundation * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -24,34 +23,21 @@ * SOFTWARE. */ -#include - -/* For bt_self_component_status */ -#include +#ifndef __BT_IN_BABELTRACE_H +# error "Please include instead." +#endif -/* For bt_self_message_iterator_status */ -#include +#include -/* For bt_query_status */ #include - -/* For bt_component_class_status */ -#include - -/* - * For bt_component_class, bt_component_class_filter, bt_port_input, - * bt_port_output, bt_query_executor, bt_self_component_class_filter, - * bt_self_component_filter, bt_self_component_port_input, - * bt_self_component_port_output, bt_value, bt_message_array_const, - * bt_bool, bt_self_message_iterator, __BT_UPCAST - */ #include +#include #ifdef __cplusplus extern "C" { #endif -typedef bt_self_component_status +typedef bt_component_class_init_method_status (*bt_component_class_filter_init_method)( bt_self_component_filter *self_component, const bt_value *params, void *init_method_data); @@ -59,7 +45,7 @@ typedef bt_self_component_status typedef void (*bt_component_class_filter_finalize_method)( bt_self_component_filter *self_component); -typedef bt_self_message_iterator_status +typedef bt_component_class_message_iterator_init_method_status (*bt_component_class_filter_message_iterator_init_method)( bt_self_message_iterator *message_iterator, bt_self_component_filter *self_component, @@ -69,18 +55,18 @@ typedef void (*bt_component_class_filter_message_iterator_finalize_method)( bt_self_message_iterator *message_iterator); -typedef bt_self_message_iterator_status +typedef bt_component_class_message_iterator_next_method_status (*bt_component_class_filter_message_iterator_next_method)( bt_self_message_iterator *message_iterator, bt_message_array_const msgs, uint64_t capacity, uint64_t *count); -typedef bt_self_message_iterator_status +typedef bt_component_class_message_iterator_seek_ns_from_origin_method_status (*bt_component_class_filter_message_iterator_seek_ns_from_origin_method)( bt_self_message_iterator *message_iterator, int64_t ns_from_origin); -typedef bt_self_message_iterator_status +typedef bt_component_class_message_iterator_seek_beginning_method_status (*bt_component_class_filter_message_iterator_seek_beginning_method)( bt_self_message_iterator *message_iterator); @@ -93,32 +79,20 @@ typedef bt_bool (*bt_component_class_filter_message_iterator_can_seek_beginning_method)( bt_self_message_iterator *message_iterator); -typedef bt_query_status +typedef bt_component_class_query_method_status (*bt_component_class_filter_query_method)( bt_self_component_class_filter *comp_class, - const bt_query_executor *query_executor, + bt_private_query_executor *query_executor, const char *object, const bt_value *params, - const bt_value **result); - -typedef bt_self_component_status -(*bt_component_class_filter_accept_input_port_connection_method)( - bt_self_component_filter *self_component, - bt_self_component_port_input *self_port, - const bt_port_output *other_port); - -typedef bt_self_component_status -(*bt_component_class_filter_accept_output_port_connection_method)( - bt_self_component_filter *self_component, - bt_self_component_port_output *self_port, - const bt_port_input *other_port); + void *method_data, const bt_value **result); -typedef bt_self_component_status +typedef bt_component_class_port_connected_method_status (*bt_component_class_filter_input_port_connected_method)( bt_self_component_filter *self_component, bt_self_component_port_input *self_port, const bt_port_output *other_port); -typedef bt_self_component_status +typedef bt_component_class_port_connected_method_status (*bt_component_class_filter_output_port_connected_method)( bt_self_component_filter *self_component, bt_self_component_port_output *self_port, @@ -136,67 +110,57 @@ bt_component_class_filter *bt_component_class_filter_create( const char *name, bt_component_class_filter_message_iterator_next_method method); -extern bt_component_class_status +extern bt_component_class_set_method_status bt_component_class_filter_set_init_method( bt_component_class_filter *comp_class, bt_component_class_filter_init_method method); -extern bt_component_class_status +extern bt_component_class_set_method_status bt_component_class_filter_set_finalize_method( bt_component_class_filter *comp_class, bt_component_class_filter_finalize_method method); -extern bt_component_class_status -bt_component_class_filter_set_accept_input_port_connection_method( - bt_component_class_filter *comp_class, - bt_component_class_filter_accept_input_port_connection_method method); - -extern bt_component_class_status -bt_component_class_filter_set_accept_output_port_connection_method( - bt_component_class_filter *comp_class, - bt_component_class_filter_accept_output_port_connection_method method); - -extern bt_component_class_status +extern bt_component_class_set_method_status bt_component_class_filter_set_input_port_connected_method( bt_component_class_filter *comp_class, bt_component_class_filter_input_port_connected_method method); -extern bt_component_class_status +extern bt_component_class_set_method_status bt_component_class_filter_set_output_port_connected_method( bt_component_class_filter *comp_class, bt_component_class_filter_output_port_connected_method method); -extern bt_component_class_status +extern bt_component_class_set_method_status bt_component_class_filter_set_query_method( bt_component_class_filter *comp_class, bt_component_class_filter_query_method method); -extern bt_component_class_status +extern bt_component_class_set_method_status bt_component_class_filter_set_message_iterator_init_method( bt_component_class_filter *comp_class, bt_component_class_filter_message_iterator_init_method method); -extern bt_component_class_status +extern bt_component_class_set_method_status bt_component_class_filter_set_message_iterator_finalize_method( bt_component_class_filter *comp_class, bt_component_class_filter_message_iterator_finalize_method method); -extern bt_component_class_status +extern bt_component_class_set_method_status bt_component_class_filter_set_message_iterator_seek_ns_from_origin_method( bt_component_class_filter *comp_class, bt_component_class_filter_message_iterator_seek_ns_from_origin_method method); -extern bt_component_class_status +extern bt_component_class_set_method_status bt_component_class_filter_set_message_iterator_seek_beginning_method( bt_component_class_filter *comp_class, bt_component_class_filter_message_iterator_seek_beginning_method method); -extern bt_bool +extern bt_component_class_set_method_status bt_component_class_filter_set_message_iterator_can_seek_ns_from_origin_method( bt_component_class_filter *comp_class, bt_component_class_filter_message_iterator_can_seek_ns_from_origin_method method); -extern bt_bool +extern bt_component_class_set_method_status bt_component_class_filter_set_message_iterator_can_seek_beginning_method( bt_component_class_filter *comp_class, bt_component_class_filter_message_iterator_can_seek_beginning_method method); @@ -205,4 +169,4 @@ bt_component_class_filter_set_message_iterator_can_seek_beginning_method( } #endif -#endif /* BABELTRACE_GRAPH_COMPONENT_CLASS_FILTER_H */ +#endif /* BABELTRACE2_GRAPH_COMPONENT_CLASS_FILTER_H */