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 072410fbbd481c4cc2122de971228b27c96355e0..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
@@ -30,41 +31,33 @@ class QueryExecutor(object._SharedObject):
     _get_ref = staticmethod(native_bt.query_executor_get_ref)
     _put_ref = staticmethod(native_bt.query_executor_put_ref)
 
-    def _handle_status(self, status, gen_error_msg):
-        if status == native_bt.QUERY_EXECUTOR_STATUS_AGAIN:
-            raise bt2.TryAgain
-        elif status == native_bt.QUERY_EXECUTOR_STATUS_CANCELED:
-            raise bt2.QueryExecutorCanceled
-        elif status == native_bt.QUERY_EXECUTOR_STATUS_INVALID_OBJECT:
-            raise bt2.InvalidQueryObject
-        elif status == native_bt.QUERY_EXECUTOR_STATUS_INVALID_PARAMS:
-            raise bt2.InvalidQueryParams
-        elif status < 0:
-            raise bt2.Error(gen_error_msg)
-
     def __init__(self):
         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)
-        self._handle_status(status, 'cannot cancel query executor object')
-
-    @property
-    def is_canceled(self):
-        is_canceled = native_bt.query_executor_is_canceled(self._ptr)
-        assert(is_canceled >= 0)
-        return is_canceled > 0
+    def add_interrupter(self, interrupter):
+        utils._check_type(interrupter, bt2.interrupter.Interrupter)
+        native_bt.query_executor_add_interrupter(self._ptr, interrupter._ptr)
 
-    def query(self, component_class, object, params=None,
-              logging_level=bt2.logging.LoggingLevel.NONE):
-        if self.is_canceled:
-            raise bt2.QueryExecutorCanceled
+    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
 
@@ -87,11 +80,11 @@ class QueryExecutor(object._SharedObject):
             params_ptr = params._ptr
 
         utils._check_log_level(logging_level)
-        cc_ptr = component_class._component_class_ptr()
+        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)
-        self._handle_status(status, 'cannot query component class')
-        assert(result_ptr)
+        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
         return bt2.value._create_from_ptr(result_ptr)