X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=bindings%2Fpython%2Fbt2%2Fbt2%2Ftrace.py;h=33fd8c08d8d2d4151ce71ffbb85caefaf5ac7890;hb=d45bb761110b230cfe9e6ca1fcba00c6a19b3466;hp=981824879442ba5e39e040748c17d59dff361f5f;hpb=50842bdc4c21f3de2b63e29cdac730af8b6dcca6;p=deliverable%2Fbabeltrace.git diff --git a/bindings/python/bt2/bt2/trace.py b/bindings/python/bt2/bt2/trace.py index 981824879..33fd8c08d 100644 --- a/bindings/python/bt2/bt2/trace.py +++ b/bindings/python/bt2/bt2/trace.py @@ -21,9 +21,9 @@ # THE SOFTWARE. from bt2 import native_bt, object, utils -import bt2.field_types +import bt2.field_class import collections.abc -import bt2.values +import bt2.value import bt2.stream import copy import bt2 @@ -39,7 +39,7 @@ class _StreamClassIterator(collections.abc.Iterator): raise StopIteration sc_ptr = native_bt.trace_get_stream_class_by_index(self._trace._ptr, - self._at) + self._at) assert(sc_ptr) id = native_bt.stream_class_get_id(sc_ptr) native_bt.put(sc_ptr) @@ -64,7 +64,7 @@ class _TraceStreams(collections.abc.Sequence): raise IndexError stream_ptr = native_bt.trace_get_stream_by_index(self._trace._ptr, - index) + index) assert(stream_ptr) return bt2.stream._create_from_ptr(stream_ptr) @@ -94,8 +94,7 @@ class _TraceClockClasses(collections.abc.Mapping): def __getitem__(self, key): utils._check_str(key) - cc_ptr = native_bt.trace_get_clock_class_by_name(self._trace._ptr, - key) + cc_ptr = native_bt.trace_get_clock_class_by_name(self._trace._ptr, key) if cc_ptr is None: raise KeyError(key) @@ -122,7 +121,7 @@ class _TraceEnvIterator(collections.abc.Iterator): trace_ptr = self._trace_env._trace._ptr entry_name = native_bt.trace_get_environment_field_name_by_index(trace_ptr, - self._at) + self._at) assert(entry_name is not None) self._at += 1 return entry_name @@ -135,18 +134,18 @@ class _TraceEnv(collections.abc.MutableMapping): def __getitem__(self, key): utils._check_str(key) value_ptr = native_bt.trace_get_environment_field_value_by_name(self._trace._ptr, - key) + key) if value_ptr is None: raise KeyError(key) - return bt2.values._create_from_ptr(value_ptr) + return bt2.value._create_from_ptr(value_ptr) def __setitem__(self, key, value): utils._check_str(key) value = bt2.create_value(value) ret = native_bt.trace_set_environment_field(self._trace._ptr, - key, value._ptr) + key, value._ptr) utils._handle_ret(ret, "cannot set trace class object's environment entry") def __delitem__(self, key): @@ -163,7 +162,7 @@ class _TraceEnv(collections.abc.MutableMapping): class Trace(object._Object, collections.abc.Mapping): def __init__(self, name=None, native_byte_order=None, env=None, - packet_header_field_type=None, clock_classes=None, + packet_header_field_class=None, clock_classes=None, stream_classes=None): ptr = native_bt.trace_create() @@ -178,8 +177,8 @@ class Trace(object._Object, collections.abc.Mapping): if native_byte_order is not None: self.native_byte_order = native_byte_order - if packet_header_field_type is not None: - self.packet_header_field_type = packet_header_field_type + if packet_header_field_class is not None: + self.packet_header_field_class = packet_header_field_class if env is not None: for key, value in env.items(): @@ -264,25 +263,25 @@ class Trace(object._Object, collections.abc.Mapping): return _TraceStreams(self) @property - def packet_header_field_type(self): - ft_ptr = native_bt.trace_get_packet_header_type(self._ptr) + def packet_header_field_class(self): + fc_ptr = native_bt.trace_get_packet_header_type(self._ptr) - if ft_ptr is None: + if fc_ptr is None: return - return bt2.field_types._create_from_ptr(ft_ptr) + return bt2.field_class._create_from_ptr(fc_ptr) - @packet_header_field_type.setter - def packet_header_field_type(self, packet_header_field_type): - packet_header_field_type_ptr = None + @packet_header_field_class.setter + def packet_header_field_class(self, packet_header_field_class): + packet_header_field_class_ptr = None - if packet_header_field_type is not None: - utils._check_type(packet_header_field_type, bt2.field_types._FieldType) - packet_header_field_type_ptr = packet_header_field_type._ptr + if packet_header_field_class is not None: + utils._check_type(packet_header_field_class, bt2.field_class._FieldClass) + packet_header_field_class_ptr = packet_header_field_class._ptr ret = native_bt.trace_set_packet_header_type(self._ptr, - packet_header_field_type_ptr) - utils._handle_ret(ret, "cannot set trace class object's packet header field type") + packet_header_field_class_ptr) + utils._handle_ret(ret, "cannot set trace class object's packet header field class") def __eq__(self, other): if type(other) is not type(self): @@ -304,7 +303,7 @@ class Trace(object._Object, collections.abc.Mapping): self_env, self.name, self.native_byte_order, - self.packet_header_field_type, + self.packet_header_field_class, ) other_props = ( other_stream_classes, @@ -312,7 +311,7 @@ class Trace(object._Object, collections.abc.Mapping): other_env, other.name, other.native_byte_order, - other.packet_header_field_type, + other.packet_header_field_class, ) return self_props == other_props @@ -322,7 +321,7 @@ class Trace(object._Object, collections.abc.Mapping): if self.name is not None: cpy.name = self.name - cpy.packet_header_field_type = gen_copy_func(self.packet_header_field_type) + cpy.packet_header_field_class = gen_copy_func(self.packet_header_field_class) for key, val in self.env.items(): cpy.env[key] = gen_copy_func(val)