X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fbindings%2Fpython%2Fbt2%2Fbt2%2Fmessage_iterator.py;h=62c5610c5f788673952f725af0fc84fe63767242;hb=768f9bcbf4b5acd09dda85ab32c0ea30d8826136;hp=5b4cc1bdb3df458691f6b03b29993bb03b811529;hpb=0235b0db7de5bcacdb3650c92461f2ce5eb2143d;p=babeltrace.git

diff --git a/src/bindings/python/bt2/bt2/message_iterator.py b/src/bindings/python/bt2/bt2/message_iterator.py
index 5b4cc1bd..62c5610c 100644
--- a/src/bindings/python/bt2/bt2/message_iterator.py
+++ b/src/bindings/python/bt2/bt2/message_iterator.py
@@ -104,8 +104,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.
@@ -218,6 +217,9 @@ class _UserMessageIterator(_MessageIterator):
     def _create_message_iterator(self, input_port):
         utils._check_type(input_port, bt2_port._UserComponentInputPort)
 
+        if not input_port.is_connected:
+            raise ValueError('input port is not connected')
+
         (
             status,
             msg_iter_ptr,
@@ -380,8 +382,18 @@ class _UserMessageIterator(_MessageIterator):
 
             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:
@@ -417,8 +429,18 @@ class _UserMessageIterator(_MessageIterator):
 
             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: