X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=include%2Fbabeltrace2%2Fgraph%2Fgraph.h;h=d562e366e41ace21e3efe49da982d8115eaf8e28;hb=9a2c8b8e0cb6579066b4b8ceb8255cdd5175bb2d;hp=800592950d39e0cf7c1a1793cae9678a7fd6331a;hpb=2054a0d13fbfba65d23d17a1e35c9dd62f28c2ab;p=babeltrace.git diff --git a/include/babeltrace2/graph/graph.h b/include/babeltrace2/graph/graph.h index 80059295..d562e366 100644 --- a/include/babeltrace2/graph/graph.h +++ b/include/babeltrace2/graph/graph.h @@ -89,9 +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_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_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_message_iterator *iterator, + void *data); -extern bt_graph *bt_graph_create(void); +typedef void (*bt_graph_simple_sink_component_finalize_func)(void *data); + +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, @@ -106,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, @@ -121,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, @@ -136,12 +160,19 @@ 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, const bt_component_sink **component); +extern bt_graph_add_component_status +bt_graph_add_simple_sink_component(bt_graph *graph, const char *name, + 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); + typedef enum bt_graph_connect_ports_status { BT_GRAPH_CONNECT_PORTS_STATUS_OK = __BT_FUNC_STATUS_OK, BT_GRAPH_CONNECT_PORTS_STATUS_ERROR = __BT_FUNC_STATUS_ERROR, @@ -158,20 +189,19 @@ 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); -typedef enum bt_graph_consume_status { - BT_GRAPH_CONSUME_STATUS_OK = __BT_FUNC_STATUS_OK, - BT_GRAPH_CONSUME_STATUS_ERROR = __BT_FUNC_STATUS_ERROR, - BT_GRAPH_CONSUME_STATUS_MEMORY_ERROR = __BT_FUNC_STATUS_MEMORY_ERROR, - BT_GRAPH_CONSUME_STATUS_AGAIN = __BT_FUNC_STATUS_AGAIN, - BT_GRAPH_CONSUME_STATUS_END = __BT_FUNC_STATUS_END, -} bt_graph_consume_status; +typedef enum bt_graph_run_once_status { + BT_GRAPH_RUN_ONCE_STATUS_OK = __BT_FUNC_STATUS_OK, + BT_GRAPH_RUN_ONCE_STATUS_ERROR = __BT_FUNC_STATUS_ERROR, + BT_GRAPH_RUN_ONCE_STATUS_MEMORY_ERROR = __BT_FUNC_STATUS_MEMORY_ERROR, + BT_GRAPH_RUN_ONCE_STATUS_AGAIN = __BT_FUNC_STATUS_AGAIN, + BT_GRAPH_RUN_ONCE_STATUS_END = __BT_FUNC_STATUS_END, +} bt_graph_run_once_status; -extern bt_graph_consume_status bt_graph_consume(bt_graph *graph); +extern bt_graph_run_once_status bt_graph_run_once(bt_graph *graph); typedef enum bt_graph_add_listener_status { BT_GRAPH_ADD_LISTENER_STATUS_OK = __BT_FUNC_STATUS_OK, @@ -182,67 +212,35 @@ 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, - BT_GRAPH_ADD_INTERRUPTER_MEMORY_ERROR = __BT_FUNC_STATUS_MEMORY_ERROR, + BT_GRAPH_ADD_INTERRUPTER_STATUS_OK = __BT_FUNC_STATUS_OK, + BT_GRAPH_ADD_INTERRUPTER_STATUS_MEMORY_ERROR = __BT_FUNC_STATUS_MEMORY_ERROR, } 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 }