X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fbindings%2Fpython%2Fbt2%2Fbt2%2Futils.py;h=393f7ed883ec94f651355b7250d02601b190ff1f;hb=f5567ea88d172767b34373bc6e402da8bfd85ef8;hp=abb9accfdee8b73ea3497737e99d96ff2c4f0590;hpb=a635e50750a3c1e8907b38c8311dc0b8bb0f09c3;p=babeltrace.git

diff --git a/src/bindings/python/bt2/bt2/utils.py b/src/bindings/python/bt2/bt2/utils.py
index abb9accf..393f7ed8 100644
--- a/src/bindings/python/bt2/bt2/utils.py
+++ b/src/bindings/python/bt2/bt2/utils.py
@@ -1,27 +1,9 @@
-# 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
 
 
@@ -54,7 +36,7 @@ def _check_type(o, expected_type):
 
 def _is_in_int64_range(v):
     assert isinstance(v, int)
-    return v >= -(2 ** 63) and v <= (2 ** 63 - 1)
+    return v >= -(2**63) and v <= (2**63 - 1)
 
 
 def _is_int64(v):
@@ -66,7 +48,7 @@ def _is_int64(v):
 
 def _is_in_uint64_range(v):
     assert isinstance(v, int)
-    return v >= 0 and v <= (2 ** 64 - 1)
+    return v >= 0 and v <= (2**64 - 1)
 
 
 def _is_uint64(v):
@@ -81,9 +63,9 @@ def _check_int64(v, msg=None):
 
     if not _is_in_int64_range(v):
         if msg is None:
-            msg = 'expecting a signed 64-bit integral value'
+            msg = "expecting a signed 64-bit integral value"
 
-        msg += ' (got {})'.format(v)
+        msg += " (got {})".format(v)
         raise ValueError(msg)
 
 
@@ -92,9 +74,9 @@ def _check_uint64(v, msg=None):
 
     if not _is_in_uint64_range(v):
         if msg is None:
-            msg = 'expecting an unsigned 64-bit integral value'
+            msg = "expecting an unsigned 64-bit integral value"
 
-        msg += ' (got {})'.format(v)
+        msg += " (got {})".format(v)
         raise ValueError(msg)
 
 
@@ -110,20 +92,20 @@ def _check_alignment(a):
     _check_uint64(a)
 
     if not _is_pow2(a):
-        raise ValueError('{} is not a power of two'.format(a))
+        raise ValueError("{} is not a power of two".format(a))
 
 
 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.WARNING,
-        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:
@@ -151,15 +133,27 @@ def _handle_func_status(status, msg=None):
             raise bt2.TryAgain
         else:
             raise bt2.TryAgain(msg)
-    elif status == native_bt.__BT_FUNC_STATUS_OVERFLOW:
+    elif status == native_bt.__BT_FUNC_STATUS_OVERFLOW_ERROR:
         if msg is None:
-            raise bt2.OverflowError
+            raise bt2._OverflowError
         else:
-            raise bt2.OverflowError(msg)
-    elif status == native_bt.__BT_FUNC_STATUS_INVALID_OBJECT:
+            raise bt2._OverflowError(msg)
+    elif status == native_bt.__BT_FUNC_STATUS_UNKNOWN_OBJECT:
         if msg is None:
-            raise bt2.InvalidObject
+            raise bt2.UnknownObject
         else:
-            raise bt2.InvalidObject(msg)
+            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