X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fbindings%2Fpython%2Fbt2%2Fbt2%2Ftrace_class.py;h=bd39beabdfa5516dad2961e59659ac15b63a985e;hb=ed47ebcd99fd2fb58770dc733d9318b57858de68;hp=7e7c179770508058846e8b9295e6bff49c839520;hpb=9c08c816a55bbc538957648b49d41354e43c7cdf;p=babeltrace.git diff --git a/src/bindings/python/bt2/bt2/trace_class.py b/src/bindings/python/bt2/bt2/trace_class.py index 7e7c1797..bd39beab 100644 --- a/src/bindings/python/bt2/bt2/trace_class.py +++ b/src/bindings/python/bt2/bt2/trace_class.py @@ -26,34 +26,17 @@ __all__ = ['_TraceClass'] import bt2 from bt2 import native_bt, utils, object -import bt2.stream_class -import bt2.field_class +from bt2 import stream_class as bt2_stream_class +from bt2 import field_class as bt2_field_class +from bt2 import trace as bt2_trace +from bt2 import trace_class as bt2_trace_class +from bt2 import value as bt2_value import collections.abc import functools -class _StreamClassIterator(collections.abc.Iterator): - def __init__(self, trace_class): - self._trace_class = trace_class - self._at = 0 - - def __next__(self): - if self._at == len(self._trace_class): - raise StopIteration - - borrow_stream_class_fn = ( - native_bt.trace_class_borrow_stream_class_by_index_const - ) - sc_ptr = borrow_stream_class_fn(self._trace_class._ptr, self._at) - assert sc_ptr - id = native_bt.stream_class_get_id(sc_ptr) - assert id >= 0 - self._at += 1 - return id - - def _trace_class_destruction_listener_from_native(user_listener, trace_class_ptr): - trace_class = bt2.trace_class._TraceClass._create_from_ptr_and_get_ref( + trace_class = bt2_trace_class._TraceClass._create_from_ptr_and_get_ref( trace_class_ptr ) user_listener(trace_class) @@ -65,23 +48,26 @@ class _TraceClass(object._SharedObject, collections.abc.Mapping): # Instantiate a trace of this class. - def __call__(self, name=None, uuid=None, env=None): + def __call__(self, name=None, user_attributes=None, uuid=None, environment=None): trace_ptr = native_bt.trace_create(self._ptr) if trace_ptr is None: - raise bt2.CreationError('cannot create trace class object') + raise bt2._MemoryError('cannot create trace class object') - trace = bt2.trace._Trace._create_from_ptr(trace_ptr) + trace = bt2_trace._Trace._create_from_ptr(trace_ptr) if name is not None: trace._name = name + if user_attributes is not None: + trace._user_attributes = user_attributes + if uuid is not None: trace._uuid = uuid - if env is not None: - for key, value in env.items(): - trace.env[key] = value + if environment is not None: + for key, value in environment.items(): + trace.environment[key] = value return trace @@ -101,7 +87,7 @@ class _TraceClass(object._SharedObject, collections.abc.Mapping): if sc_ptr is None: raise KeyError(key) - return bt2.stream_class._StreamClass._create_from_ptr_and_get_ref(sc_ptr) + return bt2_stream_class._StreamClass._create_from_ptr_and_get_ref(sc_ptr) def __iter__(self): for idx in range(len(self)): @@ -119,6 +105,7 @@ class _TraceClass(object._SharedObject, collections.abc.Mapping): self, id=None, name=None, + user_attributes=None, packet_context_field_class=None, event_common_context_field_class=None, default_clock_class=None, @@ -149,11 +136,14 @@ class _TraceClass(object._SharedObject, collections.abc.Mapping): utils._check_uint64(id) sc_ptr = native_bt.stream_class_create_with_id(self._ptr, id) - sc = bt2.stream_class._StreamClass._create_from_ptr(sc_ptr) + sc = bt2_stream_class._StreamClass._create_from_ptr(sc_ptr) if name is not None: sc._name = name + if user_attributes is not None: + sc._user_attributes = user_attributes + if event_common_context_field_class is not None: sc._event_common_context_field_class = event_common_context_field_class @@ -186,6 +176,19 @@ class _TraceClass(object._SharedObject, collections.abc.Mapping): ) return sc + @property + def user_attributes(self): + ptr = native_bt.trace_class_borrow_user_attributes(self._ptr) + assert ptr is not None + return bt2_value._create_from_ptr_and_get_ref(ptr) + + def _user_attributes(self, user_attributes): + value = bt2_value.create_value(user_attributes) + utils._check_type(value, bt2_value.MapValue) + native_bt.trace_class_set_user_attributes(self._ptr, value._ptr) + + _user_attributes = property(fset=_user_attributes) + @property def assigns_automatic_stream_class_id(self): return native_bt.trace_class_assigns_automatic_stream_class_id(self._ptr) @@ -202,15 +205,49 @@ class _TraceClass(object._SharedObject, collections.abc.Mapping): # Field class creation methods. - def _check_create_status(self, ptr, type_name): + def _check_field_class_create_status(self, ptr, type_name): if ptr is None: - raise bt2.CreationError('cannot create {} field class'.format(type_name)) + raise bt2._MemoryError('cannot create {} field class'.format(type_name)) + + @staticmethod + def _set_field_class_user_attrs(fc, user_attributes): + if user_attributes is not None: + fc._user_attributes = user_attributes + + def create_bool_field_class(self, user_attributes=None): + field_class_ptr = native_bt.field_class_bool_create(self._ptr) + self._check_field_class_create_status(field_class_ptr, 'boolean') + fc = bt2_field_class._BoolFieldClass._create_from_ptr(field_class_ptr) + self._set_field_class_user_attrs(fc, user_attributes) + return fc + + def create_bit_array_field_class(self, length, user_attributes=None): + utils._check_uint64(length) + + if length < 1 or length > 64: + raise ValueError( + 'invalid length {}: expecting a value in the [1, 64] range'.format( + length + ) + ) + + field_class_ptr = native_bt.field_class_bit_array_create(self._ptr, length) + self._check_field_class_create_status(field_class_ptr, 'bit array') + fc = bt2_field_class._BitArrayFieldClass._create_from_ptr(field_class_ptr) + self._set_field_class_user_attrs(fc, user_attributes) + return fc def _create_integer_field_class( - self, create_func, py_cls, type_name, field_value_range, preferred_display_base + self, + create_func, + py_cls, + type_name, + field_value_range, + preferred_display_base, + user_attributes, ): field_class_ptr = create_func(self._ptr) - self._check_create_status(field_class_ptr, type_name) + self._check_field_class_create_status(field_class_ptr, type_name) field_class = py_cls._create_from_ptr(field_class_ptr) @@ -220,106 +257,140 @@ class _TraceClass(object._SharedObject, collections.abc.Mapping): if preferred_display_base is not None: field_class._preferred_display_base = preferred_display_base + self._set_field_class_user_attrs(field_class, user_attributes) return field_class def create_signed_integer_field_class( - self, field_value_range=None, preferred_display_base=None + self, field_value_range=None, preferred_display_base=None, user_attributes=None ): return self._create_integer_field_class( native_bt.field_class_integer_signed_create, - bt2.field_class._SignedIntegerFieldClass, + bt2_field_class._SignedIntegerFieldClass, 'signed integer', field_value_range, preferred_display_base, + user_attributes, ) def create_unsigned_integer_field_class( - self, field_value_range=None, preferred_display_base=None + self, field_value_range=None, preferred_display_base=None, user_attributes=None ): return self._create_integer_field_class( native_bt.field_class_integer_unsigned_create, - bt2.field_class._UnsignedIntegerFieldClass, + bt2_field_class._UnsignedIntegerFieldClass, 'unsigned integer', field_value_range, preferred_display_base, + user_attributes, ) def create_signed_enumeration_field_class( - self, field_value_range=None, preferred_display_base=None + self, field_value_range=None, preferred_display_base=None, user_attributes=None ): return self._create_integer_field_class( native_bt.field_class_enumeration_signed_create, - bt2.field_class._SignedEnumerationFieldClass, + bt2_field_class._SignedEnumerationFieldClass, 'signed enumeration', field_value_range, preferred_display_base, + user_attributes, ) def create_unsigned_enumeration_field_class( - self, field_value_range=None, preferred_display_base=None + self, field_value_range=None, preferred_display_base=None, user_attributes=None ): return self._create_integer_field_class( native_bt.field_class_enumeration_unsigned_create, - bt2.field_class._UnsignedEnumerationFieldClass, + bt2_field_class._UnsignedEnumerationFieldClass, 'unsigned enumeration', field_value_range, preferred_display_base, + user_attributes, ) - def create_real_field_class(self, is_single_precision=False): + 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_create_status(field_class_ptr, 'real') + self._check_field_class_create_status(field_class_ptr, 'real') - field_class = bt2.field_class._RealFieldClass._create_from_ptr(field_class_ptr) + field_class = bt2_field_class._RealFieldClass._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 - def create_structure_field_class(self): + def create_structure_field_class(self, user_attributes=None): field_class_ptr = native_bt.field_class_structure_create(self._ptr) - self._check_create_status(field_class_ptr, 'structure') - - return bt2.field_class._StructureFieldClass._create_from_ptr(field_class_ptr) + self._check_field_class_create_status(field_class_ptr, 'structure') + fc = bt2_field_class._StructureFieldClass._create_from_ptr(field_class_ptr) + self._set_field_class_user_attrs(fc, user_attributes) + return fc - def create_string_field_class(self): + def create_string_field_class(self, user_attributes=None): field_class_ptr = native_bt.field_class_string_create(self._ptr) - self._check_create_status(field_class_ptr, 'string') + self._check_field_class_create_status(field_class_ptr, 'string') + fc = bt2_field_class._StringFieldClass._create_from_ptr(field_class_ptr) + self._set_field_class_user_attrs(fc, user_attributes) + return fc - return bt2.field_class._StringFieldClass._create_from_ptr(field_class_ptr) - - def create_static_array_field_class(self, elem_fc, length): - utils._check_type(elem_fc, bt2.field_class._FieldClass) + def create_static_array_field_class(self, elem_fc, length, user_attributes=None): + utils._check_type(elem_fc, bt2_field_class._FieldClass) utils._check_uint64(length) ptr = native_bt.field_class_array_static_create(self._ptr, elem_fc._ptr, length) - self._check_create_status(ptr, 'static array') - - return bt2.field_class._StaticArrayFieldClass._create_from_ptr_and_get_ref(ptr) + self._check_field_class_create_status(ptr, 'static array') + fc = bt2_field_class._StaticArrayFieldClass._create_from_ptr_and_get_ref(ptr) + self._set_field_class_user_attrs(fc, user_attributes) + return fc - def create_dynamic_array_field_class(self, elem_fc, length_fc=None): - utils._check_type(elem_fc, bt2.field_class._FieldClass) + def create_dynamic_array_field_class( + self, elem_fc, length_fc=None, user_attributes=None + ): + utils._check_type(elem_fc, bt2_field_class._FieldClass) length_fc_ptr = None if length_fc is not None: - utils._check_type(length_fc, bt2.field_class._UnsignedIntegerFieldClass) + utils._check_type(length_fc, bt2_field_class._UnsignedIntegerFieldClass) length_fc_ptr = length_fc._ptr ptr = native_bt.field_class_array_dynamic_create( self._ptr, elem_fc._ptr, length_fc_ptr ) - self._check_create_status(ptr, 'dynamic array') - return bt2.field_class._DynamicArrayFieldClass._create_from_ptr(ptr) + self._check_field_class_create_status(ptr, 'dynamic array') + fc = bt2_field_class._DynamicArrayFieldClass._create_from_ptr(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 + ): + utils._check_type(content_fc, bt2_field_class._FieldClass) - def create_variant_field_class(self, selector_fc=None): selector_fc_ptr = None if selector_fc is not None: - utils._check_type(selector_fc, bt2.field_class._IntegerFieldClass) + utils._check_type(selector_fc, bt2_field_class._BoolFieldClass) + selector_fc_ptr = selector_fc._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) + return fc + + def create_variant_field_class(self, selector_fc=None, user_attributes=None): + selector_fc_ptr = None + + if selector_fc is not None: + utils._check_type(selector_fc, bt2_field_class._IntegerFieldClass) selector_fc_ptr = selector_fc._ptr ptr = native_bt.field_class_variant_create(self._ptr, selector_fc_ptr) - self._check_create_status(ptr, 'variant') - return bt2.field_class._create_field_class_from_ptr_and_get_ref(ptr) + self._check_field_class_create_status(ptr, 'variant') + fc = bt2_field_class._create_field_class_from_ptr_and_get_ref(ptr) + self._set_field_class_user_attrs(fc, user_attributes) + return fc # Add a listener to be called when the trace class is destroyed. @@ -333,10 +404,9 @@ class _TraceClass(object._SharedObject, collections.abc.Mapping): _trace_class_destruction_listener_from_native, listener ) - listener_id = fn(self._ptr, listener_from_native) - if listener_id is None: - utils._raise_bt2_error( - 'cannot add destruction listener to trace class object' - ) + status, listener_id = fn(self._ptr, listener_from_native) + utils._handle_func_status( + status, 'cannot add destruction listener to trace class object' + ) - return bt2._ListenerHandle(listener_id, self) + return utils._ListenerHandle(listener_id, self)