X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=bindings%2Fpython%2Fbt2%2Fbt2%2Fcomponent.py;h=3480f6570703e2ae49db6c0a99d62daabf89b0a7;hb=e8ac1aaec8f07304d16bf787950c14cd7c49fc75;hp=ec8eb65a47609672d652a87dc48bc7b798339900;hpb=3cdfbaeab23e6ed4268d606cb67c50ec9e8646a0;p=babeltrace.git diff --git a/bindings/python/bt2/bt2/component.py b/bindings/python/bt2/bt2/component.py index ec8eb65a..3480f657 100644 --- a/bindings/python/bt2/bt2/component.py +++ b/bindings/python/bt2/bt2/component.py @@ -185,7 +185,7 @@ class _Component: return name @property - def component_class(self): + def cls(self): cc_ptr = self._borrow_component_class_ptr(self._ptr) assert cc_ptr is not None return _create_component_class_from_ptr_and_get_ref(cc_ptr, self._comp_cls_type) @@ -294,6 +294,14 @@ _COMP_CLS_TYPE_TO_GENERIC_COMP_CLS_PYCLS = { def _create_component_from_ptr(ptr, comp_cls_type): return _COMP_CLS_TYPE_TO_GENERIC_COMP_PYCLS[comp_cls_type]._create_from_ptr(ptr) + +# Same as the above, but acquire a new reference instead of stealing the +# reference from the caller. + +def _create_component_from_ptr_and_get_ref(ptr, comp_cls_type): + return _COMP_CLS_TYPE_TO_GENERIC_COMP_PYCLS[comp_cls_type]._create_from_ptr_and_get_ref(ptr) + + # Create a component class Python object of type # _GenericSourceComponentClass, _GenericFilterComponentClass or # _GenericSinkComponentClass, depending on comp_cls_type. @@ -568,7 +576,7 @@ class _UserComponent(metaclass=_UserComponentType): return name @property - def component_class(self): + def cls(self): comp_ptr = self._as_not_self_specific_component_ptr(self._ptr) cc_ptr = self._borrow_component_class_ptr(comp_ptr) return _create_component_class_from_ptr_and_get_ref(cc_ptr, self._comp_cls_type) @@ -620,6 +628,9 @@ class _UserComponent(metaclass=_UserComponentType): other_port_ptr, other_port_type) self._port_connected(port, other_port) + def _graph_is_configured_from_native(self): + self._graph_is_configured() + def _create_trace_class(self, env=None, uuid=None, assigns_automatic_stream_class_id=True): ptr = self._as_self_component_ptr(self._ptr) @@ -628,7 +639,7 @@ class _UserComponent(metaclass=_UserComponentType): if tc_ptr is None: raise bt2.CreationError('could not create trace class') - tc = bt2.TraceClass._create_from_ptr(tc_ptr) + tc = bt2._TraceClass._create_from_ptr(tc_ptr) if env is not None: for key, value in env.items(): @@ -641,14 +652,38 @@ class _UserComponent(metaclass=_UserComponentType): return tc - def _create_clock_class(self): + def _create_clock_class(self, frequency=None, name=None, description=None, + precision=None, offset=None, origin_is_unix_epoch=True, + uuid=None): ptr = self._as_self_component_ptr(self._ptr) cc_ptr = native_bt.clock_class_create(ptr) if cc_ptr is None: raise bt2.CreationError('could not create clock class') - return bt2.ClockClass._create_from_ptr(cc_ptr) + cc = bt2.clock_class._ClockClass._create_from_ptr(cc_ptr) + + if frequency is not None: + cc._frequency = frequency + + if name is not None: + cc._name = name + + if description is not None: + cc._description = description + + if precision is not None: + cc._precision = precision + + if offset is not None: + cc._offset = offset + + cc._origin_is_unix_epoch = origin_is_unix_epoch + + if uuid is not None: + cc._uuid = uuid + + return cc class _UserSourceComponent(_UserComponent, _SourceComponent): @@ -667,10 +702,10 @@ class _UserSourceComponent(_UserComponent, _SourceComponent): get_output_port_count, bt2.port._UserComponentOutputPort) - def _add_output_port(self, name): + def _add_output_port(self, name, user_data=None): utils._check_str(name) fn = native_bt.self_component_source_add_output_port - comp_status, self_port_ptr = fn(self._ptr, name, None) + comp_status, self_port_ptr = fn(self._ptr, name, user_data) _handle_component_status(comp_status, 'cannot add output port to source component object') assert self_port_ptr is not None @@ -705,19 +740,19 @@ class _UserFilterComponent(_UserComponent, _FilterComponent): get_input_port_count, bt2.port._UserComponentInputPort) - def _add_output_port(self, name): + def _add_output_port(self, name, user_data=None): utils._check_str(name) fn = native_bt.self_component_filter_add_output_port - comp_status, self_port_ptr = fn(self._ptr, name, None) + comp_status, self_port_ptr = fn(self._ptr, name, user_data) _handle_component_status(comp_status, 'cannot add output port to filter component object') assert self_port_ptr return bt2.port._UserComponentOutputPort._create_from_ptr(self_port_ptr) - def _add_input_port(self, name): + def _add_input_port(self, name, user_data=None): utils._check_str(name) fn = native_bt.self_component_filter_add_input_port - comp_status, self_port_ptr = fn(self._ptr, name, None) + comp_status, self_port_ptr = fn(self._ptr, name, user_data) _handle_component_status(comp_status, 'cannot add input port to filter component object') assert self_port_ptr @@ -740,11 +775,11 @@ class _UserSinkComponent(_UserComponent, _SinkComponent): get_input_port_count, bt2.port._UserComponentInputPort) - def _add_input_port(self, name): + def _add_input_port(self, name, user_data=None): utils._check_str(name) fn = native_bt.self_component_sink_add_input_port - comp_status, priv_port_ptr = fn(self._ptr, name, None) + comp_status, self_port_ptr = fn(self._ptr, name, user_data) _handle_component_status(comp_status, 'cannot add input port to sink component object') - assert priv_port_ptr - return bt2.port._UserComponentInputPort._create_from_ptr(priv_port_ptr) + assert self_port_ptr + return bt2.port._UserComponentInputPort._create_from_ptr(self_port_ptr)