X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fbindings%2Fpython%2Fbt2%2Fbt2%2Ftrace_class.py;h=94010d47aa04aac8e2dc48795bf758a7dddf59e6;hb=67de22bafe6b7ad1f344a84c73bf1f4a90ea460a;hp=d510a36e1e2fbdddd96e94a5cbfb4f59847d4a52;hpb=fe4df857056b4a03898f1031f136359ce733b0f5;p=babeltrace.git diff --git a/src/bindings/python/bt2/bt2/trace_class.py b/src/bindings/python/bt2/bt2/trace_class.py index d510a36e..94010d47 100644 --- a/src/bindings/python/bt2/bt2/trace_class.py +++ b/src/bindings/python/bt2/bt2/trace_class.py @@ -25,6 +25,7 @@ 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 +33,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 +103,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 +136,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 +197,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: @@ -429,24 +454,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_field_class( - self, content_fc, selector_fc=None, user_attributes=None + 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 - selector_fc_ptr = None + 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 - if selector_fc is not None: - utils._check_type(selector_fc, bt2_field_class._BoolFieldClass) - selector_fc_ptr = selector_fc._ptr + 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) + + if len(ranges) == 0: + raise ValueError('integer range set is empty') + + 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)