X-Git-Url: https://git.efficios.com/?a=blobdiff_plain;f=include%2Fbabeltrace2%2Fgraph%2Fgraph.h;h=d562e366e41ace21e3efe49da982d8115eaf8e28;hb=fbd8a4e0144aa7777bedcd8c05daec61d594634d;hp=284eb0e8abc79b30efdeefdd5a08aa07d7ce7264;hpb=ce95c60bc6b7683b24c7eee35bf0f2a9ee19d0dc;p=babeltrace.git

diff --git a/include/babeltrace2/graph/graph.h b/include/babeltrace2/graph/graph.h
index 284eb0e8..d562e366 100644
--- a/include/babeltrace2/graph/graph.h
+++ b/include/babeltrace2/graph/graph.h
@@ -89,35 +89,33 @@ typedef bt_graph_listener_func_status
 		const bt_port_output *upstream_port,
 		const bt_port_input *downstream_port, void *data);
 
-typedef void (* bt_graph_listener_removed_func)(void *data);
-
-typedef enum bt_graph_simple_sink_component_init_func_status {
-	BT_GRAPH_SIMPLE_SINK_COMPONENT_INIT_FUNC_STATUS_OK		= __BT_FUNC_STATUS_OK,
-	BT_GRAPH_SIMPLE_SINK_COMPONENT_INIT_FUNC_STATUS_ERROR		= __BT_FUNC_STATUS_ERROR,
-	BT_GRAPH_SIMPLE_SINK_COMPONENT_INIT_FUNC_STATUS_MEMORY_ERROR	= __BT_FUNC_STATUS_MEMORY_ERROR,
-} bt_graph_simple_sink_component_init_func_status;
-
-typedef bt_graph_simple_sink_component_init_func_status
-(*bt_graph_simple_sink_component_init_func)(
-		bt_self_component_port_input_message_iterator *iterator,
+typedef enum bt_graph_simple_sink_component_initialize_func_status {
+	BT_GRAPH_SIMPLE_SINK_COMPONENT_INITIALIZE_FUNC_STATUS_OK		= __BT_FUNC_STATUS_OK,
+	BT_GRAPH_SIMPLE_SINK_COMPONENT_INITIALIZE_FUNC_STATUS_ERROR		= __BT_FUNC_STATUS_ERROR,
+	BT_GRAPH_SIMPLE_SINK_COMPONENT_INITIALIZE_FUNC_STATUS_MEMORY_ERROR	= __BT_FUNC_STATUS_MEMORY_ERROR,
+} bt_graph_simple_sink_component_initialize_func_status;
+
+typedef bt_graph_simple_sink_component_initialize_func_status
+(*bt_graph_simple_sink_component_initialize_func)(
+		bt_message_iterator *iterator,
 		void *data);
 
 typedef enum bt_graph_simple_sink_component_consume_func_status {
 	BT_GRAPH_SIMPLE_SINK_COMPONENT_CONSUME_FUNC_STATUS_OK			= __BT_FUNC_STATUS_OK,
 	BT_GRAPH_SIMPLE_SINK_COMPONENT_CONSUME_FUNC_STATUS_ERROR		= __BT_FUNC_STATUS_ERROR,
-	BT_GRAPH_SIMPLE_SINK_COMPONENT_CONSUME_FUNC_STATUS_MEMORY_ERROR	= 	__BT_FUNC_STATUS_MEMORY_ERROR,
+	BT_GRAPH_SIMPLE_SINK_COMPONENT_CONSUME_FUNC_STATUS_MEMORY_ERROR		= __BT_FUNC_STATUS_MEMORY_ERROR,
 	BT_GRAPH_SIMPLE_SINK_COMPONENT_CONSUME_FUNC_STATUS_AGAIN		= __BT_FUNC_STATUS_AGAIN,
 	BT_GRAPH_SIMPLE_SINK_COMPONENT_CONSUME_FUNC_STATUS_END			= __BT_FUNC_STATUS_END,
 } bt_graph_simple_sink_component_consume_func_status;
 
 typedef bt_graph_simple_sink_component_consume_func_status
 (*bt_graph_simple_sink_component_consume_func)(
-		bt_self_component_port_input_message_iterator *iterator,
+		bt_message_iterator *iterator,
 		void *data);
 
 typedef void (*bt_graph_simple_sink_component_finalize_func)(void *data);
 
-extern bt_graph *bt_graph_create(void);
+extern bt_graph *bt_graph_create(uint64_t mip_version);
 
 typedef enum bt_graph_add_component_status {
 	BT_GRAPH_ADD_COMPONENT_STATUS_OK		= __BT_FUNC_STATUS_OK,
@@ -132,7 +130,7 @@ bt_graph_add_source_component(bt_graph *graph,
 		bt_logging_level log_level, const bt_component_source **component);
 
 extern bt_graph_add_component_status
-bt_graph_add_source_component_with_init_method_data(
+bt_graph_add_source_component_with_initialize_method_data(
 		bt_graph *graph,
 		const bt_component_class_source *component_class,
 		const char *name, const bt_value *params,
@@ -147,7 +145,7 @@ bt_graph_add_filter_component(bt_graph *graph,
 		const bt_component_filter **component);
 
 extern bt_graph_add_component_status
-bt_graph_add_filter_component_with_init_method_data(
+bt_graph_add_filter_component_with_initialize_method_data(
 		bt_graph *graph,
 		const bt_component_class_filter *component_class,
 		const char *name, const bt_value *params,
@@ -162,7 +160,7 @@ bt_graph_add_sink_component(
 		const bt_component_sink **component);
 
 extern bt_graph_add_component_status
-bt_graph_add_sink_component_with_init_method_data(
+bt_graph_add_sink_component_with_initialize_method_data(
 		bt_graph *graph, const bt_component_class_sink *component_class,
 		const char *name, const bt_value *params,
 		void *init_method_data, bt_logging_level log_level,
@@ -170,7 +168,7 @@ bt_graph_add_sink_component_with_init_method_data(
 
 extern bt_graph_add_component_status
 bt_graph_add_simple_sink_component(bt_graph *graph, const char *name,
-		bt_graph_simple_sink_component_init_func init_func,
+		bt_graph_simple_sink_component_initialize_func init_func,
 		bt_graph_simple_sink_component_consume_func consume_func,
 		bt_graph_simple_sink_component_finalize_func finalize_func,
 		void *user_data, const bt_component_sink **component);
@@ -191,7 +189,6 @@ typedef enum bt_graph_run_status {
 	BT_GRAPH_RUN_STATUS_ERROR		= __BT_FUNC_STATUS_ERROR,
 	BT_GRAPH_RUN_STATUS_MEMORY_ERROR	= __BT_FUNC_STATUS_MEMORY_ERROR,
 	BT_GRAPH_RUN_STATUS_AGAIN		= __BT_FUNC_STATUS_AGAIN,
-	BT_GRAPH_RUN_STATUS_END			= __BT_FUNC_STATUS_END,
 } bt_graph_run_status;
 
 extern bt_graph_run_status bt_graph_run(bt_graph *graph);
@@ -215,57 +212,25 @@ extern bt_graph_add_listener_status
 bt_graph_add_filter_component_input_port_added_listener(
 		bt_graph *graph,
 		bt_graph_filter_component_input_port_added_listener_func listener,
-		bt_graph_listener_removed_func listener_removed, void *data,
-		bt_listener_id *listener_id);
+		void *data, bt_listener_id *listener_id);
 
 extern bt_graph_add_listener_status
 bt_graph_add_sink_component_input_port_added_listener(
 		bt_graph *graph,
 		bt_graph_sink_component_input_port_added_listener_func listener,
-		bt_graph_listener_removed_func listener_removed, void *data,
-		bt_listener_id *listener_id);
+		void *data, bt_listener_id *listener_id);
 
 extern bt_graph_add_listener_status
 bt_graph_add_source_component_output_port_added_listener(
 		bt_graph *graph,
 		bt_graph_source_component_output_port_added_listener_func listener,
-		bt_graph_listener_removed_func listener_removed, void *data,
-		bt_listener_id *listener_id);
+		void *data, bt_listener_id *listener_id);
 
 extern bt_graph_add_listener_status
 bt_graph_add_filter_component_output_port_added_listener(
 		bt_graph *graph,
 		bt_graph_filter_component_output_port_added_listener_func listener,
-		bt_graph_listener_removed_func listener_removed, void *data,
-		bt_listener_id *listener_id);
-
-extern bt_graph_add_listener_status
-bt_graph_add_source_filter_component_ports_connected_listener(
-		bt_graph *graph,
-		bt_graph_source_filter_component_ports_connected_listener_func listener,
-		bt_graph_listener_removed_func listener_removed, void *data,
-		bt_listener_id *listener_id);
-
-extern bt_graph_add_listener_status
-bt_graph_add_filter_filter_component_ports_connected_listener(
-		bt_graph *graph,
-		bt_graph_filter_filter_component_ports_connected_listener_func listener,
-		bt_graph_listener_removed_func listener_removed, void *data,
-		bt_listener_id *listener_id);
-
-extern bt_graph_add_listener_status
-bt_graph_add_source_sink_component_ports_connected_listener(
-		bt_graph *graph,
-		bt_graph_source_sink_component_ports_connected_listener_func listener,
-		bt_graph_listener_removed_func listener_removed, void *data,
-		bt_listener_id *listener_id);
-
-extern bt_graph_add_listener_status
-bt_graph_add_filter_sink_component_ports_connected_listener(
-		bt_graph *graph,
-		bt_graph_filter_sink_component_ports_connected_listener_func listener,
-		bt_graph_listener_removed_func listener_removed, void *data,
-		bt_listener_id *listener_id);
+		void *data, bt_listener_id *listener_id);
 
 typedef enum bt_graph_add_interrupter_status {
 	BT_GRAPH_ADD_INTERRUPTER_STATUS_OK		= __BT_FUNC_STATUS_OK,
@@ -275,7 +240,7 @@ typedef enum bt_graph_add_interrupter_status {
 extern bt_graph_add_interrupter_status bt_graph_add_interrupter(bt_graph *graph,
 		const bt_interrupter *interrupter);
 
-extern void bt_graph_interrupt(bt_graph *graph);
+extern bt_interrupter *bt_graph_borrow_default_interrupter(bt_graph *graph);
 
 #ifdef __cplusplus
 }