X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fbindings%2Fpython%2Fbt2%2Fbt2%2Ftrace_class.py;h=3ae3addefbcb3126ee21d4baed643632d791e0f7;hb=cec0261d56a42e810f56b39fcefbe33987c8aab8;hp=798dbee07558fc81ef399c60e679330612b5ddbd;hpb=4acc866e829881299a13d0aa8e28b93807549975;p=babeltrace.git diff --git a/src/bindings/python/bt2/bt2/trace_class.py b/src/bindings/python/bt2/bt2/trace_class.py index 798dbee0..3ae3adde 100644 --- a/src/bindings/python/bt2/bt2/trace_class.py +++ b/src/bindings/python/bt2/bt2/trace_class.py @@ -26,34 +26,16 @@ __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 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) @@ -69,9 +51,9 @@ class _TraceClass(object._SharedObject, collections.abc.Mapping): trace_ptr = native_bt.trace_create(self._ptr) if trace_ptr is None: - raise bt2.MemoryError('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 @@ -101,7 +83,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)): @@ -149,7 +131,7 @@ 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 @@ -202,15 +184,21 @@ 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.MemoryError('cannot create {} field class'.format(type_name)) + raise bt2._MemoryError('cannot create {} field class'.format(type_name)) + + def create_bool_field_class(self): + field_class_ptr = native_bt.field_class_bool_create(self._ptr) + self._check_field_class_create_status(field_class_ptr, 'boolean') + + return bt2_field_class._BoolFieldClass._create_from_ptr(field_class_ptr) def _create_integer_field_class( self, create_func, py_cls, type_name, field_value_range, preferred_display_base ): 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) @@ -227,7 +215,7 @@ class _TraceClass(object._SharedObject, collections.abc.Mapping): ): 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, @@ -238,7 +226,7 @@ class _TraceClass(object._SharedObject, collections.abc.Mapping): ): 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, @@ -249,7 +237,7 @@ class _TraceClass(object._SharedObject, collections.abc.Mapping): ): 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, @@ -260,7 +248,7 @@ class _TraceClass(object._SharedObject, collections.abc.Mapping): ): 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, @@ -268,9 +256,9 @@ class _TraceClass(object._SharedObject, collections.abc.Mapping): def create_real_field_class(self, is_single_precision=False): 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 @@ -278,48 +266,63 @@ class _TraceClass(object._SharedObject, collections.abc.Mapping): def create_structure_field_class(self): field_class_ptr = native_bt.field_class_structure_create(self._ptr) - self._check_create_status(field_class_ptr, 'structure') + self._check_field_class_create_status(field_class_ptr, 'structure') - return bt2.field_class._StructureFieldClass._create_from_ptr(field_class_ptr) + return bt2_field_class._StructureFieldClass._create_from_ptr(field_class_ptr) def create_string_field_class(self): 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') - return bt2.field_class._StringFieldClass._create_from_ptr(field_class_ptr) + 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) + 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') + self._check_field_class_create_status(ptr, 'static array') - return bt2.field_class._StaticArrayFieldClass._create_from_ptr_and_get_ref(ptr) + return bt2_field_class._StaticArrayFieldClass._create_from_ptr_and_get_ref(ptr) def create_dynamic_array_field_class(self, elem_fc, length_fc=None): - utils._check_type(elem_fc, bt2.field_class._FieldClass) + 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') + return bt2_field_class._DynamicArrayFieldClass._create_from_ptr(ptr) + + def create_option_field_class(self, content_fc, selector_fc=None): + utils._check_type(content_fc, bt2_field_class._FieldClass) + + selector_fc_ptr = None + + if selector_fc is not None: + 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') + return bt2_field_class._create_field_class_from_ptr_and_get_ref(ptr) 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._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') + return bt2_field_class._create_field_class_from_ptr_and_get_ref(ptr) # Add a listener to be called when the trace class is destroyed. @@ -338,4 +341,4 @@ class _TraceClass(object._SharedObject, collections.abc.Mapping): status, 'cannot add destruction listener to trace class object' ) - return bt2._ListenerHandle(listener_id, self) + return utils._ListenerHandle(listener_id, self)