Signed-off-by: Francis Deslauriers <francis.deslauriers@efficios.com>
Change-Id: I2d6703707c55f1d420027cd83fa9124b83467938
Reviewed-on: https://review.lttng.org/c/babeltrace/+/2009
Tested-by: jenkins <jenkins@lttng.org>
Reviewed-by: Simon Marchi <simon.marchi@efficios.com>
from bt2.clock_class import ClockClassOffset
from bt2.clock_snapshot import _ClockSnapshotConst
from bt2.clock_snapshot import _UnknownClockSnapshot
from bt2.clock_class import ClockClassOffset
from bt2.clock_snapshot import _ClockSnapshotConst
from bt2.clock_snapshot import _UnknownClockSnapshot
-from bt2.component import _SourceComponentClass
-from bt2.component import _FilterComponentClass
-from bt2.component import _SinkComponentClass
-from bt2.component import _SourceComponent
-from bt2.component import _FilterComponent
-from bt2.component import _SinkComponent
+from bt2.component import _SourceComponentClassConst
+from bt2.component import _FilterComponentClassConst
+from bt2.component import _SinkComponentClassConst
+from bt2.component import _SourceComponentConst
+from bt2.component import _FilterComponentConst
+from bt2.component import _SinkComponentConst
from bt2.component import _UserSourceComponent
from bt2.component import _UserFilterComponent
from bt2.component import _UserSinkComponent
from bt2.component import _UserSourceComponent
from bt2.component import _UserFilterComponent
from bt2.component import _UserSinkComponent
# pointer to a 'bt_component_class *'.
# 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)
@property
def name(self):
ptr = self._bt_as_component_class_ptr(self._ptr)
return self._bt_as_component_class_ptr(self._ptr)
def __eq__(self, other):
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
try:
if not issubclass(other, _UserComponent):
return False
return self.addr == other.addr
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(
_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(
-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(
_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(
-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(
_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(
# component pointer (e.g. 'bt_component_sink *') as a 'bt_component *'.
# component pointer (e.g. 'bt_component_sink *') as a 'bt_component *'.
@property
def name(self):
ptr = self._bt_as_component_ptr(self._ptr)
@property
def name(self):
ptr = self._bt_as_component_ptr(self._ptr)
def cls(self):
cc_ptr = self._bt_borrow_component_class_ptr(self._ptr)
assert cc_ptr is not None
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
)
cc_ptr, self._bt_comp_cls_type
)
return self.addr == other.addr
return self.addr == other.addr
-class _SourceComponent(_Component):
+class _SourceComponentConst(_ComponentConst):
_bt_borrow_component_class_ptr = staticmethod(
native_bt.component_source_borrow_class_const
)
_bt_borrow_component_class_ptr = staticmethod(
native_bt.component_source_borrow_class_const
)
_bt_as_component_ptr = staticmethod(native_bt.component_source_as_component_const)
_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
)
_bt_borrow_component_class_ptr = staticmethod(
native_bt.component_filter_borrow_class_const
)
_bt_as_component_ptr = staticmethod(native_bt.component_filter_as_component_const)
_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
)
_bt_borrow_component_class_ptr = staticmethod(
native_bt.component_sink_borrow_class_const
)
_bt_as_component_ptr = staticmethod(native_bt.component_sink_as_component_const)
_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
-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)
_get_ref = staticmethod(native_bt.component_source_get_ref)
_put_ref = staticmethod(native_bt.component_source_put_ref)
-# This is analogous to _FilterComponentClass, but for filter
+# This is analogous to _FilterComponentClassConst, but for filter
-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)
_get_ref = staticmethod(native_bt.component_filter_get_ref)
_put_ref = staticmethod(native_bt.component_filter_put_ref)
-# This is analogous to _SinkComponentClass, but for sink
+# This is analogous to _SinkComponentClassConst, but for sink
-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)
_get_ref = staticmethod(native_bt.component_sink_get_ref)
_put_ref = staticmethod(native_bt.component_sink_put_ref)
_COMP_CLS_TYPE_TO_GENERIC_COMP_PYCLS = {
_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 = {
}
_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.
# 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)
return _COMP_CLS_TYPE_TO_GENERIC_COMP_PYCLS[comp_cls_type]._create_from_ptr(ptr)
# reference from the caller.
# 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
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.
#
# 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)
return _COMP_CLS_TYPE_TO_GENERIC_COMP_CLS_PYCLS[
comp_cls_type
]._create_from_ptr_and_get_ref(ptr)
# 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
# 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:
#
#
# The component class name which is used is either:
#
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)
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
)
cc_ptr, self._bt_comp_cls_type
)
-class _UserSourceComponent(_UserComponent, _SourceComponent):
+class _UserSourceComponent(_UserComponent, _SourceComponentConst):
_bt_as_not_self_specific_component_ptr = staticmethod(
native_bt.self_component_source_as_component_source
)
_bt_as_not_self_specific_component_ptr = staticmethod(
native_bt.self_component_source_as_component_source
)
return bt2_port._UserComponentOutputPort._create_from_ptr(self_port_ptr)
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
)
_bt_as_not_self_specific_component_ptr = staticmethod(
native_bt.self_component_filter_as_component_filter
)
return bt2_port._UserComponentInputPort._create_from_ptr(self_port_ptr)
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
)
_bt_as_not_self_specific_component_ptr = staticmethod(
native_bt.self_component_sink_as_component_sink
)
def _is_source_comp_cls(comp_cls):
def _is_source_comp_cls(comp_cls):
- if isinstance(comp_cls, bt2_component._SourceComponentClass):
+ if isinstance(comp_cls, bt2_component._SourceComponentClassConst):
def _is_filter_comp_cls(comp_cls):
def _is_filter_comp_cls(comp_cls):
- if isinstance(comp_cls, bt2_component._FilterComponentClass):
+ if isinstance(comp_cls, bt2_component._FilterComponentClassConst):
def _is_sink_comp_cls(comp_cls):
def _is_sink_comp_cls(comp_cls):
- if isinstance(comp_cls, bt2_component._SinkComponentClass):
+ if isinstance(comp_cls, bt2_component._SinkComponentClassConst):
def _graph_port_added_listener_from_native(
user_listener, component_ptr, component_type, port_ptr, port_type
):
def _graph_port_added_listener_from_native(
user_listener, component_ptr, component_type, port_ptr, port_type
):
- component = bt2_component._create_component_from_ptr_and_get_ref(
+ component = bt2_component._create_component_from_const_ptr_and_get_ref(
component_ptr, component_type
)
port = bt2_port._create_from_const_ptr_and_get_ref(port_ptr, port_type)
component_ptr, component_type
)
port = bt2_port._create_from_const_ptr_and_get_ref(port_ptr, port_type)
downstream_component_type,
downstream_port_ptr,
):
downstream_component_type,
downstream_port_ptr,
):
- upstream_component = bt2_component._create_component_from_ptr_and_get_ref(
+ upstream_component = bt2_component._create_component_from_const_ptr_and_get_ref(
upstream_component_ptr, upstream_component_type
)
upstream_port = bt2_port._create_from_const_ptr_and_get_ref(
upstream_port_ptr, native_bt.PORT_TYPE_OUTPUT
)
upstream_component_ptr, upstream_component_type
)
upstream_port = bt2_port._create_from_const_ptr_and_get_ref(
upstream_port_ptr, native_bt.PORT_TYPE_OUTPUT
)
- downstream_component = bt2_component._create_component_from_ptr_and_get_ref(
+ downstream_component = bt2_component._create_component_from_const_ptr_and_get_ref(
downstream_component_ptr, downstream_component_type
)
downstream_port = bt2_port._create_from_const_ptr_and_get_ref(
downstream_component_ptr, downstream_component_type
)
downstream_port = bt2_port._create_from_const_ptr_and_get_ref(
obj=None,
logging_level=bt2_logging.LoggingLevel.NONE,
):
obj=None,
logging_level=bt2_logging.LoggingLevel.NONE,
):
- if isinstance(component_class, bt2_component._SourceComponentClass):
+ if isinstance(component_class, bt2_component._SourceComponentClassConst):
cc_ptr = component_class._ptr
add_fn = native_bt.bt2_graph_add_source_component
cc_type = native_bt.COMPONENT_CLASS_TYPE_SOURCE
cc_ptr = component_class._ptr
add_fn = native_bt.bt2_graph_add_source_component
cc_type = native_bt.COMPONENT_CLASS_TYPE_SOURCE
- elif isinstance(component_class, bt2_component._FilterComponentClass):
+ elif isinstance(component_class, bt2_component._FilterComponentClassConst):
cc_ptr = component_class._ptr
add_fn = native_bt.bt2_graph_add_filter_component
cc_type = native_bt.COMPONENT_CLASS_TYPE_FILTER
cc_ptr = component_class._ptr
add_fn = native_bt.bt2_graph_add_filter_component
cc_type = native_bt.COMPONENT_CLASS_TYPE_FILTER
- elif isinstance(component_class, bt2_component._SinkComponentClass):
+ elif isinstance(component_class, bt2_component._SinkComponentClassConst):
cc_ptr = component_class._ptr
add_fn = native_bt.bt2_graph_add_sink_component
cc_type = native_bt.COMPONENT_CLASS_TYPE_SINK
cc_ptr = component_class._ptr
add_fn = native_bt.bt2_graph_add_sink_component
cc_type = native_bt.COMPONENT_CLASS_TYPE_SINK
)
utils._handle_func_status(status, 'cannot add component to graph')
assert comp_ptr
)
utils._handle_func_status(status, 'cannot add component to graph')
assert comp_ptr
- return bt2_component._create_component_from_ptr(comp_ptr, cc_type)
+ return bt2_component._create_component_from_const_ptr(comp_ptr, cc_type)
def connect_ports(self, upstream_port, downstream_port):
utils._check_type(upstream_port, bt2_port._OutputPortConst)
def connect_ports(self, upstream_port, downstream_port):
utils._check_type(upstream_port, bt2_port._OutputPortConst)
if cc_ptr is None:
raise KeyError(key)
if cc_ptr is None:
raise KeyError(key)
- return bt2_component._create_component_class_from_ptr_and_get_ref(
+ return bt2_component._create_component_class_from_const_ptr_and_get_ref(
cc_ptr, self._comp_cls_type
)
cc_ptr, self._comp_cls_type
)
return self._ptr
def __init__(self, component_class, object, params=None, method_obj=None):
return self._ptr
def __init__(self, component_class, object, params=None, method_obj=None):
- if not isinstance(component_class, bt2_component._ComponentClass):
+ if not isinstance(component_class, bt2_component._ComponentClassConst):
super().__init__(params, obj, logging_level)
is_cc_object = isinstance(
super().__init__(params, obj, logging_level)
is_cc_object = isinstance(
- component_class, (bt2._SourceComponentClass, bt2._FilterComponentClass)
+ component_class,
+ (bt2._SourceComponentClassConst, bt2._FilterComponentClassConst),
)
is_user_cc_type = isinstance(
component_class, bt2_component._UserComponentType
)
is_user_cc_type = isinstance(
component_class, bt2_component._UserComponentType
graph = bt2.Graph()
comp = graph.add_component(MySink, 'salut')
self._comp_cls = comp.cls
graph = bt2.Graph()
comp = graph.add_component(MySink, 'salut')
self._comp_cls = comp.cls
- self.assertTrue(issubclass(type(self._comp_cls), bt2._SinkComponentClass))
+ self.assertTrue(issubclass(type(self._comp_cls), bt2._SinkComponentClassConst))
def tearDown(self):
del self._py_comp_cls
def tearDown(self):
del self._py_comp_cls
def test_has__UnknownClockSnapshot(self):
self._assert_in_bt2('_UnknownClockSnapshot')
def test_has__UnknownClockSnapshot(self):
self._assert_in_bt2('_UnknownClockSnapshot')
- def test_has__SourceComponentClass(self):
- self._assert_in_bt2('_SourceComponentClass')
+ def test_has__SourceComponentClassConst(self):
+ self._assert_in_bt2('_SourceComponentClassConst')
- def test_has__FilterComponentClass(self):
- self._assert_in_bt2('_FilterComponentClass')
+ def test_has__FilterComponentClassConst(self):
+ self._assert_in_bt2('_FilterComponentClassConst')
- def test_has__SinkComponentClass(self):
- self._assert_in_bt2('_SinkComponentClass')
+ def test_has__SinkComponentClassConst(self):
+ self._assert_in_bt2('_SinkComponentClassConst')
- def test_has__SourceComponent(self):
- self._assert_in_bt2('_SourceComponent')
+ def test_has__SourceComponentConst(self):
+ self._assert_in_bt2('_SourceComponentConst')
- def test_has__FilterComponent(self):
- self._assert_in_bt2('_FilterComponent')
+ def test_has__FilterComponentConst(self):
+ self._assert_in_bt2('_FilterComponentConst')
- def test_has__SinkComponent(self):
- self._assert_in_bt2('_SinkComponent')
+ def test_has__SinkComponentConst(self):
+ self._assert_in_bt2('_SinkComponentConst')
def test_has__UserSourceComponent(self):
self._assert_in_bt2('_UserSourceComponent')
def test_has__UserSourceComponent(self):
self._assert_in_bt2('_UserSourceComponent')
def test_create_sink_from_object(self):
with self.assertRaisesRegex(
def test_create_sink_from_object(self):
with self.assertRaisesRegex(
- TypeError, "'_SinkComponentClass' is not a source or filter component class"
+ TypeError,
+ "'_SinkComponentClassConst' is not a source or filter component class",
):
bt2.ComponentSpec(self._pretty_cc)
):
bt2.ComponentSpec(self._pretty_cc)