bt2: remove _GenericMessageIterator abstraction level
[babeltrace.git] / src / bindings / python / bt2 / bt2 / message_iterator.py
index c6c23dfd8b8848ea004f026036e86a3b48913925..3a3a2a430681608688e68d2f79921ae63c03f398 100644 (file)
@@ -23,7 +23,6 @@
 from bt2 import native_bt, object, utils
 from bt2 import message as bt2_message
 import collections.abc
-from bt2 import component as bt2_component
 from bt2 import stream as bt2_stream
 from bt2 import event_class as bt2_event_class
 from bt2 import packet as bt2_packet
@@ -37,7 +36,14 @@ class _MessageIterator(collections.abc.Iterator):
         raise NotImplementedError
 
 
-class _GenericMessageIterator(object._SharedObject, _MessageIterator):
+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
+    )
+
     def __init__(self, ptr):
         self._current_msgs = []
         self._at = 0
@@ -45,7 +51,9 @@ class _GenericMessageIterator(object._SharedObject, _MessageIterator):
 
     def __next__(self):
         if len(self._current_msgs) == self._at:
-            status, msgs = self._get_msg_range(self._ptr)
+            status, msgs = native_bt.bt2_self_component_port_input_get_msg_range(
+                self._ptr
+            )
             utils._handle_func_status(
                 status, 'unexpected error: cannot advance the message iterator'
             )
@@ -57,51 +65,27 @@ class _GenericMessageIterator(object._SharedObject, _MessageIterator):
 
         return bt2_message._create_from_ptr(msg_ptr)
 
-    @property
     def can_seek_beginning(self):
-        res = self._can_seek_beginning(self._ptr)
+        status, res = native_bt.self_component_port_input_message_iterator_can_seek_beginning(
+            self._ptr
+        )
+        utils._handle_func_status(
+            status,
+            'cannot check whether or not message iterator can seek its beginning',
+        )
         return res != 0
 
     def seek_beginning(self):
-        # Forget about buffered messages, they won't be valid after seeking..
+        # Forget about buffered messages, they won't be valid after seeking.
         self._current_msgs.clear()
         self._at = 0
 
-        status = self._seek_beginning(self._ptr)
+        status = native_bt.self_component_port_input_message_iterator_seek_beginning(
+            self._ptr
+        )
         utils._handle_func_status(status, 'cannot seek message iterator beginning')
 
 
-# This is created when a component wants to iterate on one of its input ports.
-class _UserComponentInputPortMessageIterator(_GenericMessageIterator):
-    _get_msg_range = staticmethod(native_bt.bt2_self_component_port_input_get_msg_range)
-    _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
-    )
-    _can_seek_beginning = staticmethod(
-        native_bt.self_component_port_input_message_iterator_can_seek_beginning
-    )
-    _seek_beginning = staticmethod(
-        native_bt.self_component_port_input_message_iterator_seek_beginning
-    )
-
-
-# This is created when the user wants to iterate on a component's output port,
-# from outside the graph.
-class _OutputPortMessageIterator(_GenericMessageIterator):
-    _get_msg_range = staticmethod(native_bt.bt2_port_output_get_msg_range)
-    _get_ref = staticmethod(native_bt.port_output_message_iterator_get_ref)
-    _put_ref = staticmethod(native_bt.port_output_message_iterator_put_ref)
-    _can_seek_beginning = staticmethod(
-        native_bt.port_output_message_iterator_can_seek_beginning
-    )
-    _seek_beginning = staticmethod(
-        native_bt.port_output_message_iterator_seek_beginning
-    )
-
-
 # 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
@@ -138,6 +122,14 @@ class _UserMessageIterator(_MessageIterator):
     def _component(self):
         return native_bt.bt2_get_user_component_from_user_msg_iter(self._bt_ptr)
 
+    @property
+    def _port(self):
+        port_ptr = native_bt.self_message_iterator_borrow_port(self._bt_ptr)
+        assert port_ptr is not None
+        return bt2_port._create_self_from_ptr_and_get_ref(
+            port_ptr, native_bt.PORT_TYPE_OUTPUT
+        )
+
     @property
     def addr(self):
         return int(self._bt_ptr)
@@ -158,10 +150,10 @@ class _UserMessageIterator(_MessageIterator):
             msg = next(self)
         except StopIteration:
             raise bt2.Stop
-        except:
+        except Exception:
             raise
 
-        utils._check_type(msg, bt2_message._Message)
+        utils._check_type(msg, bt2_message._MessageConst)
 
         # The reference we return will be given to the message array.
         # However, the `msg` Python object may stay alive, if the user has kept
@@ -169,16 +161,15 @@ class _UserMessageIterator(_MessageIterator):
         msg._get_ref(msg._ptr)
         return int(msg._ptr)
 
-    @property
     def _bt_can_seek_beginning_from_native(self):
         # Here, we mimic the behavior of the C API:
         #
-        # - If the iterator has a _user_can_seek_beginning attribute,
+        # - If the iterator has a _user_can_seek_beginning method,
         #   read it and use that result.
-        # - Otherwise, the presence or absence of a `_seek_beginning`
+        # - 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'):
-            can_seek_beginning = self._user_can_seek_beginning
+            can_seek_beginning = self._user_can_seek_beginning()
             utils._check_bool(can_seek_beginning)
             return can_seek_beginning
         else:
@@ -190,18 +181,15 @@ class _UserMessageIterator(_MessageIterator):
     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_message_iterator(
+        status, msg_iter_ptr = native_bt.bt2_self_component_port_input_message_iterator_create_from_message_iterator(
             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 _UserComponentInputPortMessageIterator(msg_iter_ptr)
 
-    def _create_event_message(
-        self, event_class, parent=None, default_clock_snapshot=None
-    ):
+    def _create_event_message(self, event_class, parent, default_clock_snapshot=None):
         utils._check_type(event_class, bt2_event_class._EventClass)
 
         if event_class.stream_class.supports_packets:
This page took 0.025454 seconds and 4 git commands to generate.