X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=src%2Fbindings%2Fpython%2Fbt2%2Fbt2%2Futils.py;h=b53032d91cf7455fda5b710b74e99fb21f3b6d30;hp=636e92134f305fe679c9dafa5767e1c368303c53;hb=0235b0db7de5bcacdb3650c92461f2ce5eb2143d;hpb=ef267d12284b855bc52ee429a5dc12da1d1e3b95

diff --git a/src/bindings/python/bt2/bt2/utils.py b/src/bindings/python/bt2/bt2/utils.py
index 636e9213..b53032d9 100644
--- a/src/bindings/python/bt2/bt2/utils.py
+++ b/src/bindings/python/bt2/bt2/utils.py
@@ -1,27 +1,10 @@
-# The MIT License (MIT)
+# SPDX-License-Identifier: MIT
 #
 # Copyright (c) 2017 Philippe Proulx <pproulx@efficios.com>
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
 
 import bt2
-import bt2.logging
+from bt2 import logging as bt2_logging
+from bt2 import native_bt
 
 
 def _check_bool(o):
@@ -46,13 +29,14 @@ def _check_str(o):
 
 def _check_type(o, expected_type):
     if not isinstance(o, expected_type):
-        raise TypeError("'{}' is not a '{}' object".format(o.__class__.__name__,
-                                                           expected_type))
+        raise TypeError(
+            "'{}' is not a '{}' object".format(o.__class__.__name__, expected_type)
+        )
 
 
 def _is_in_int64_range(v):
-    assert(isinstance(v, int))
-    return v >= -(2**63) and v <= (2**63 - 1)
+    assert isinstance(v, int)
+    return v >= -(2 ** 63) and v <= (2 ** 63 - 1)
 
 
 def _is_int64(v):
@@ -63,8 +47,8 @@ def _is_int64(v):
 
 
 def _is_in_uint64_range(v):
-    assert(isinstance(v, int))
-    return v >= 0 and v <= (2**64 - 1)
+    assert isinstance(v, int)
+    return v >= 0 and v <= (2 ** 64 - 1)
 
 
 def _is_uint64(v):
@@ -111,35 +95,65 @@ def _check_alignment(a):
         raise ValueError('{} is not a power of two'.format(a))
 
 
-def _raise_bt2_error(msg):
-    if msg is None:
-        raise bt2.Error
-    else:
-        raise bt2.Error(msg)
-
-
-def _handle_ret(ret, msg=None):
-    if int(ret) < 0:
-        _raise_bt2_error(msg)
-
-
-def _handle_ptr(ptr, msg=None):
-    if ptr is None:
-        _raise_bt2_error(msg)
-
-
 def _check_log_level(log_level):
     _check_int(log_level)
 
     log_levels = (
-        bt2.logging.LoggingLevel.TRACE,
-        bt2.logging.LoggingLevel.DEBUG,
-        bt2.logging.LoggingLevel.INFO,
-        bt2.logging.LoggingLevel.WARN,
-        bt2.logging.LoggingLevel.ERROR,
-        bt2.logging.LoggingLevel.FATAL,
-        bt2.logging.LoggingLevel.NONE,
+        bt2_logging.LoggingLevel.TRACE,
+        bt2_logging.LoggingLevel.DEBUG,
+        bt2_logging.LoggingLevel.INFO,
+        bt2_logging.LoggingLevel.WARNING,
+        bt2_logging.LoggingLevel.ERROR,
+        bt2_logging.LoggingLevel.FATAL,
+        bt2_logging.LoggingLevel.NONE,
     )
 
     if log_level not in log_levels:
         raise ValueError("'{}' is not a valid logging level".format(log_level))
+
+
+def _handle_func_status(status, msg=None):
+    if status == native_bt.__BT_FUNC_STATUS_OK:
+        # no error
+        return
+
+    if status == native_bt.__BT_FUNC_STATUS_ERROR:
+        assert msg is not None
+        raise bt2._Error(msg)
+    elif status == native_bt.__BT_FUNC_STATUS_MEMORY_ERROR:
+        assert msg is not None
+        raise bt2._MemoryError(msg)
+    elif status == native_bt.__BT_FUNC_STATUS_END:
+        if msg is None:
+            raise bt2.Stop
+        else:
+            raise bt2.Stop(msg)
+    elif status == native_bt.__BT_FUNC_STATUS_AGAIN:
+        if msg is None:
+            raise bt2.TryAgain
+        else:
+            raise bt2.TryAgain(msg)
+    elif status == native_bt.__BT_FUNC_STATUS_OVERFLOW_ERROR:
+        if msg is None:
+            raise bt2._OverflowError
+        else:
+            raise bt2._OverflowError(msg)
+    elif status == native_bt.__BT_FUNC_STATUS_UNKNOWN_OBJECT:
+        if msg is None:
+            raise bt2.UnknownObject
+        else:
+            raise bt2.UnknownObject(msg)
+    else:
+        assert False
+
+
+class _ListenerHandle:
+    def __init__(self, addr):
+        self._addr = addr
+        self._listener_id = None
+
+    def _set_listener_id(self, listener_id):
+        self._listener_id = listener_id
+
+    def _invalidate(self):
+        self._listener_id = None