lib: remove bt_query_executor_interrupt, add bt_query_executor_borrow_default_interrupter

[babeltrace.git] / include / babeltrace2 / graph / query-executor.h

diff --git a/include/babeltrace2/graph/query-executor.h b/include/babeltrace2/graph/query-executor.h
index 332bd62b340223f349031cde25ee64512fe6222a..c393e6ec7668c9a08d408f8aaf6972c3e40401a9 100644 (file)
--- a/include/babeltrace2/graph/query-executor.h
+++ b/include/babeltrace2/graph/query-executor.h
@@ -35,33 +35,47 @@ extern "C" {
 #endif
 
 extern
-bt_query_executor *bt_query_executor_create(void);
+bt_query_executor *bt_query_executor_create(
+               const bt_component_class *component_class, const char *object,
+               const bt_value *params);
+
+extern
+bt_query_executor *bt_query_executor_create_with_method_data(
+               const bt_component_class *component_class, const char *object,
+               const bt_value *params, void *method_data);
 
 typedef enum bt_query_executor_query_status {
        BT_QUERY_EXECUTOR_QUERY_STATUS_OK               = __BT_FUNC_STATUS_OK,
        BT_QUERY_EXECUTOR_QUERY_STATUS_AGAIN            = __BT_FUNC_STATUS_AGAIN,
-       BT_QUERY_EXECUTOR_QUERY_STATUS_CANCELED         = __BT_FUNC_STATUS_CANCELED,
        BT_QUERY_EXECUTOR_QUERY_STATUS_ERROR            = __BT_FUNC_STATUS_ERROR,
        BT_QUERY_EXECUTOR_QUERY_STATUS_MEMORY_ERROR     = __BT_FUNC_STATUS_MEMORY_ERROR,
-       BT_QUERY_EXECUTOR_QUERY_STATUS_INVALID_OBJECT   = __BT_FUNC_STATUS_INVALID_OBJECT,
-       BT_QUERY_EXECUTOR_QUERY_STATUS_INVALID_PARAMS   = __BT_FUNC_STATUS_INVALID_PARAMS,
+       BT_QUERY_EXECUTOR_QUERY_STATUS_UNKNOWN_OBJECT   = __BT_FUNC_STATUS_UNKNOWN_OBJECT,
 } bt_query_executor_query_status;
 
 extern
 bt_query_executor_query_status bt_query_executor_query(
-               bt_query_executor *query_executor,
-               const bt_component_class *component_class,
-               const char *object, const bt_value *params,
-               bt_logging_level logging_level, const bt_value **result);
+               bt_query_executor *query_executor, const bt_value **result);
 
-typedef enum bt_query_executor_cancel_status {
-       BT_QUERY_EXECUTOR_CANCEL_STATUS_OK      = __BT_FUNC_STATUS_OK,
-} bt_query_executor_cancel_status;
+typedef enum bt_query_executor_add_interrupter_status {
+       BT_QUERY_EXECUTOR_ADD_INTERRUPTER_STATUS_OK             = __BT_FUNC_STATUS_OK,
+       BT_QUERY_EXECUTOR_ADD_INTERRUPTER_STATUS_MEMORY_ERROR   = __BT_FUNC_STATUS_MEMORY_ERROR,
+} bt_query_executor_add_interrupter_status;
 
-extern
-bt_query_executor_cancel_status bt_query_executor_cancel(
+extern bt_query_executor_add_interrupter_status
+bt_query_executor_add_interrupter(bt_query_executor *query_executor,
+               const bt_interrupter *interrupter);
+
+extern bt_interrupter *bt_query_executor_borrow_default_interrupter(
                bt_query_executor *query_executor);
 
+typedef enum bt_query_executor_set_logging_level_status {
+       BT_QUERY_EXECUTOR_SET_LOGGING_LEVEL_STATUS_OK   = __BT_FUNC_STATUS_OK,
+} bt_query_executor_set_logging_level_status;
+
+extern bt_query_executor_set_logging_level_status
+bt_query_executor_set_logging_level(bt_query_executor *query_executor,
+               bt_logging_level logging_level);
+
 #ifdef __cplusplus
 }
 #endif