X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Flib%2Fgraph%2Fcomponent-class.h;h=2b4b9454f4cd9eb1ca64a03f8db86ee8596d935e;hb=68e2deedb3317cbe11bef0d4b45803a60d386edb;hp=1c49a769bd1ba8cce9173b2066360dc80a597254;hpb=57952005b6a6a0aeb1e4ecb0d7ac0c6786d23dba;p=babeltrace.git

diff --git a/src/lib/graph/component-class.h b/src/lib/graph/component-class.h
index 1c49a769..2b4b9454 100644
--- a/src/lib/graph/component-class.h
+++ b/src/lib/graph/component-class.h
@@ -31,10 +31,11 @@
 #include <babeltrace2/graph/component-class-source.h>
 #include <babeltrace2/graph/component-class-filter.h>
 #include <babeltrace2/graph/component-class-sink.h>
-#include "common/babeltrace.h"
+#include "common/macros.h"
 #include "lib/object.h"
 #include "common/list.h"
 #include <babeltrace2/types.h>
+#include <stdbool.h>
 #include <glib.h>
 
 struct bt_component_class;
@@ -54,6 +55,7 @@ struct bt_component_class {
 	GString *name;
 	GString *description;
 	GString *help;
+	GString *plugin_name;
 
 	/* Array of struct bt_component_class_destroy_listener */
 	GArray *destroy_listeners;
@@ -65,28 +67,22 @@ struct bt_component_class {
 struct bt_component_class_source {
 	struct bt_component_class parent;
 	struct {
-		bt_component_class_source_init_method init;
+		bt_component_class_source_get_supported_mip_versions_method get_supported_mip_versions;
+		bt_component_class_source_initialize_method init;
 		bt_component_class_source_finalize_method finalize;
-		bt_component_class_source_message_iterator_init_method msg_iter_init;
-		bt_component_class_source_message_iterator_finalize_method msg_iter_finalize;
-		bt_component_class_source_message_iterator_next_method msg_iter_next;
-		bt_component_class_source_message_iterator_seek_ns_from_origin_method msg_iter_seek_ns_from_origin;
-		bt_component_class_source_message_iterator_seek_beginning_method msg_iter_seek_beginning;
-		bt_component_class_source_message_iterator_can_seek_ns_from_origin_method msg_iter_can_seek_ns_from_origin;
-		bt_component_class_source_message_iterator_can_seek_beginning_method msg_iter_can_seek_beginning;
 		bt_component_class_source_query_method query;
-		bt_component_class_source_accept_output_port_connection_method accept_output_port_connection;
 		bt_component_class_source_output_port_connected_method output_port_connected;
 	} methods;
+	bt_message_iterator_class *msg_iter_cls;
 };
 
 struct bt_component_class_sink {
 	struct bt_component_class parent;
 	struct {
-		bt_component_class_sink_init_method init;
+		bt_component_class_sink_get_supported_mip_versions_method get_supported_mip_versions;
+		bt_component_class_sink_initialize_method init;
 		bt_component_class_sink_finalize_method finalize;
 		bt_component_class_sink_query_method query;
-		bt_component_class_sink_accept_input_port_connection_method accept_input_port_connection;
 		bt_component_class_sink_input_port_connected_method input_port_connected;
 		bt_component_class_sink_graph_is_configured_method graph_is_configured;
 		bt_component_class_sink_consume_method consume;
@@ -96,21 +92,14 @@ struct bt_component_class_sink {
 struct bt_component_class_filter {
 	struct bt_component_class parent;
 	struct {
-		bt_component_class_filter_init_method init;
+		bt_component_class_filter_get_supported_mip_versions_method get_supported_mip_versions;
+		bt_component_class_filter_initialize_method init;
 		bt_component_class_filter_finalize_method finalize;
-		bt_component_class_filter_message_iterator_init_method msg_iter_init;
-		bt_component_class_filter_message_iterator_finalize_method msg_iter_finalize;
-		bt_component_class_filter_message_iterator_next_method msg_iter_next;
-		bt_component_class_filter_message_iterator_seek_ns_from_origin_method msg_iter_seek_ns_from_origin;
-		bt_component_class_filter_message_iterator_seek_beginning_method msg_iter_seek_beginning;
-		bt_component_class_filter_message_iterator_can_seek_ns_from_origin_method msg_iter_can_seek_ns_from_origin;
-		bt_component_class_filter_message_iterator_can_seek_beginning_method msg_iter_can_seek_beginning;
 		bt_component_class_filter_query_method query;
-		bt_component_class_filter_accept_input_port_connection_method accept_input_port_connection;
-		bt_component_class_filter_accept_output_port_connection_method accept_output_port_connection;
 		bt_component_class_filter_input_port_connected_method input_port_connected;
 		bt_component_class_filter_output_port_connected_method output_port_connected;
 	} methods;
+	bt_message_iterator_class *msg_iter_cls;
 };
 
 BT_HIDDEN
@@ -132,11 +121,11 @@ const char *bt_component_class_type_string(enum bt_component_class_type type)
 {
 	switch (type) {
 	case BT_COMPONENT_CLASS_TYPE_SOURCE:
-		return "BT_COMPONENT_CLASS_TYPE_SOURCE";
+		return "SOURCE";
 	case BT_COMPONENT_CLASS_TYPE_SINK:
-		return "BT_COMPONENT_CLASS_TYPE_SINK";
+		return "SINK";
 	case BT_COMPONENT_CLASS_TYPE_FILTER:
-		return "BT_COMPONENT_CLASS_TYPE_FILTER";
+		return "FILTER";
 	default:
 		return "(unknown)";
 	}