lib: rename "self comp. input port message iter." -> "message iterator"

[babeltrace.git] / include / babeltrace2 / graph / graph.h

diff --git a/include/babeltrace2/graph/graph.h b/include/babeltrace2/graph/graph.h
index e4d53e6e661816e12d7ce5fb2410ee49a6e1183c..d562e366e41ace21e3efe49da982d8115eaf8e28 100644 (file)
--- a/include/babeltrace2/graph/graph.h
+++ b/include/babeltrace2/graph/graph.h
@@ -89,8 +89,6 @@ 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_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,
@@ -99,7 +97,7 @@ typedef enum 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_self_component_port_input_message_iterator *iterator,
+               bt_message_iterator *iterator,
                void *data);
 
 typedef enum bt_graph_simple_sink_component_consume_func_status {
@@ -112,7 +110,7 @@ typedef enum 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);
@@ -214,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,
@@ -274,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
 }