X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=include%2Fbabeltrace%2Fgraph%2Fcomponent-class-filter.h;h=890cfdfaa57a12a41c649d6445956d9106fc3863;hb=4725a2013cb518374822ccb490610b45f74dbdbf;hp=1f4dc4ff7ea230debc4902841cab051c10fa22ea;hpb=e2f7325d1e58710ee928373592adcee466f93d06;p=babeltrace.git

diff --git a/include/babeltrace/graph/component-class-filter.h b/include/babeltrace/graph/component-class-filter.h
index 1f4dc4ff..890cfdfa 100644
--- a/include/babeltrace/graph/component-class-filter.h
+++ b/include/babeltrace/graph/component-class-filter.h
@@ -26,153 +26,141 @@
 
 #include <stdint.h>
 
-/* For enum bt_notification_array_const */
-#include <babeltrace/graph/notification-const.h>
-
-/* For enum bt_self_component_status */
+/* For bt_self_component_status */
 #include <babeltrace/graph/self-component.h>
 
-/* For enum bt_self_notification_iterator_status */
-#include <babeltrace/graph/self-notification-iterator.h>
+/* For bt_self_message_iterator_status */
+#include <babeltrace/graph/self-message-iterator.h>
 
-/* For enum bt_query_status */
+/* For bt_query_status */
 #include <babeltrace/graph/component-class.h>
 
+/* For bt_component_class_status */
+#include <babeltrace/graph/component-class-const.h>
+
+/*
+ * 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
+ */
+#include <babeltrace/types.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-struct bt_component_class;
-struct bt_component_class_filter;
-struct bt_port_input;
-struct bt_port_output;
-struct bt_query_executor;
-struct bt_self_component_class_filter;
-struct bt_self_component_filter;
-struct bt_self_component_port_input;
-struct bt_self_component_port_output;
-struct bt_value;
-
-typedef enum bt_self_component_status
+typedef bt_self_component_status
 (*bt_component_class_filter_init_method)(
-		struct bt_self_component_filter *self_component,
-		const struct bt_value *params, void *init_method_data);
+		bt_self_component_filter *self_component,
+		const bt_value *params, void *init_method_data);
 
 typedef void (*bt_component_class_filter_finalize_method)(
-		struct bt_self_component_filter *self_component);
+		bt_self_component_filter *self_component);
 
-typedef enum bt_self_notification_iterator_status
-(*bt_component_class_filter_notification_iterator_init_method)(
-		struct bt_self_notification_iterator *notification_iterator,
-		struct bt_self_component_filter *self_component,
-		struct bt_self_component_port_output *port);
+typedef bt_self_message_iterator_status
+(*bt_component_class_filter_message_iterator_init_method)(
+		bt_self_message_iterator *message_iterator,
+		bt_self_component_filter *self_component,
+		bt_self_component_port_output *port);
 
 typedef void
-(*bt_component_class_filter_notification_iterator_finalize_method)(
-		struct bt_self_notification_iterator *notification_iterator);
+(*bt_component_class_filter_message_iterator_finalize_method)(
+		bt_self_message_iterator *message_iterator);
 
-typedef enum bt_self_notification_iterator_status
-(*bt_component_class_filter_notification_iterator_next_method)(
-		struct bt_self_notification_iterator *notification_iterator,
-		bt_notification_array_const notifs, uint64_t capacity,
+typedef bt_self_message_iterator_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 enum bt_query_status
+typedef bt_query_status
 (*bt_component_class_filter_query_method)(
-		struct bt_self_component_class_filter *comp_class,
-		const struct bt_query_executor *query_executor,
-		const char *object, const struct bt_value *params,
-		const struct bt_value **result);
+		bt_self_component_class_filter *comp_class,
+		const bt_query_executor *query_executor,
+		const char *object, const bt_value *params,
+		const bt_value **result);
 
-typedef enum bt_self_component_status
+typedef bt_self_component_status
 (*bt_component_class_filter_accept_input_port_connection_method)(
-		struct bt_self_component_filter *self_component,
-		struct bt_self_component_port_input *self_port,
-		const struct bt_port_output *other_port);
+		bt_self_component_filter *self_component,
+		bt_self_component_port_input *self_port,
+		const bt_port_output *other_port);
 
