X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fbindings%2Fpython%2Fbt2%2Fbt2%2Fmessage_iterator.py;h=670eaf80eabf2af9a6c1a9d4bd580c433564e5ff;hb=9dee90bdad3dac00a1caff5c9a1e58fb284ee19d;hp=253fbcc73c4c9cdd63488fd381dc2fc671274e3f;hpb=c0e46a7c2b7bdd588eb716191940bf5b34f9fc5b;p=babeltrace.git diff --git a/src/bindings/python/bt2/bt2/message_iterator.py b/src/bindings/python/bt2/bt2/message_iterator.py index 253fbcc7..670eaf80 100644 --- a/src/bindings/python/bt2/bt2/message_iterator.py +++ b/src/bindings/python/bt2/bt2/message_iterator.py @@ -1,24 +1,6 @@ -# The MIT License (MIT) +# SPDX-License-Identifier: MIT # # Copyright (c) 2017 Philippe Proulx -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. from bt2 import native_bt, object, utils from bt2 import message as bt2_message @@ -37,12 +19,13 @@ 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 - ) + @staticmethod + def _get_ref(ptr): + native_bt.message_iterator_get_ref(ptr) + + @staticmethod + def _put_ref(ptr): + native_bt.message_iterator_put_ref(ptr) def __init__(self, ptr): self._current_msgs = [] @@ -55,7 +38,7 @@ class _UserComponentInputPortMessageIterator(object._SharedObject, _MessageItera self._ptr ) utils._handle_func_status( - status, 'unexpected error: cannot advance the message iterator' + status, "unexpected error: cannot advance the message iterator" ) self._current_msgs = msgs self._at = 0 @@ -66,12 +49,10 @@ 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', + "cannot check whether or not message iterator can seek its beginning", ) return res != 0 @@ -80,19 +61,17 @@ 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 - ) - utils._handle_func_status(status, 'cannot seek message iterator beginning') + 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( status, - 'cannot check whether or not message iterator can seek given ns from origin', + "cannot check whether or not message iterator can seek given ns from origin", ) return res != 0 @@ -103,18 +82,16 @@ 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( - status, 'message iterator cannot seek given ns from origin' + status, "message iterator cannot seek given ns from origin" ) @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: @@ -132,8 +109,7 @@ class _MessageIteratorConfiguration: # This is extended by the user to implement component classes in Python. It # is created for a given output port when an input port message iterator is -# created on the input port on the other side of the connection. It is also -# created when an output port message iterator is created on this output port. +# created on the input port on the other side of the connection. # # Its purpose is to feed the messages that should go out through this output # port. @@ -213,12 +189,12 @@ class _UserMessageIterator(_MessageIterator): # read it and use that result. # - Otherwise, the presence or absence of a `_user_seek_beginning` # method indicates whether the iterator can seek beginning. - if hasattr(self, '_user_can_seek_beginning'): + if hasattr(self, "_user_can_seek_beginning"): can_seek_beginning = self._user_can_seek_beginning() utils._check_bool(can_seek_beginning) return can_seek_beginning else: - return hasattr(self, '_user_seek_beginning') + return hasattr(self, "_user_seek_beginning") def _bt_seek_beginning_from_native(self): self._user_seek_beginning() @@ -233,23 +209,29 @@ class _UserMessageIterator(_MessageIterator): # - Otherwise, if there is a `_user_seek_ns_from_origin` method, # we presume it's possible. - if hasattr(self, '_user_can_seek_ns_from_origin'): + if hasattr(self, "_user_can_seek_ns_from_origin"): can_seek_ns_from_origin = self._user_can_seek_ns_from_origin(ns_from_origin) utils._check_bool(can_seek_ns_from_origin) return can_seek_ns_from_origin else: - return hasattr(self, '_user_seek_ns_from_origin') + return hasattr(self, "_user_seek_ns_from_origin") 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( + if not input_port.is_connected: + raise ValueError("input port is not connected") + + ( + status, + msg_iter_ptr, + ) = 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') + utils._handle_func_status(status, "cannot create message iterator object") assert msg_iter_ptr is not None return _UserComponentInputPortMessageIterator(msg_iter_ptr) @@ -265,7 +247,7 @@ class _UserMessageIterator(_MessageIterator): if default_clock_snapshot is not None: if event_class.stream_class.default_clock_class is None: raise ValueError( - 'event messages in this stream must not have a default clock snapshot' + "event messages in this stream must not have a default clock snapshot" ) utils._check_uint64(default_clock_snapshot) @@ -281,7 +263,7 @@ class _UserMessageIterator(_MessageIterator): else: if event_class.stream_class.default_clock_class is not None: raise ValueError( - 'event messages in this stream must have a default clock snapshot' + "event messages in this stream must have a default clock snapshot" ) if event_class.stream_class.supports_packets: @@ -294,7 +276,7 @@ class _UserMessageIterator(_MessageIterator): ) if ptr is None: - raise bt2._MemoryError('cannot create event message object') + raise bt2._MemoryError("cannot create event message object") return bt2_message._EventMessage(ptr) @@ -305,7 +287,7 @@ class _UserMessageIterator(_MessageIterator): ) if ptr is None: - raise bt2._MemoryError('cannot create inactivity message object') + raise bt2._MemoryError("cannot create inactivity message object") return bt2_message._MessageIteratorInactivityMessage(ptr) @@ -314,7 +296,7 @@ class _UserMessageIterator(_MessageIterator): ptr = native_bt.message_stream_beginning_create(self._bt_ptr, stream._ptr) if ptr is None: - raise bt2._MemoryError('cannot create stream beginning message object') + raise bt2._MemoryError("cannot create stream beginning message object") msg = bt2_message._StreamBeginningMessage(ptr) @@ -328,7 +310,7 @@ class _UserMessageIterator(_MessageIterator): ptr = native_bt.message_stream_end_create(self._bt_ptr, stream._ptr) if ptr is None: - raise bt2._MemoryError('cannot create stream end message object') + raise bt2._MemoryError("cannot create stream end message object") msg = bt2_message._StreamEndMessage(ptr) @@ -359,7 +341,7 @@ class _UserMessageIterator(_MessageIterator): ptr = native_bt.message_packet_beginning_create(self._bt_ptr, packet._ptr) if ptr is None: - raise bt2._MemoryError('cannot create packet beginning message object') + raise bt2._MemoryError("cannot create packet beginning message object") return bt2_message._PacketBeginningMessage(ptr) @@ -385,7 +367,7 @@ class _UserMessageIterator(_MessageIterator): ptr = native_bt.message_packet_end_create(self._bt_ptr, packet._ptr) if ptr is None: - raise bt2._MemoryError('cannot create packet end message object') + raise bt2._MemoryError("cannot create packet end message object") return bt2_message._PacketEndMessage(ptr) @@ -395,29 +377,39 @@ class _UserMessageIterator(_MessageIterator): utils._check_type(stream, bt2_stream._Stream) if not stream.cls.supports_discarded_events: - raise ValueError('stream class does not support discarded events') + raise ValueError("stream class does not support discarded events") if stream.cls.discarded_events_have_default_clock_snapshots: if beg_clock_snapshot is None or end_clock_snapshot is None: raise ValueError( - 'discarded events have default clock snapshots for this stream class' + "discarded events have default clock snapshots for this stream class" ) utils._check_uint64(beg_clock_snapshot) utils._check_uint64(end_clock_snapshot) - ptr = native_bt.message_discarded_events_create_with_default_clock_snapshots( - self._bt_ptr, stream._ptr, beg_clock_snapshot, end_clock_snapshot + + if beg_clock_snapshot > end_clock_snapshot: + raise ValueError( + "beginning default clock snapshot value ({}) is greater than end default clock snapshot value ({})".format( + beg_clock_snapshot, end_clock_snapshot + ) + ) + + ptr = ( + native_bt.message_discarded_events_create_with_default_clock_snapshots( + self._bt_ptr, stream._ptr, beg_clock_snapshot, end_clock_snapshot + ) ) else: if beg_clock_snapshot is not None or end_clock_snapshot is not None: raise ValueError( - 'discarded events have no default clock snapshots for this stream class' + "discarded events have no default clock snapshots for this stream class" ) ptr = native_bt.message_discarded_events_create(self._bt_ptr, stream._ptr) if ptr is None: - raise bt2._MemoryError('cannot discarded events message object') + raise bt2._MemoryError("cannot discarded events message object") msg = bt2_message._DiscardedEventsMessage(ptr) @@ -432,29 +424,39 @@ class _UserMessageIterator(_MessageIterator): utils._check_type(stream, bt2_stream._Stream) if not stream.cls.supports_discarded_packets: - raise ValueError('stream class does not support discarded packets') + raise ValueError("stream class does not support discarded packets") if stream.cls.discarded_packets_have_default_clock_snapshots: if beg_clock_snapshot is None or end_clock_snapshot is None: raise ValueError( - 'discarded packets have default clock snapshots for this stream class' + "discarded packets have default clock snapshots for this stream class" ) utils._check_uint64(beg_clock_snapshot) utils._check_uint64(end_clock_snapshot) - ptr = native_bt.message_discarded_packets_create_with_default_clock_snapshots( - self._bt_ptr, stream._ptr, beg_clock_snapshot, end_clock_snapshot + + if beg_clock_snapshot > end_clock_snapshot: + raise ValueError( + "beginning default clock snapshot value ({}) is greater than end default clock snapshot value ({})".format( + beg_clock_snapshot, end_clock_snapshot + ) + ) + + ptr = ( + native_bt.message_discarded_packets_create_with_default_clock_snapshots( + self._bt_ptr, stream._ptr, beg_clock_snapshot, end_clock_snapshot + ) ) else: if beg_clock_snapshot is not None or end_clock_snapshot is not None: raise ValueError( - 'discarded packets have no default clock snapshots for this stream class' + "discarded packets have no default clock snapshots for this stream class" ) ptr = native_bt.message_discarded_packets_create(self._bt_ptr, stream._ptr) if ptr is None: - raise bt2._MemoryError('cannot discarded packets message object') + raise bt2._MemoryError("cannot discarded packets message object") msg = bt2_message._DiscardedPacketsMessage(ptr)