X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fbindings%2Fpython%2Fbt2%2Fbt2%2Fcomponent.py;h=a14b78e78e12bbb57eef3f1cfe5b58ea3adf9ab4;hb=615238bec18761cbb35873ffb370e555d47cefec;hp=865ff13598523cc197ec8607d6351339ea14f339;hpb=76b6c2f71a485f0cc9b766e1a54b9f7330ccd907;p=babeltrace.git diff --git a/src/bindings/python/bt2/bt2/component.py b/src/bindings/python/bt2/bt2/component.py index 865ff135..a14b78e7 100644 --- a/src/bindings/python/bt2/bt2/component.py +++ b/src/bindings/python/bt2/bt2/component.py @@ -27,11 +27,9 @@ from bt2 import value as bt2_value from bt2 import trace_class as bt2_trace_class from bt2 import clock_class as bt2_clock_class from bt2 import query_executor as bt2_query_executor -import traceback from bt2 import port as bt2_port import sys import bt2 -import os # This class wraps a component class pointer. This component class could @@ -45,7 +43,7 @@ import os # pointer to a 'bt_component_class *'. -class _ComponentClass(object._SharedObject): +class _ComponentClassConst(object._SharedObject): @property def name(self): ptr = self._bt_as_component_class_ptr(self._ptr) @@ -67,7 +65,7 @@ class _ComponentClass(object._SharedObject): return self._bt_as_component_class_ptr(self._ptr) def __eq__(self, other): - if not isinstance(other, _ComponentClass): + if not isinstance(other, _ComponentClassConst): try: if not issubclass(other, _UserComponent): return False @@ -77,7 +75,7 @@ class _ComponentClass(object._SharedObject): return self.addr == other.addr -class _SourceComponentClass(_ComponentClass): +class _SourceComponentClassConst(_ComponentClassConst): _get_ref = staticmethod(native_bt.component_class_source_get_ref) _put_ref = staticmethod(native_bt.component_class_source_put_ref) _bt_as_component_class_ptr = staticmethod( @@ -85,7 +83,7 @@ class _SourceComponentClass(_ComponentClass): ) -class _FilterComponentClass(_ComponentClass): +class _FilterComponentClassConst(_ComponentClassConst): _get_ref = staticmethod(native_bt.component_class_filter_get_ref) _put_ref = staticmethod(native_bt.component_class_filter_put_ref) _bt_as_component_class_ptr = staticmethod( @@ -93,7 +91,7 @@ class _FilterComponentClass(_ComponentClass): ) -class _SinkComponentClass(_ComponentClass): +class _SinkComponentClassConst(_ComponentClassConst): _get_ref = staticmethod(native_bt.component_class_sink_get_ref) _put_ref = staticmethod(native_bt.component_class_sink_put_ref) _bt_as_component_class_ptr = staticmethod( @@ -175,7 +173,7 @@ class _ComponentPorts(collections.abc.Mapping): # component pointer (e.g. 'bt_component_sink *') as a 'bt_component *'. -class _Component: +class _ComponentConst: @property def name(self): ptr = self._bt_as_component_ptr(self._ptr) @@ -192,7 +190,7 @@ class _Component: def cls(self): cc_ptr = self._bt_borrow_component_class_ptr(self._ptr) assert cc_ptr is not None - return _create_component_class_from_ptr_and_get_ref( + return _create_component_class_from_const_ptr_and_get_ref( cc_ptr, self._bt_comp_cls_type ) @@ -203,7 +201,7 @@ class _Component: return self.addr == other.addr -class _SourceComponent(_Component): +class _SourceComponentConst(_ComponentConst): _bt_borrow_component_class_ptr = staticmethod( native_bt.component_source_borrow_class_const ) @@ -214,7 +212,7 @@ class _SourceComponent(_Component): _bt_as_component_ptr = staticmethod(native_bt.component_source_as_component_const) -class _FilterComponent(_Component): +class _FilterComponentConst(_ComponentConst): _bt_borrow_component_class_ptr = staticmethod( native_bt.component_filter_borrow_class_const ) @@ -225,7 +223,7 @@ class _FilterComponent(_Component): _bt_as_component_ptr = staticmethod(native_bt.component_filter_as_component_const) -class _SinkComponent(_Component): +class _SinkComponentConst(_ComponentConst): _bt_borrow_component_class_ptr = staticmethod( native_bt.component_sink_borrow_class_const ) @@ -236,9 +234,9 @@ class _SinkComponent(_Component): _bt_as_component_ptr = staticmethod(native_bt.component_sink_as_component_const) -# This is analogous to _SourceComponentClass, but for source +# This is analogous to _SourceComponentClassConst, but for source # component objects. -class _GenericSourceComponent(object._SharedObject, _SourceComponent): +class _GenericSourceComponentConst(object._SharedObject, _SourceComponentConst): _get_ref = staticmethod(native_bt.component_source_get_ref) _put_ref = staticmethod(native_bt.component_source_put_ref) @@ -249,13 +247,13 @@ class _GenericSourceComponent(object._SharedObject, _SourceComponent): native_bt.component_source_borrow_output_port_by_name_const, native_bt.component_source_borrow_output_port_by_index_const, native_bt.component_source_get_output_port_count, - bt2_port._OutputPort, + bt2_port._OutputPortConst, ) -# This is analogous to _FilterComponentClass, but for filter +# This is analogous to _FilterComponentClassConst, but for filter # component objects. -class _GenericFilterComponent(object._SharedObject, _FilterComponent): +class _GenericFilterComponentConst(object._SharedObject, _FilterComponentConst): _get_ref = staticmethod(native_bt.component_filter_get_ref) _put_ref = staticmethod(native_bt.component_filter_put_ref) @@ -266,7 +264,7 @@ class _GenericFilterComponent(object._SharedObject, _FilterComponent): native_bt.component_filter_borrow_output_port_by_name_const, native_bt.component_filter_borrow_output_port_by_index_const, native_bt.component_filter_get_output_port_count, - bt2_port._OutputPort, + bt2_port._OutputPortConst, ) @property @@ -276,13 +274,13 @@ class _GenericFilterComponent(object._SharedObject, _FilterComponent): native_bt.component_filter_borrow_input_port_by_name_const, native_bt.component_filter_borrow_input_port_by_index_const, native_bt.component_filter_get_input_port_count, - bt2_port._InputPort, + bt2_port._InputPortConst, ) -# This is analogous to _SinkComponentClass, but for sink +# This is analogous to _SinkComponentClassConst, but for sink # component objects. -class _GenericSinkComponent(object._SharedObject, _SinkComponent): +class _GenericSinkComponentConst(object._SharedObject, _SinkComponentConst): _get_ref = staticmethod(native_bt.component_sink_get_ref) _put_ref = staticmethod(native_bt.component_sink_put_ref) @@ -293,32 +291,32 @@ class _GenericSinkComponent(object._SharedObject, _SinkComponent): native_bt.component_sink_borrow_input_port_by_name_const, native_bt.component_sink_borrow_input_port_by_index_const, native_bt.component_sink_get_input_port_count, - bt2_port._InputPort, + bt2_port._InputPortConst, ) _COMP_CLS_TYPE_TO_GENERIC_COMP_PYCLS = { - native_bt.COMPONENT_CLASS_TYPE_SOURCE: _GenericSourceComponent, - native_bt.COMPONENT_CLASS_TYPE_FILTER: _GenericFilterComponent, - native_bt.COMPONENT_CLASS_TYPE_SINK: _GenericSinkComponent, + native_bt.COMPONENT_CLASS_TYPE_SOURCE: _GenericSourceComponentConst, + native_bt.COMPONENT_CLASS_TYPE_FILTER: _GenericFilterComponentConst, + native_bt.COMPONENT_CLASS_TYPE_SINK: _GenericSinkComponentConst, } _COMP_CLS_TYPE_TO_GENERIC_COMP_CLS_PYCLS = { - native_bt.COMPONENT_CLASS_TYPE_SOURCE: _SourceComponentClass, - native_bt.COMPONENT_CLASS_TYPE_FILTER: _FilterComponentClass, - native_bt.COMPONENT_CLASS_TYPE_SINK: _SinkComponentClass, + native_bt.COMPONENT_CLASS_TYPE_SOURCE: _SourceComponentClassConst, + native_bt.COMPONENT_CLASS_TYPE_FILTER: _FilterComponentClassConst, + native_bt.COMPONENT_CLASS_TYPE_SINK: _SinkComponentClassConst, } -# Create a component Python object of type _GenericSourceComponent, -# _GenericFilterComponent or _GenericSinkComponent, depending on +# Create a component Python object of type _GenericSourceComponentConst, +# _GenericFilterComponentConst or _GenericSinkComponentConst, depending on # comp_cls_type. # # Steals the reference to ptr from the caller. -def _create_component_from_ptr(ptr, comp_cls_type): +def _create_component_from_const_ptr(ptr, comp_cls_type): return _COMP_CLS_TYPE_TO_GENERIC_COMP_PYCLS[comp_cls_type]._create_from_ptr(ptr) @@ -326,20 +324,20 @@ def _create_component_from_ptr(ptr, comp_cls_type): # reference from the caller. -def _create_component_from_ptr_and_get_ref(ptr, comp_cls_type): +def _create_component_from_const_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 -# _SourceComponentClass, _FilterComponentClass or -# _SinkComponentClass, depending on comp_cls_type. +# _SourceComponentClassConst, _FilterComponentClassConst or +# _SinkComponentClassConst, depending on comp_cls_type. # # Acquires a new reference to ptr. -def _create_component_class_from_ptr_and_get_ref(ptr, comp_cls_type): +def _create_component_class_from_const_ptr_and_get_ref(ptr, comp_cls_type): return _COMP_CLS_TYPE_TO_GENERIC_COMP_CLS_PYCLS[ comp_cls_type ]._create_from_ptr_and_get_ref(ptr) @@ -382,7 +380,7 @@ def _trim_docstring(docstring): # creates a native BT component class of the corresponding type and # associates it with this user-defined class. The metaclass also defines # class methods like the `name` and `description` properties to match -# the _ComponentClass interface. +# the _ComponentClassConst interface. # # The component class name which is used is either: # @@ -508,7 +506,7 @@ class _UserComponentType(type): cls._bt_cc_ptr = cc_ptr - def _bt_init_from_native(cls, comp_ptr, params_ptr): + def _bt_init_from_native(cls, comp_ptr, params_ptr, obj): # create instance, not user-initialized yet self = cls.__new__(cls) @@ -517,11 +515,11 @@ class _UserComponentType(type): # call user's __init__() method if params_ptr is not None: - params = bt2_value._create_from_ptr_and_get_ref(params_ptr) + params = bt2_value._create_from_const_ptr_and_get_ref(params_ptr) else: params = None - self.__init__(params) + self.__init__(params, obj) return self def __call__(cls, *args, **kwargs): @@ -573,20 +571,47 @@ class _UserComponentType(type): def addr(cls): return int(cls._bt_cc_ptr) - def _bt_query_from_native(cls, query_exec_ptr, obj, params_ptr, log_level): - # this can raise, in which case the native call to - # bt_component_class_query() returns NULL + def _bt_get_supported_mip_versions_from_native(cls, params_ptr, obj, log_level): + # this can raise, but the native side checks the exception if params_ptr is not None: - params = bt2_value._create_from_ptr_and_get_ref(params_ptr) + params = bt2_value._create_from_const_ptr_and_get_ref(params_ptr) else: params = None - query_exec = bt2_query_executor.QueryExecutor._create_from_ptr_and_get_ref( - query_exec_ptr - ) + # this can raise, but the native side checks the exception + range_set = cls._user_get_supported_mip_versions(params, obj, log_level) + + if type(range_set) is not bt2.UnsignedIntegerRangeSet: + # this can raise, but the native side checks the exception + range_set = bt2.UnsignedIntegerRangeSet(range_set) + + # return new reference + range_set._get_ref(range_set._ptr) + return int(range_set._ptr) + def _user_get_supported_mip_versions(cls, params, obj, log_level): + return [0] + + def _bt_query_from_native(cls, priv_query_exec_ptr, object, params_ptr, method_obj): # this can raise, but the native side checks the exception - results = cls._user_query(query_exec, obj, params, log_level) + if params_ptr is not None: + params = bt2_value._create_from_const_ptr_and_get_ref(params_ptr) + else: + params = None + + priv_query_exec = bt2_query_executor._PrivateQueryExecutor(priv_query_exec_ptr) + + try: + # this can raise, but the native side checks the exception + results = cls._user_query(priv_query_exec, object, params, method_obj) + finally: + # the private query executor is a private view on the query + # executor; it's not a shared object (the library does not + # offer an API to get/put a reference, just like "self" + # objects) from this query's point of view, so invalidate + # the object in case the user kept a reference and uses it + # later + priv_query_exec._invalidate() # this can raise, but the native side checks the exception results = bt2.create_value(results) @@ -594,15 +619,13 @@ class _UserComponentType(type): if results is None: results_ptr = native_bt.value_null else: - # return new reference results_ptr = results._ptr - # We return a new reference. + # return new reference bt2_value._Value._get_ref(results_ptr) - return int(results_ptr) - def _user_query(cls, query_executor, obj, params, log_level): + def _user_query(cls, priv_query_executor, object, params, method_obj): raise bt2.UnknownObject def _bt_component_class_ptr(self): @@ -612,6 +635,7 @@ class _UserComponentType(type): if hasattr(cls, '_bt_cc_ptr'): cc_ptr = cls._bt_as_component_class_ptr(cls._bt_cc_ptr) native_bt.component_class_put_ref(cc_ptr) + native_bt.bt2_unregister_cc_ptr_to_py_cls(cc_ptr) # Subclasses must provide these methods or property: @@ -645,7 +669,7 @@ class _UserComponent(metaclass=_UserComponentType): def cls(self): comp_ptr = self._bt_as_not_self_specific_component_ptr(self._bt_ptr) cc_ptr = self._bt_borrow_component_class_ptr(comp_ptr) - return _create_component_class_from_ptr_and_get_ref( + return _create_component_class_from_const_ptr_and_get_ref( cc_ptr, self._bt_comp_cls_type ) @@ -653,7 +677,12 @@ class _UserComponent(metaclass=_UserComponentType): def addr(self): return int(self._bt_ptr) - def __init__(self, params=None): + @property + def _graph_mip_version(self): + ptr = self._bt_as_self_component_ptr(self._bt_ptr) + return native_bt.self_component_get_graph_mip_version(ptr) + + def __init__(self, params=None, obj=None): pass def _user_finalize(self): @@ -672,12 +701,14 @@ class _UserComponent(metaclass=_UserComponentType): else: other_port_type = native_bt.PORT_TYPE_OUTPUT - other_port = bt2_port._create_from_ptr_and_get_ref( + other_port = bt2_port._create_from_const_ptr_and_get_ref( other_port_ptr, other_port_type ) self._user_port_connected(port, other_port) - def _create_trace_class(self, assigns_automatic_stream_class_id=True): + def _create_trace_class( + self, user_attributes=None, assigns_automatic_stream_class_id=True + ): ptr = self._bt_as_self_component_ptr(self._bt_ptr) tc_ptr = native_bt.trace_class_create(ptr) @@ -687,12 +718,16 @@ class _UserComponent(metaclass=_UserComponentType): tc = bt2_trace_class._TraceClass._create_from_ptr(tc_ptr) tc._assigns_automatic_stream_class_id = assigns_automatic_stream_class_id + if user_attributes is not None: + tc._user_attributes = user_attributes + return tc def _create_clock_class( self, frequency=None, name=None, + user_attributes=None, description=None, precision=None, offset=None, @@ -713,6 +748,9 @@ class _UserComponent(metaclass=_UserComponentType): if name is not None: cc._name = name + if user_attributes is not None: + cc._user_attributes = user_attributes + if description is not None: cc._description = description @@ -730,7 +768,7 @@ class _UserComponent(metaclass=_UserComponentType): return cc -class _UserSourceComponent(_UserComponent, _SourceComponent): +class _UserSourceComponent(_UserComponent, _SourceComponentConst): _bt_as_not_self_specific_component_ptr = staticmethod( native_bt.self_component_source_as_component_source ) @@ -763,7 +801,7 @@ class _UserSourceComponent(_UserComponent, _SourceComponent): return bt2_port._UserComponentOutputPort._create_from_ptr(self_port_ptr) -class _UserFilterComponent(_UserComponent, _FilterComponent): +class _UserFilterComponent(_UserComponent, _FilterComponentConst): _bt_as_not_self_specific_component_ptr = staticmethod( native_bt.self_component_filter_as_component_filter ) @@ -820,7 +858,7 @@ class _UserFilterComponent(_UserComponent, _FilterComponent): return bt2_port._UserComponentInputPort._create_from_ptr(self_port_ptr) -class _UserSinkComponent(_UserComponent, _SinkComponent): +class _UserSinkComponent(_UserComponent, _SinkComponentConst): _bt_as_not_self_specific_component_ptr = staticmethod( native_bt.self_component_sink_as_component_sink ) @@ -861,12 +899,11 @@ class _UserSinkComponent(_UserComponent, _SinkComponent): def _create_input_port_message_iterator(self, input_port): utils._check_type(input_port, bt2_port._UserComponentInputPort) - msg_iter_ptr = native_bt.self_component_port_input_message_iterator_create_from_sink_component( + status, msg_iter_ptr = native_bt.bt2_self_component_port_input_message_iterator_create_from_sink_component( self._bt_ptr, input_port._ptr ) - - if msg_iter_ptr is None: - raise bt2.CreationError('cannot create message iterator object') + utils._handle_func_status(status, 'cannot create message iterator object') + assert msg_iter_ptr is not None return bt2_message_iterator._UserComponentInputPortMessageIterator(msg_iter_ptr)