Fix: src.ctf.fs: initialize the other_entry variable

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

diff --git a/src/bindings/python/bt2/bt2/trace.py b/src/bindings/python/bt2/bt2/trace.py
index 23e5419ca18612fb28067d2f3d94a70f9534cacd..618899061bd30f77722d03be00dbebaebe70c665 100644 (file)
--- a/src/bindings/python/bt2/bt2/trace.py
+++ b/src/bindings/python/bt2/bt2/trace.py
@@ -24,13 +24,18 @@ from bt2 import native_bt, object, utils
 import collections.abc
 from bt2 import value as bt2_value
 from bt2 import stream as bt2_stream
-from bt2 import trace_class as bt2_trace_class
 from bt2 import stream_class as bt2_stream_class
 import bt2
 import functools
 import uuid as uuidp
 
 
+def _bt2_trace_class():
+    from bt2 import trace_class as bt2_trace_class
+
+    return bt2_trace_class
+
+
 class _TraceEnvironmentConst(collections.abc.Mapping):
     _create_value_from_ptr_and_get_ref = staticmethod(
         bt2_value._create_from_const_ptr_and_get_ref
@@ -100,7 +105,7 @@ class _TraceConst(object._SharedObject, collections.abc.Mapping):
         bt2_value._create_from_const_ptr_and_get_ref
     )
     _stream_pycls = property(lambda _: bt2_stream._StreamConst)
-    _trace_class_pycls = property(lambda _: bt2_trace_class._TraceClassConst)
+    _trace_class_pycls = property(lambda _: _bt2_trace_class()._TraceClassConst)
     _trace_env_pycls = property(lambda _: _TraceEnvironmentConst)
 
     def __len__(self):
@@ -161,9 +166,11 @@ class _TraceConst(object._SharedObject, collections.abc.Mapping):
         if not callable(listener):
             raise TypeError("'listener' parameter is not callable")
 
+        handle = utils._ListenerHandle(self.addr)
+
         fn = native_bt.bt2_trace_add_destruction_listener
         listener_from_native = functools.partial(
-            _trace_destruction_listener_from_native, listener
+            _trace_destruction_listener_from_native, listener, handle
         )
 
         status, listener_id = fn(self._ptr, listener_from_native)
@@ -171,7 +178,26 @@ class _TraceConst(object._SharedObject, collections.abc.Mapping):
             status, 'cannot add destruction listener to trace object'
         )
 
-        return utils._ListenerHandle(listener_id, self)
+        handle._set_listener_id(listener_id)
+
+        return handle
+
+    def remove_destruction_listener(self, listener_handle):
+        utils._check_type(listener_handle, utils._ListenerHandle)
+
+        if listener_handle._addr != self.addr:
+            raise ValueError(
+                'This trace destruction listener does not match the trace object.'
+            )
+
+        if listener_handle._listener_id is None:
+            raise ValueError('This trace destruction listener was already removed.')
+
+        status = native_bt.trace_remove_destruction_listener(
+            self._ptr, listener_handle._listener_id
+        )
+        utils._handle_func_status(status)
+        listener_handle._invalidate()
 
 
 class _Trace(_TraceConst):
@@ -183,7 +209,7 @@ class _Trace(_TraceConst):
         bt2_value._create_from_ptr_and_get_ref
     )
     _stream_pycls = property(lambda _: bt2_stream._Stream)
-    _trace_class_pycls = property(lambda _: bt2_trace_class._TraceClass)
+    _trace_class_pycls = property(lambda _: _bt2_trace_class()._TraceClass)
     _trace_env_pycls = property(lambda _: _TraceEnvironment)
 
     def _name(self, name):
@@ -241,6 +267,7 @@ class _Trace(_TraceConst):
         return stream
 
 
-def _trace_destruction_listener_from_native(user_listener, trace_ptr):
+def _trace_destruction_listener_from_native(user_listener, handle, trace_ptr):
     trace = _TraceConst._create_from_ptr_and_get_ref(trace_ptr)
     user_listener(trace)
+    handle._invalidate()