-typedef enum bt_self_component_status
+typedef bt_self_component_status
 (*bt_component_class_filter_accept_output_port_connection_method)(
-		struct bt_self_component_filter *self_component,
-		struct bt_self_component_port_output *self_port,
-		const struct bt_port_input *other_port);
+		bt_self_component_filter *self_component,
+		bt_self_component_port_output *self_port,
+		const bt_port_input *other_port);
 
-typedef enum bt_self_component_status
+typedef bt_self_component_status
 (*bt_component_class_filter_input_port_connected_method)(
-		struct bt_self_component_filter *self_component,
-		struct bt_self_component_port_input *self_port,
-		const struct bt_port_output *other_port);
+		bt_self_component_filter *self_component,
+		bt_self_component_port_input *self_port,
+		const bt_port_output *other_port);
 
-typedef enum bt_self_component_status
+typedef bt_self_component_status
 (*bt_component_class_filter_output_port_connected_method)(
-		struct bt_self_component_filter *self_component,
-		struct bt_self_component_port_output *self_port,
-		const struct bt_port_input *other_port);
-
-typedef void
-(*bt_component_class_filter_input_port_disconnected_method)(
-		struct bt_self_component_filter *self_component,
-		struct bt_self_component_port_input *self_port);
-
-typedef void
-(*bt_component_class_filter_output_port_disconnected_method)(
-		struct bt_self_component_filter *self_component,
-		struct bt_self_component_port_output *self_port);
+		bt_self_component_filter *self_component,
+		bt_self_component_port_output *self_port,
+		const bt_port_input *other_port);
 
 static inline
-struct bt_component_class *bt_component_class_filter_as_component_class(
-		struct bt_component_class_filter *comp_cls_filter)
+bt_component_class *bt_component_class_filter_as_component_class(
+		bt_component_class_filter *comp_cls_filter)
 {
 	return (void *) comp_cls_filter;
 }
 
 extern
-struct bt_component_class_filter *bt_component_class_filter_create(
+bt_component_class_filter *bt_component_class_filter_create(
 		const char *name,
-		bt_component_class_filter_notification_iterator_next_method method);
+		bt_component_class_filter_message_iterator_next_method method);
 
-extern int bt_component_class_filter_set_init_method(
-		struct bt_component_class_filter *comp_class,
+extern bt_component_class_status
+bt_component_class_filter_set_init_method(
+		bt_component_class_filter *comp_class,
 		bt_component_class_filter_init_method method);
 
-extern int bt_component_class_filter_set_finalize_method(
-		struct bt_component_class_filter *comp_class,
+extern bt_component_class_status
+bt_component_class_filter_set_finalize_method(
+		bt_component_class_filter *comp_class,
 		bt_component_class_filter_finalize_method method);
 
-extern int bt_component_class_filter_set_accept_input_port_connection_method(
-		struct bt_component_class_filter *comp_class,
+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 int bt_component_class_filter_set_accept_output_port_connection_method(
-		struct bt_component_class_filter *comp_class,
+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 int bt_component_class_filter_set_input_port_connected_method(
-		struct bt_component_class_filter *comp_class,
+extern bt_component_class_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 int bt_component_class_filter_set_output_port_connected_method(
-		struct bt_component_class_filter *comp_class,
+extern bt_component_class_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 int bt_component_class_filter_set_input_port_disconnected_method(
-		struct bt_component_class_filter *comp_class,
-		bt_component_class_filter_input_port_disconnected_method method);
-
-extern int bt_component_class_filter_set_output_port_disconnected_method(
-		struct bt_component_class_filter *comp_class,
-		bt_component_class_filter_output_port_disconnected_method method);
-
-extern int bt_component_class_filter_set_query_method(
-		struct bt_component_class_filter *comp_class,
+extern bt_component_class_status
+bt_component_class_filter_set_query_method(
+		bt_component_class_filter *comp_class,
 		bt_component_class_filter_query_method method);
 
-extern int bt_component_class_filter_set_notification_iterator_init_method(
-		struct bt_component_class_filter *comp_class,
-		bt_component_class_filter_notification_iterator_init_method method);
+extern bt_component_class_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 int bt_component_class_filter_set_notification_iterator_finalize_method(
-		struct bt_component_class_filter *comp_class,
-		bt_component_class_filter_notification_iterator_finalize_method method);
+extern bt_component_class_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);
 
 #ifdef __cplusplus
 }