X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fbindings%2Fpython%2Fbt2%2Fbt2%2Ftrace.py;h=5cbe82c64d6eda6f1e996a2b2071ede0bdab4cd8;hb=e5914347c8eea0f26c07348d0ac64dbe020de44a;hp=b25c8b822a2b1e7a88a1e619a5e68fd2f585f0b2;hpb=7993562851b443afb3801e5bf2b88d674734808b;p=babeltrace.git diff --git a/src/bindings/python/bt2/bt2/trace.py b/src/bindings/python/bt2/bt2/trace.py index b25c8b82..5cbe82c6 100644 --- a/src/bindings/python/bt2/bt2/trace.py +++ b/src/bindings/python/bt2/bt2/trace.py @@ -1,26 +1,10 @@ -# The MIT License (MIT) +# SPDX-License-Identifier: MIT # # Copyright (c) 2017 Philippe Proulx -# -# 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. - -from bt2 import native_bt, object, utils + +from bt2 import native_bt +from bt2 import object as bt2_object +from bt2 import utils as bt2_utils import collections.abc from bt2 import value as bt2_value from bt2 import stream as bt2_stream @@ -45,7 +29,7 @@ class _TraceEnvironmentConst(collections.abc.Mapping): self._trace = trace def __getitem__(self, key): - utils._check_str(key) + bt2_utils._check_str(key) borrow_entry_fn = native_bt.trace_borrow_environment_entry_value_by_name_const value_ptr = borrow_entry_fn(self._trace._ptr, key) @@ -81,18 +65,26 @@ class _TraceEnvironment(_TraceEnvironmentConst, collections.abc.MutableMapping): elif isinstance(value, int): set_env_entry_fn = native_bt.trace_set_environment_entry_integer else: - raise TypeError('expected str or int, got {}'.format(type(value))) + raise TypeError("expected str or int, got {}".format(type(value))) status = set_env_entry_fn(self._trace._ptr, key, value) - utils._handle_func_status(status, "cannot set trace object's environment entry") + bt2_utils._handle_func_status( + status, "cannot set trace object's environment entry" + ) def __delitem__(self, key): raise NotImplementedError -class _TraceConst(object._SharedObject, collections.abc.Mapping): - _get_ref = staticmethod(native_bt.trace_get_ref) - _put_ref = staticmethod(native_bt.trace_put_ref) +class _TraceConst(bt2_object._SharedObject, collections.abc.Mapping): + @staticmethod + def _get_ref(ptr): + native_bt.trace_get_ref(ptr) + + @staticmethod + def _put_ref(ptr): + native_bt.trace_put_ref(ptr) + _borrow_stream_ptr_by_id = staticmethod(native_bt.trace_borrow_stream_by_id_const) _borrow_stream_ptr_by_index = staticmethod( native_bt.trace_borrow_stream_by_index_const @@ -114,7 +106,7 @@ class _TraceConst(object._SharedObject, collections.abc.Mapping): return count def __getitem__(self, id): - utils._check_uint64(id) + bt2_utils._check_uint64(id) stream_ptr = self._borrow_stream_ptr_by_id(self._ptr, id) @@ -162,21 +154,42 @@ class _TraceConst(object._SharedObject, collections.abc.Mapping): return self._trace_env_pycls(self) def add_destruction_listener(self, listener): - '''Add a listener to be called when the trace is destroyed.''' + """Add a listener to be called when the trace is destroyed.""" if not callable(listener): raise TypeError("'listener' parameter is not callable") + handle = bt2_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) - utils._handle_func_status( - status, 'cannot add destruction listener to trace object' + bt2_utils._handle_func_status( + 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): + bt2_utils._check_type(listener_handle, bt2_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 + ) + bt2_utils._handle_func_status(status) + listener_handle._invalidate() class _Trace(_TraceConst): @@ -192,27 +205,27 @@ class _Trace(_TraceConst): _trace_env_pycls = property(lambda _: _TraceEnvironment) def _name(self, name): - utils._check_str(name) + bt2_utils._check_str(name) status = native_bt.trace_set_name(self._ptr, name) - utils._handle_func_status(status, "cannot set trace class object's name") + bt2_utils._handle_func_status(status, "cannot set trace class object's name") _name = property(fset=_name) def _user_attributes(self, user_attributes): value = bt2_value.create_value(user_attributes) - utils._check_type(value, bt2_value.MapValue) + bt2_utils._check_type(value, bt2_value.MapValue) native_bt.trace_set_user_attributes(self._ptr, value._ptr) _user_attributes = property(fset=_user_attributes) def _uuid(self, uuid): - utils._check_type(uuid, uuidp.UUID) + bt2_utils._check_type(uuid, uuidp.UUID) native_bt.trace_set_uuid(self._ptr, uuid.bytes) _uuid = property(fset=_uuid) def create_stream(self, stream_class, id=None, name=None, user_attributes=None): - utils._check_type(stream_class, bt2_stream_class._StreamClass) + bt2_utils._check_type(stream_class, bt2_stream_class._StreamClass) if stream_class.assigns_automatic_stream_id: if id is not None: @@ -227,13 +240,13 @@ class _Trace(_TraceConst): "id not provided, but stream class does not assign automatic stream ids" ) - utils._check_uint64(id) + bt2_utils._check_uint64(id) stream_ptr = native_bt.stream_create_with_id( stream_class._ptr, self._ptr, id ) if stream_ptr is None: - raise bt2._MemoryError('cannot create stream object') + raise bt2._MemoryError("cannot create stream object") stream = bt2_stream._Stream._create_from_ptr(stream_ptr) @@ -246,6 +259,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()