X-Git-Url: https://git.efficios.com/?a=blobdiff_plain;f=src%2Fbindings%2Fpython%2Fbt2%2Fbt2%2Fmessage_iterator.py;h=2fef7d68dfcb183f6cf15b5d78c5b9a9b008d686;hb=fbd8a4e0144aa7777bedcd8c05daec61d594634d;hp=8f3aac92ef6c8e045cefb62c13229706558d8825;hpb=1906e012b741e9fea75e778ffaecffbf79ecc0fc;p=babeltrace.git diff --git a/src/bindings/python/bt2/bt2/message_iterator.py b/src/bindings/python/bt2/bt2/message_iterator.py index 8f3aac92..2fef7d68 100644 --- a/src/bindings/python/bt2/bt2/message_iterator.py +++ b/src/bindings/python/bt2/bt2/message_iterator.py @@ -37,12 +37,8 @@ class _MessageIterator(collections.abc.Iterator): class _UserComponentInputPortMessageIterator(object._SharedObject, _MessageIterator): - _get_ref = staticmethod( - native_bt.self_component_port_input_message_iterator_get_ref - ) - _put_ref = staticmethod( - native_bt.self_component_port_input_message_iterator_put_ref - ) + _get_ref = staticmethod(native_bt.message_iterator_get_ref) + _put_ref = staticmethod(native_bt.message_iterator_put_ref) def __init__(self, ptr): self._current_msgs = [] @@ -66,12 +62,7 @@ class _UserComponentInputPortMessageIterator(object._SharedObject, _MessageItera return bt2_message._create_from_ptr(msg_ptr) def can_seek_beginning(self): - ( - status, - res, - ) = native_bt.self_component_port_input_message_iterator_can_seek_beginning( - self._ptr - ) + (status, res) = native_bt.message_iterator_can_seek_beginning(self._ptr) utils._handle_func_status( status, 'cannot check whether or not message iterator can seek its beginning', @@ -83,17 +74,12 @@ class _UserComponentInputPortMessageIterator(object._SharedObject, _MessageItera self._current_msgs.clear() self._at = 0 - status = native_bt.self_component_port_input_message_iterator_seek_beginning( - self._ptr - ) + status = native_bt.message_iterator_seek_beginning(self._ptr) utils._handle_func_status(status, 'cannot seek message iterator beginning') def can_seek_ns_from_origin(self, ns_from_origin): utils._check_int64(ns_from_origin) - ( - status, - res, - ) = native_bt.self_component_port_input_message_iterator_can_seek_ns_from_origin( + (status, res) = native_bt.message_iterator_can_seek_ns_from_origin( self._ptr, ns_from_origin ) utils._handle_func_status( @@ -109,7 +95,7 @@ class _UserComponentInputPortMessageIterator(object._SharedObject, _MessageItera self._current_msgs.clear() self._at = 0 - status = native_bt.self_component_port_input_message_iterator_seek_ns_from_origin( + status = native_bt.message_iterator_seek_ns_from_origin( self._ptr, ns_from_origin ) utils._handle_func_status( @@ -118,9 +104,7 @@ class _UserComponentInputPortMessageIterator(object._SharedObject, _MessageItera @property def can_seek_forward(self): - return native_bt.self_component_port_input_message_iterator_can_seek_forward( - self._ptr - ) + return native_bt.message_iterator_can_seek_forward(self._ptr) class _MessageIteratorConfiguration: @@ -249,13 +233,13 @@ class _UserMessageIterator(_MessageIterator): def _bt_seek_ns_from_origin_from_native(self, ns_from_origin): self._user_seek_ns_from_origin(ns_from_origin) - def _create_input_port_message_iterator(self, input_port): + def _create_message_iterator(self, input_port): utils._check_type(input_port, bt2_port._UserComponentInputPort) ( status, msg_iter_ptr, - ) = native_bt.bt2_self_component_port_input_message_iterator_create_from_message_iterator( + ) = native_bt.bt2_message_iterator_create_from_message_iterator( self._bt_ptr, input_port._ptr ) utils._handle_func_status(status, 'cannot create message iterator object')