bt2: update object model

[babeltrace.git] / bindings / python / bt2 / bt2 / port.py

diff --git a/bindings/python/bt2/bt2/port.py b/bindings/python/bt2/bt2/port.py
index ed168c4abde6643c626ccc8c27ba1cbab2225081..ebd2765045a198423d939c461d5406a3fbe161b7 100644 (file)
--- a/bindings/python/bt2/bt2/port.py
+++ b/bindings/python/bt2/bt2/port.py
@@ -24,6 +24,8 @@ from bt2 import native_bt, object, utils
 import collections.abc
 import bt2.component
 import bt2.connection
+import bt2.message_iterator
+import bt2.message
 import copy
 import bt2
 
@@ -42,7 +44,7 @@ def _create_from_ptr(ptr):
 
 
 def _create_private_from_ptr(ptr):
-    pub_ptr = native_bt.port_from_private_port(ptr)
+    pub_ptr = native_bt.port_from_private(ptr)
     utils._handle_ptr(pub_ptr, 'cannot get port object from private port object')
     port_type = native_bt.port_get_type(pub_ptr)
     assert(port_type == native_bt.PORT_TYPE_INPUT or port_type == native_bt.PORT_TYPE_OUTPUT)
@@ -57,7 +59,7 @@ def _create_private_from_ptr(ptr):
     return obj
 
 
-class _Port(object._Object):
+class _Port(object._SharedObject):
     @staticmethod
     def _name(ptr):
         name = native_bt.port_get_name(ptr)
@@ -112,10 +114,24 @@ class _InputPort(_Port):
 
 
 class _OutputPort(_Port):
-    pass
+    def create_message_iterator(self, message_types=None,
+                                     colander_component_name=None):
+        msg_types = bt2.message._msg_types_from_msg_classes(message_types)
+
+        if colander_component_name is not None:
+            utils._check_str(colander_component_name)
+
+        msg_iter_ptr = native_bt.py3_create_output_port_msg_iter(int(self._ptr),
+                                                                     colander_component_name,
+                                                                     msg_types)
+
+        if msg_iter_ptr is None:
+            raise bt2.CreationError('cannot create output port message iterator')
+
+        return bt2.message_iterator._OutputPortMessageIterator._create_from_ptr(msg_iter_ptr)
 
 
-class _PrivatePort(object._PrivateObject, _Port):
+class _PrivatePort(_Port):
     @property
     def name(self):
         return self._name(self._pub_ptr)
@@ -127,7 +143,7 @@ class _PrivatePort(object._PrivateObject, _Port):
         if comp_ptr is None:
             return
 
-        pub_comp_ptr = native_bt.component_from_private_component(comp_ptr)
+        pub_comp_ptr = native_bt.component_from_private(comp_ptr)
         assert(pub_comp_ptr)
         comp = bt2.component._create_generic_component_from_ptr(pub_comp_ptr)
         native_bt.put(comp_ptr)