X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=include%2Fbabeltrace2%2Fgraph%2Fquery-executor.h;h=ef250462cc5fa79776291468c608110a07780012;hb=9b4f9b425f2efce9a6ccc25f7ae062ebc1116a7d;hp=6618f3c6aa39a8efcade45ac97b3f96a0007b6d7;hpb=959b3d46dc042fe1df34592f528f866dd200f395;p=babeltrace.git

diff --git a/include/babeltrace2/graph/query-executor.h b/include/babeltrace2/graph/query-executor.h
index 6618f3c6..ef250462 100644
--- 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
@@ -40,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,
@@ -55,13 +53,16 @@ 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
 }