X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=src%2Fbindings%2Fpython%2Fbt2%2Fbt2%2Ftrace_class.py;h=e99874499d6c9f1d3b1b93fa694aaa34011b8320;hp=9146efacb927b7389857ae189ed7baf8ba18ea57;hb=0235b0db7de5bcacdb3650c92461f2ce5eb2143d;hpb=1114a7d5b648102b0b37febe9d0d76a97e336240 diff --git a/src/bindings/python/bt2/bt2/trace_class.py b/src/bindings/python/bt2/bt2/trace_class.py index 9146efac..e9987449 100644 --- a/src/bindings/python/bt2/bt2/trace_class.py +++ b/src/bindings/python/bt2/bt2/trace_class.py @@ -1,30 +1,13 @@ -# The MIT License (MIT) +# SPDX-License-Identifier: MIT # # Copyright (c) 2017 Philippe Proulx # Copyright (c) 2018 Francis Deslauriers # Copyright (c) 2019 Simon Marchi -# -# 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, utils, object from bt2 import stream_class as bt2_stream_class from bt2 import field_class as bt2_field_class +from bt2 import integer_range_set as bt2_integer_range_set from bt2 import trace as bt2_trace from bt2 import value as bt2_value import collections.abc @@ -32,9 +15,12 @@ import functools import bt2 -def _trace_class_destruction_listener_from_native(user_listener, trace_class_ptr): +def _trace_class_destruction_listener_from_native( + user_listener, handle, trace_class_ptr +): trace_class = _TraceClass._create_from_ptr_and_get_ref(trace_class_ptr) user_listener(trace_class) + handle._invalidate() class _TraceClassConst(object._SharedObject, collections.abc.Mapping): @@ -99,24 +85,28 @@ class _TraceClassConst(object._SharedObject, collections.abc.Mapping): if not callable(listener): raise TypeError("'listener' parameter is not callable") - fn = native_bt.bt2_trace_class_add_destruction_listener + handle = utils._ListenerHandle(self.addr) + listener_from_native = functools.partial( - _trace_class_destruction_listener_from_native, listener + _trace_class_destruction_listener_from_native, listener, handle ) + fn = native_bt.bt2_trace_class_add_destruction_listener status, listener_id = fn(self._ptr, listener_from_native) utils._handle_func_status( status, 'cannot add destruction listener to trace class 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._obj.addr != self.addr: + if listener_handle._addr != self.addr: raise ValueError( - 'This trace class destruction listener does not match the trace object.' + 'This trace class destruction listener does not match the trace class object.' ) if listener_handle._listener_id is None: @@ -128,7 +118,7 @@ class _TraceClassConst(object._SharedObject, collections.abc.Mapping): self._ptr, listener_handle._listener_id ) utils._handle_func_status(status) - listener_handle._listener_id = None + listener_handle._invalidate() class _TraceClass(_TraceClassConst): @@ -189,6 +179,23 @@ class _TraceClass(_TraceClassConst): supports_discarded_packets=False, discarded_packets_have_default_clock_snapshots=False, ): + # Validate parameters before we create the object. + bt2_stream_class._StreamClass._validate_create_params( + name, + user_attributes, + packet_context_field_class, + event_common_context_field_class, + default_clock_class, + assigns_automatic_event_class_id, + assigns_automatic_stream_id, + supports_packets, + packets_have_beginning_default_clock_snapshot, + packets_have_end_default_clock_snapshot, + supports_discarded_events, + discarded_events_have_default_clock_snapshots, + supports_discarded_packets, + discarded_packets_have_default_clock_snapshots, + ) if self.assigns_automatic_stream_class_id: if id is not None: @@ -368,13 +375,26 @@ class _TraceClass(_TraceClassConst): user_attributes, ) - def create_real_field_class(self, is_single_precision=False, user_attributes=None): - field_class_ptr = native_bt.field_class_real_create(self._ptr) - self._check_field_class_create_status(field_class_ptr, 'real') + def create_single_precision_real_field_class(self, user_attributes=None): + field_class_ptr = native_bt.field_class_real_single_precision_create(self._ptr) + self._check_field_class_create_status(field_class_ptr, 'single-precision real') - field_class = bt2_field_class._RealFieldClass._create_from_ptr(field_class_ptr) + field_class = bt2_field_class._SinglePrecisionRealFieldClass._create_from_ptr( + field_class_ptr + ) + + self._set_field_class_user_attrs(field_class, user_attributes) + + return field_class + + def create_double_precision_real_field_class(self, user_attributes=None): + field_class_ptr = native_bt.field_class_real_double_precision_create(self._ptr) + self._check_field_class_create_status(field_class_ptr, 'double-precision real') + + field_class = bt2_field_class._DoublePrecisionRealFieldClass._create_from_ptr( + field_class_ptr + ) - field_class._is_single_precision = is_single_precision self._set_field_class_user_attrs(field_class, user_attributes) return field_class @@ -416,24 +436,57 @@ class _TraceClass(_TraceClassConst): self._ptr, elem_fc._ptr, length_fc_ptr ) self._check_field_class_create_status(ptr, 'dynamic array') - fc = bt2_field_class._DynamicArrayFieldClass._create_from_ptr(ptr) + fc = bt2_field_class._create_field_class_from_ptr_and_get_ref(ptr) + self._set_field_class_user_attrs(fc, user_attributes) + return fc + + def create_option_without_selector_field_class( + self, content_fc, user_attributes=None + ): + utils._check_type(content_fc, bt2_field_class._FieldClass) + ptr = native_bt.field_class_option_without_selector_create( + self._ptr, content_fc._ptr + ) + self._check_field_class_create_status(ptr, 'option') + fc = bt2_field_class._create_field_class_from_ptr_and_get_ref(ptr) + self._set_field_class_user_attrs(fc, user_attributes) + return fc + + def create_option_with_bool_selector_field_class( + self, content_fc, selector_fc, selector_is_reversed=False, user_attributes=None + ): + utils._check_type(content_fc, bt2_field_class._FieldClass) + utils._check_bool(selector_is_reversed) + utils._check_type(selector_fc, bt2_field_class._BoolFieldClass) + ptr = native_bt.field_class_option_with_selector_field_bool_create( + self._ptr, content_fc._ptr, selector_fc._ptr + ) + self._check_field_class_create_status(ptr, 'option') + fc = bt2_field_class._create_field_class_from_ptr_and_get_ref(ptr) self._set_field_class_user_attrs(fc, user_attributes) + fc._selector_is_reversed = selector_is_reversed return fc - def create_option_field_class( - self, content_fc, selector_fc=None, user_attributes=None + def create_option_with_integer_selector_field_class( + self, content_fc, selector_fc, ranges, user_attributes=None ): utils._check_type(content_fc, bt2_field_class._FieldClass) + utils._check_type(selector_fc, bt2_field_class._IntegerFieldClass) - selector_fc_ptr = None + if len(ranges) == 0: + raise ValueError('integer range set is empty') - if selector_fc is not None: - utils._check_type(selector_fc, bt2_field_class._BoolFieldClass) - selector_fc_ptr = selector_fc._ptr + if isinstance(selector_fc, bt2_field_class._UnsignedIntegerFieldClass): + utils._check_type(ranges, bt2_integer_range_set.UnsignedIntegerRangeSet) + ptr = native_bt.field_class_option_with_selector_field_integer_unsigned_create( + self._ptr, content_fc._ptr, selector_fc._ptr, ranges._ptr + ) + else: + utils._check_type(ranges, bt2_integer_range_set.SignedIntegerRangeSet) + ptr = native_bt.field_class_option_with_selector_field_integer_signed_create( + self._ptr, content_fc._ptr, selector_fc._ptr, ranges._ptr + ) - ptr = native_bt.field_class_option_create( - self._ptr, content_fc._ptr, selector_fc_ptr - ) self._check_field_class_create_status(ptr, 'option') fc = bt2_field_class._create_field_class_from_ptr_and_get_ref(ptr) self._set_field_class_user_attrs(fc, user_attributes)