X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=include%2Fbabeltrace%2Fgraph%2Fcomponent-class-internal.h;h=e5185739c9bcc3b860b35576589b73a087978271;hb=834e9996a9d02f0cec468cb103ab2a573b7317b1;hp=66d920d65b6325250065f619161614432a632a8f;hpb=96854e6a5d0d4926b186f8a6f57561677ed3741a;p=babeltrace.git

diff --git a/include/babeltrace/graph/component-class-internal.h b/include/babeltrace/graph/component-class-internal.h
index 66d920d6..e5185739 100644
--- a/include/babeltrace/graph/component-class-internal.h
+++ b/include/babeltrace/graph/component-class-internal.h
@@ -2,8 +2,6 @@
 #define BABELTRACE_GRAPH_COMPONENT_CLASS_INTERNAL_H
 
 /*
- * BabelTrace - Component Class Internal
- *
  * Copyright 2015 Jérémie Galarneau <jeremie.galarneau@efficios.com>
  * Copyright 2017 Philippe Proulx <pproulx@efficios.com>
  *
@@ -30,9 +28,9 @@
 
 #include <babeltrace/graph/component.h>
 #include <babeltrace/graph/component-class.h>
-#include <babeltrace/graph/component-class-source.h>
-#include <babeltrace/graph/component-class-filter.h>
-#include <babeltrace/graph/component-class-sink.h>
+#include <babeltrace/graph/private-component-class-source.h>
+#include <babeltrace/graph/private-component-class-filter.h>
+#include <babeltrace/graph/private-component-class-sink.h>
 #include <babeltrace/babeltrace-internal.h>
 #include <babeltrace/object-internal.h>
 #include <babeltrace/list-internal.h>
@@ -56,45 +54,57 @@ struct bt_component_class {
 	GString *name;
 	GString *description;
 	GString *help;
-	struct {
-		bt_component_class_init_method init;
-		bt_component_class_finalize_method finalize;
-		bt_component_class_query_method query;
-		bt_component_class_accept_port_connection_method accept_port_connection;
-		bt_component_class_port_connected_method port_connected;
-		bt_component_class_port_disconnected_method port_disconnected;
-	} methods;
+
 	/* Array of struct bt_component_class_destroy_listener */
 	GArray *destroy_listeners;
-	bt_bool frozen;
+	bool frozen;
 	struct bt_list_head node;
 	struct bt_plugin_so_shared_lib_handle *so_handle;
 };
 
-struct bt_component_class_notification_iterator_methods {
-	bt_component_class_notification_iterator_init_method init;
-	bt_component_class_notification_iterator_finalize_method finalize;
-	bt_component_class_notification_iterator_next_method next;
-};
-
 struct bt_component_class_source {
 	struct bt_component_class parent;
 	struct {
-		struct bt_component_class_notification_iterator_methods iterator;
+		bt_private_component_class_source_init_method init;
+		bt_private_component_class_source_finalize_method finalize;
+		bt_private_component_class_source_notification_iterator_init_method notif_iter_init;
+		bt_private_component_class_source_notification_iterator_finalize_method notif_iter_finalize;
+		bt_private_component_class_source_notification_iterator_next_method notif_iter_next;
+		bt_private_component_class_source_query_method query;
+		bt_private_component_class_source_accept_output_port_connection_method accept_output_port_connection;
+		bt_private_component_class_source_output_port_connected_method output_port_connected;
+		bt_private_component_class_source_output_port_disconnected_method output_port_disconnected;
 	} methods;
 };
 
 struct bt_component_class_sink {
 	struct bt_component_class parent;
 	struct {
-		bt_component_class_sink_consume_method consume;
+		bt_private_component_class_sink_init_method init;
+		bt_private_component_class_sink_finalize_method finalize;
+		bt_private_component_class_sink_query_method query;
+		bt_private_component_class_sink_accept_input_port_connection_method accept_input_port_connection;
+		bt_private_component_class_sink_input_port_connected_method input_port_connected;
+		bt_private_component_class_sink_input_port_disconnected_method input_port_disconnected;
+		bt_private_component_class_sink_consume_method consume;
 	} methods;
 };
 
 struct bt_component_class_filter {
 	struct bt_component_class parent;
 	struct {
-		struct bt_component_class_notification_iterator_methods iterator;
+		bt_private_component_class_filter_init_method init;
+		bt_private_component_class_filter_finalize_method finalize;
+		bt_private_component_class_filter_notification_iterator_init_method notif_iter_init;
+		bt_private_component_class_filter_notification_iterator_finalize_method notif_iter_finalize;
+		bt_private_component_class_filter_notification_iterator_next_method notif_iter_next;
+		bt_private_component_class_filter_query_method query;
+		bt_private_component_class_filter_accept_input_port_connection_method accept_input_port_connection;
+		bt_private_component_class_filter_accept_output_port_connection_method accept_output_port_connection;
+		bt_private_component_class_filter_input_port_connected_method input_port_connected;
+		bt_private_component_class_filter_output_port_connected_method output_port_connected;
+		bt_private_component_class_filter_input_port_disconnected_method input_port_disconnected;
+		bt_private_component_class_filter_output_port_disconnected_method output_port_disconnected;
 	} methods;
 };
 
@@ -102,12 +112,19 @@ BT_HIDDEN
 void bt_component_class_add_destroy_listener(struct bt_component_class *class,
 		bt_component_class_destroy_listener_func func, void *data);
 
+BT_HIDDEN
+void _bt_component_class_freeze(struct bt_component_class *component_class);
+
+#ifdef BT_DEV_MODE
+# define bt_component_class_freeze	_bt_component_class_freeze
+#else
+# define bt_component_class_freeze(_cc)
+#endif
+
 static inline
 const char *bt_component_class_type_string(enum bt_component_class_type type)
 {
 	switch (type) {
-	case BT_COMPONENT_CLASS_TYPE_UNKNOWN:
-		return "BT_COMPONENT_CLASS_TYPE_UNKNOWN";
 	case BT_COMPONENT_CLASS_TYPE_SOURCE:
 		return "BT_COMPONENT_CLASS_TYPE_SOURCE";
 	case BT_COMPONENT_CLASS_TYPE_SINK: