lib: add bt_{graph,query_executor}_add_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 c6a84101e3e9daf5e83a0d691038e22e89494b03..ef250462cc5fa79776291468c608110a07780012 100644 (file)
--- a/include/babeltrace2/graph/query-executor.h
+++ b/include/babeltrace2/graph/query-executor.h
@@ -2,7 +2,7 @@
 #define BABELTRACE2_GRAPH_QUERY_EXECUTOR_H
 
 /*
- * Copyright 2017-2018 Philippe Proulx <pproulx@efficios.com>
+ * Copyright (c) 2010-2019 EfficiOS Inc. and Linux Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -23,17 +23,13 @@
  * SOFTWARE.
  */
 
-/* For bt_query_executor, bt_component_class, bt_value */
-#include <babeltrace2/types.h>
+#ifndef __BT_IN_BABELTRACE_H
+# error "Please include <babeltrace2/babeltrace.h> instead."
+#endif
 
-/* For bt_logging_level */
+#include <babeltrace2/types.h>
 #include <babeltrace2/logging.h>
 
-/* For __BT_FUNC_STATUS_* */
-#define __BT_FUNC_STATUS_ENABLE
-#include <babeltrace2/func-status.h>
-#undef __BT_FUNC_STATUS_ENABLE
-
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -44,8 +40,6 @@ bt_query_executor *bt_query_executor_create(void);
 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_UNSUPPORTED      = __BT_FUNC_STATUS_UNSUPPORTED,
-       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,
@@ -59,18 +53,19 @@ bt_query_executor_query_status bt_query_executor_query(
                const char *object, const bt_value *params,
                bt_logging_level logging_level, 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_MEMORY_ERROR  = __BT_FUNC_STATUS_MEMORY_ERROR,
+} bt_query_executor_add_interrupter_status;
 
-extern
-bt_query_executor_cancel_status bt_query_executor_cancel(
-               bt_query_executor *query_executor);
+extern bt_query_executor_add_interrupter_status
+bt_query_executor_add_interrupter(bt_query_executor *query_executor,
+               const bt_interrupter *interrupter);
+
+extern void bt_query_executor_interrupt(bt_query_executor *query_executor);
 
 #ifdef __cplusplus
 }
 #endif
 
-#include <babeltrace2/undef-func-status.h>
-
 #endif /* BABELTRACE2_GRAPH_QUERY_EXECUTOR_H */