X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=bindings%2Fpython%2Fbt2%2Fbt2%2Fcomponent.py;h=a82f5267b6d3bb4d10ba8425b61cc7b53c5ac354;hb=c4239792c6758f579fb9482ddccf336f1bbf26c4;hp=9c1786814a1675ebe23ae9553d278a2c967b1fa9;hpb=c7eee084ca459af66ba1f6d375fba3f89db93584;p=babeltrace.git diff --git a/bindings/python/bt2/bt2/component.py b/bindings/python/bt2/bt2/component.py index 9c178681..a82f5267 100644 --- a/bindings/python/bt2/bt2/component.py +++ b/bindings/python/bt2/bt2/component.py @@ -21,9 +21,9 @@ # THE SOFTWARE. from bt2 import native_bt, object, utils -import bt2.notification_iterator +import bt2.message_iterator import collections.abc -import bt2.values +import bt2.value import traceback import bt2.port import sys @@ -107,7 +107,7 @@ class _PortIterator(collections.abc.Iterator): assert(port_ptr) if comp_ports._is_private: - port_pub_ptr = native_bt.port_from_private_port(port_ptr) + port_pub_ptr = native_bt.port_from_private(port_ptr) name = native_bt.port_get_name(port_pub_ptr) native_bt.put(port_pub_ptr) else: @@ -143,7 +143,7 @@ class _ComponentPorts(collections.abc.Mapping): def __len__(self): if self._is_private: - pub_ptr = native_bt.component_from_private_component(self._component._ptr) + pub_ptr = native_bt.component_from_private(self._component._ptr) count = self._get_port_count_fn(pub_ptr) native_bt.put(pub_ptr) else: @@ -329,24 +329,24 @@ def _trim_docstring(docstring): # finalized. # # User-defined source and filter component classes must use the -# `notification_iterator_class` class parameter to specify the -# notification iterator class to use for this component class: +# `message_iterator_class` class parameter to specify the +# message iterator class to use for this component class: # -# class MyNotificationIterator(bt2._UserNotificationIterator): +# class MyMessageIterator(bt2._UserMessageIterator): # ... # # class MySource(bt2._UserSourceComponent, -# notification_iterator_class=MyNotificationIterator): +# message_iterator_class=MyMessageIterator): # ... # -# This notification iterator class must inherit -# bt2._UserNotificationIterator, and it must define the _get() and -# _next() methods. The notification iterator class can also define an +# This message iterator class must inherit +# bt2._UserMessageIterator, and it must define the _get() and +# _next() methods. The message iterator class can also define an # __init__() method: this method has access to the original Python # component object which was used to create it as the `component` -# property. The notification iterator class can also define a +# property. The message iterator class can also define a # _finalize() method (again, do NOT use __del__()): this is called when -# the notification iterator is (really) destroyed. +# the message iterator is (really) destroyed. # # When the user-defined class is destroyed, this metaclass's __del__() # method is called: the native BT component class pointer is put (not @@ -388,7 +388,7 @@ class _UserComponentType(type): if len(lines) >= 3: comp_cls_help = '\n'.join(lines[2:]) - iter_cls = kwargs.get('notification_iterator_class') + iter_cls = kwargs.get('message_iterator_class') if _UserSourceComponent in bases: _UserComponentType._set_iterator_class(cls, iter_cls) @@ -428,7 +428,7 @@ class _UserComponentType(type): # call user's __init__() method if params_ptr is not None: native_bt.get(params_ptr) - params = bt2.values._create_from_ptr(params_ptr) + params = bt2.value._create_from_ptr(params_ptr) else: params = None @@ -441,13 +441,13 @@ class _UserComponentType(type): @staticmethod def _set_iterator_class(cls, iter_cls): if iter_cls is None: - raise bt2.IncompleteUserClass("cannot create component class '{}': missing notification iterator class".format(cls.__name__)) + raise bt2.IncompleteUserClass("cannot create component class '{}': missing message iterator class".format(cls.__name__)) - if not issubclass(iter_cls, bt2.notification_iterator._UserNotificationIterator): - raise bt2.IncompleteUserClass("cannot create component class '{}': notification iterator class does not inherit bt2._UserNotificationIterator".format(cls.__name__)) + if not issubclass(iter_cls, bt2.message_iterator._UserMessageIterator): + raise bt2.IncompleteUserClass("cannot create component class '{}': message iterator class does not inherit bt2._UserMessageIterator".format(cls.__name__)) if not hasattr(iter_cls, '__next__'): - raise bt2.IncompleteUserClass("cannot create component class '{}': notification iterator class is missing a __next__() method".format(cls.__name__)) + raise bt2.IncompleteUserClass("cannot create component class '{}': message iterator class is missing a __next__() method".format(cls.__name__)) cls._iter_cls = iter_cls @@ -472,7 +472,7 @@ class _UserComponentType(type): # bt_component_class_query() returns NULL if params_ptr is not None: native_bt.get(params_ptr) - params = bt2.values._create_from_ptr(params_ptr) + params = bt2.value._create_from_ptr(params_ptr) else: params = None @@ -515,7 +515,7 @@ class _UserComponentType(type): class _UserComponent(metaclass=_UserComponentType): @property def name(self): - pub_ptr = native_bt.component_from_private_component(self._ptr) + pub_ptr = native_bt.component_from_private(self._ptr) name = native_bt.component_get_name(pub_ptr) native_bt.put(pub_ptr) assert(name is not None) @@ -523,7 +523,7 @@ class _UserComponent(metaclass=_UserComponentType): @property def graph(self): - pub_ptr = native_bt.component_from_private_component(self._ptr) + pub_ptr = native_bt.component_from_private(self._ptr) ptr = native_bt.component_get_graph(pub_ptr) native_bt.put(pub_ptr) assert(ptr) @@ -531,7 +531,7 @@ class _UserComponent(metaclass=_UserComponentType): @property def component_class(self): - pub_ptr = native_bt.component_from_private_component(self._ptr) + pub_ptr = native_bt.component_from_private(self._ptr) cc_ptr = native_bt.component_get_class(pub_ptr) native_bt.put(pub_ptr) assert(cc_ptr) @@ -572,7 +572,7 @@ class _UserComponent(metaclass=_UserComponentType): other_port = bt2.port._create_from_ptr(other_port_ptr) try: - self._port_connected(port, other_port_ptr) + self._port_connected(port, other_port) except: if not _NO_PRINT_TRACEBACK: traceback.print_exc()