X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=include%2Fbabeltrace2%2Fgraph%2Fcomponent-class-source.h;h=3aa89cef9e25374ded7cc72fd0f4ec8877c06021;hb=4fa90f321f51af8f5bfc48eee1435e2f41d853b3;hp=6536426a00180e3f7fa72f9056a28cd969050b45;hpb=f4e38e70bf6dc1ff8c9226d9c8eedaf26fa19f09;p=babeltrace.git

diff --git a/include/babeltrace2/graph/component-class-source.h b/include/babeltrace2/graph/component-class-source.h
index 6536426a..3aa89cef 100644
--- a/include/babeltrace2/graph/component-class-source.h
+++ b/include/babeltrace2/graph/component-class-source.h
@@ -1,5 +1,5 @@
-#ifndef BABELTRACE_GRAPH_COMPONENT_CLASS_SOURCE_H
-#define BABELTRACE_GRAPH_COMPONENT_CLASS_SOURCE_H
+#ifndef BABELTRACE2_GRAPH_COMPONENT_CLASS_SOURCE_H
+#define BABELTRACE2_GRAPH_COMPONENT_CLASS_SOURCE_H
 
 /*
  * Copyright 2017-2018 Philippe Proulx <pproulx@efficios.com>
@@ -24,20 +24,15 @@
  * SOFTWARE.
  */
 
-#include <stdint.h>
-
-/* For bt_self_component_status */
-#include <babeltrace2/graph/self-component.h>
+#ifndef __BT_IN_BABELTRACE_H
+# error "Please include <babeltrace2/babeltrace.h> instead."
+#endif
 
-/* For bt_self_message_iterator_status */
-#include <babeltrace2/graph/self-message-iterator.h>
+#include <stdint.h>
 
-/* For bt_query_status */
+/* For bt_component_class_*_status */
 #include <babeltrace2/graph/component-class.h>
 
-/* For bt_component_class_status */
-#include <babeltrace2/graph/component-class-const.h>
-
 /*
  * For bt_component_class, bt_component_class_source, bt_port_input,
  * bt_query_executor, bt_self_component_class_source,
@@ -54,7 +49,7 @@
 extern "C" {
 #endif
 
-typedef bt_self_component_status
+typedef bt_component_class_init_method_status
 (*bt_component_class_source_init_method)(
 		bt_self_component_source *self_component,
 		const bt_value *params, void *init_method_data);
@@ -62,7 +57,7 @@ typedef bt_self_component_status
 typedef void (*bt_component_class_source_finalize_method)(
 		bt_self_component_source *self_component);
 
-typedef bt_self_message_iterator_status
+typedef bt_component_class_message_iterator_init_method_status
 (*bt_component_class_source_message_iterator_init_method)(
 		bt_self_message_iterator *message_iterator,
 		bt_self_component_source *self_component,
@@ -72,18 +67,18 @@ typedef void
 (*bt_component_class_source_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_source_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_source_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_source_message_iterator_seek_beginning_method)(
 		bt_self_message_iterator *message_iterator);
 
@@ -96,20 +91,15 @@ typedef bt_bool
 (*bt_component_class_source_message_iterator_can_seek_beginning_method)(
 		bt_self_message_iterator *message_iterator);
 
-typedef bt_query_status (*bt_component_class_source_query_method)(
+typedef bt_component_class_query_method_status
+(*bt_component_class_source_query_method)(
 		bt_self_component_class_source *comp_class,
 		const bt_query_executor *query_executor,
 		const char *object, const bt_value *params,
 		bt_logging_level logging_level,
 		const bt_value **result);
 
-typedef bt_self_component_status
-(*bt_component_class_source_accept_output_port_connection_method)(
-		bt_self_component_source *self_component,
-		bt_self_component_port_output *self_port,
-		const bt_port_input *other_port);
-
-typedef bt_self_component_status
+typedef bt_component_class_port_connected_method_status
 (*bt_component_class_source_output_port_connected_method)(
 		bt_self_component_source *self_component,
 		bt_self_component_port_output *self_port,
@@ -127,57 +117,52 @@ bt_component_class_source *bt_component_class_source_create(
 		const char *name,
 		bt_component_class_source_message_iterator_next_method method);
 
-extern bt_component_class_status
+extern bt_component_class_set_method_status
 bt_component_class_source_set_init_method(
 		bt_component_class_source *comp_class,
 		bt_component_class_source_init_method method);
 
-extern bt_component_class_status
+extern bt_component_class_set_method_status
 bt_component_class_source_set_finalize_method(
 		bt_component_class_source *comp_class,
 		bt_component_class_source_finalize_method method);
 
-extern bt_component_class_status
-bt_component_class_source_set_accept_output_port_connection_method(
-		bt_component_class_source *comp_class,
-		bt_component_class_source_accept_output_port_connection_method method);
-
-extern bt_component_class_status
+extern bt_component_class_set_method_status
 bt_component_class_source_set_output_port_connected_method(
 		bt_component_class_source *comp_class,
 		bt_component_class_source_output_port_connected_method method);
 
-extern bt_component_class_status
+extern bt_component_class_set_method_status
 bt_component_class_source_set_query_method(
 		bt_component_class_source *comp_class,
 		bt_component_class_source_query_method method);
 
-extern bt_component_class_status
+extern bt_component_class_set_method_status
 bt_component_class_source_set_message_iterator_init_method(
 		bt_component_class_source *comp_class,
 		bt_component_class_source_message_iterator_init_method method);
 
-extern bt_component_class_status
+extern bt_component_class_set_method_status
 bt_component_class_source_set_message_iterator_finalize_method(
 		bt_component_class_source *comp_class,
 		bt_component_class_source_message_iterator_finalize_method method);
 
-extern bt_component_class_status
+extern bt_component_class_set_method_status
 bt_component_class_source_set_message_iterator_seek_ns_from_origin_method(
 		bt_component_class_source *comp_class,
 		bt_component_class_source_message_iterator_seek_ns_from_origin_method method);
 
-extern bt_component_class_status
+extern bt_component_class_set_method_status
 bt_component_class_source_set_message_iterator_seek_beginning_method(
 		bt_component_class_source *comp_class,
 		bt_component_class_source_message_iterator_seek_beginning_method method);
 
-extern bt_bool
+extern bt_component_class_set_method_status
 bt_component_class_source_set_message_iterator_can_seek_ns_from_origin_method(
 		bt_component_class_source *comp_class,
 		bt_component_class_source_message_iterator_can_seek_ns_from_origin_method method);
 
-extern bt_bool
+extern bt_component_class_set_method_status
 bt_component_class_source_set_message_iterator_can_seek_beginning_method(
 		bt_component_class_source *comp_class,
 		bt_component_class_source_message_iterator_can_seek_beginning_method method);
@@ -186,4 +171,4 @@ bt_component_class_source_set_message_iterator_can_seek_beginning_method(
 }
 #endif
 
-#endif /* BABELTRACE_GRAPH_COMPONENT_CLASS_SOURCE_H */
+#endif /* BABELTRACE2_GRAPH_COMPONENT_CLASS_SOURCE_H */