lib: add bt_{graph,query_executor}_add_interrupter()

[babeltrace.git] / src / bindings / python / bt2 / bt2 / query_executor.py

diff --git a/src/bindings/python/bt2/bt2/query_executor.py b/src/bindings/python/bt2/bt2/query_executor.py
index f734609e1ff6d2d99c875a34be4a6fa99f70cead..e9d3d761b16fba6f0a251598412737193c303cea 100644 (file)
--- a/src/bindings/python/bt2/bt2/query_executor.py
+++ b/src/bindings/python/bt2/bt2/query_executor.py
@@ -21,6 +21,7 @@
 # THE SOFTWARE.
 
 from bt2 import native_bt, object, utils
+import bt2.interrupter
 import bt2.component
 import bt2.logging
 import bt2
@@ -34,26 +35,29 @@ class QueryExecutor(object._SharedObject):
         ptr = native_bt.query_executor_create()
 
         if ptr is None:
-            raise bt2.CreationError('cannot create query executor object')
+            raise bt2._MemoryError('cannot create query executor object')
 
         super().__init__(ptr)
 
-    def cancel(self):
-        status = native_bt.query_executor_cancel(self._ptr)
-        utils._handle_func_status(status,
-                                  'cannot cancel query executor object')
+    def add_interrupter(self, interrupter):
+        utils._check_type(interrupter, bt2.interrupter.Interrupter)
+        native_bt.query_executor_add_interrupter(self._ptr, interrupter._ptr)
 
-    @property
-    def is_canceled(self):
-        is_canceled = native_bt.query_executor_is_canceled(self._ptr)
-        assert(is_canceled >= 0)
-        return is_canceled > 0
-
-    def query(self, component_class, object, params=None,
-              logging_level=bt2.logging.LoggingLevel.NONE):
-        if self.is_canceled:
-            raise bt2.Canceled
+    def interrupt(self):
+        native_bt.query_executor_interrupt(self._ptr)
 
+    @property
+    def is_interrupted(self):
+        is_interrupted = native_bt.query_executor_is_interrupted(self._ptr)
+        return bool(is_interrupted)
+
+    def query(
+        self,
+        component_class,
+        object,
+        params=None,
+        logging_level=bt2.logging.LoggingLevel.NONE,
+    ):
         if not isinstance(component_class, bt2.component._GenericComponentClass):
             err = False
 
@@ -78,9 +82,9 @@ class QueryExecutor(object._SharedObject):
         utils._check_log_level(logging_level)
         cc_ptr = component_class._bt_component_class_ptr()
 
-        status, result_ptr = native_bt.query_executor_query(self._ptr, cc_ptr,
-                                                            object, params_ptr,
-                                                            logging_level)
+        status, result_ptr = native_bt.query_executor_query(
+            self._ptr, cc_ptr, object, params_ptr, logging_level
+        )
         utils._handle_func_status(status, 'cannot query component class')
-        assert(result_ptr)
+        assert result_ptr
         return bt2.value._create_from_ptr(result_ptr)