X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fbindings%2Fpython%2Fbt2%2Fbt2%2Fstream.py;h=fe2af8621a0421487a47de84e5f19d1ebf8081d1;hb=f0a42b33ac3951cd5cb2ee0f66ac04437a681621;hp=2e75990deff5b31a6fcfdb1a3cf646542bee9048;hpb=4acc866e829881299a13d0aa8e28b93807549975;p=babeltrace.git

diff --git a/src/bindings/python/bt2/bt2/stream.py b/src/bindings/python/bt2/bt2/stream.py
index 2e75990d..fe2af862 100644
--- a/src/bindings/python/bt2/bt2/stream.py
+++ b/src/bindings/python/bt2/bt2/stream.py
@@ -21,38 +21,66 @@
 # THE SOFTWARE.
 
 from bt2 import native_bt, utils
-import bt2.packet
-import bt2.event
+from bt2 import object as bt2_object
+from bt2 import packet as bt2_packet
+from bt2 import trace as bt2_trace
+from bt2 import stream_class as bt2_stream_class
+from bt2 import value as bt2_value
 import bt2
 
 
-class _Stream(bt2.object._SharedObject):
+class _StreamConst(bt2_object._SharedObject):
     _get_ref = staticmethod(native_bt.stream_get_ref)
     _put_ref = staticmethod(native_bt.stream_put_ref)
+    _borrow_class_ptr = staticmethod(native_bt.stream_borrow_class_const)
+    _borrow_user_attributes_ptr = staticmethod(
+        native_bt.stream_borrow_user_attributes_const
+    )
+    _create_value_from_ptr_and_get_ref = staticmethod(
+        bt2_value._create_from_const_ptr_and_get_ref
+    )
+    _borrow_trace_ptr = staticmethod(native_bt.stream_borrow_trace_const)
+    _stream_class_pycls = bt2_stream_class._StreamClassConst
+    _trace_pycls = bt2_trace._TraceConst
 
     @property
     def cls(self):
-        stream_class_ptr = native_bt.stream_borrow_class(self._ptr)
+        stream_class_ptr = self._borrow_class_ptr(self._ptr)
         assert stream_class_ptr is not None
-        return bt2.stream_class._StreamClass._create_from_ptr_and_get_ref(
-            stream_class_ptr
-        )
+        return self._stream_class_pycls._create_from_ptr_and_get_ref(stream_class_ptr)
 
     @property
     def name(self):
         return native_bt.stream_get_name(self._ptr)
 
-    def _name(self, name):
-        utils._check_str(name)
-        native_bt.stream_set_name(self._ptr, name)
-
-    _name = property(fset=_name)
+    @property
+    def user_attributes(self):
+        ptr = self._borrow_user_attributes_ptr(self._ptr)
+        assert ptr is not None
+        return self._create_value_from_ptr_and_get_ref(ptr)
 
     @property
     def id(self):
         id = native_bt.stream_get_id(self._ptr)
         return id if id >= 0 else None
 
+    @property
+    def trace(self):
+        trace_ptr = self._borrow_trace_ptr(self._ptr)
+        assert trace_ptr is not None
+        return self._trace_pycls._create_from_ptr_and_get_ref(trace_ptr)
+
+
+class _Stream(_StreamConst):
+    _borrow_class_ptr = staticmethod(native_bt.stream_borrow_class)
+    _borrow_user_attributes_ptr = staticmethod(native_bt.stream_borrow_user_attributes)
+    _create_value_from_ptr_and_get_ref = staticmethod(
+        bt2_value._create_from_ptr_and_get_ref
+    )
+    _borrow_trace_ptr = staticmethod(native_bt.stream_borrow_trace)
+    _stream_class_pycls = bt2_stream_class._StreamClass
+    _trace_pycls = bt2_trace._Trace
+
     def create_packet(self):
         if not self.cls.supports_packets:
             raise ValueError(
@@ -62,6 +90,21 @@ class _Stream(bt2.object._SharedObject):
         packet_ptr = native_bt.packet_create(self._ptr)
 
         if packet_ptr is None:
-            raise bt2.MemoryError('cannot create packet object')
+            raise bt2._MemoryError('cannot create packet object')
+
+        return bt2_packet._Packet._create_from_ptr(packet_ptr)
+
+    def _user_attributes(self, user_attributes):
+        value = bt2_value.create_value(user_attributes)
+        utils._check_type(value, bt2_value.MapValue)
+        native_bt.stream_set_user_attributes(self._ptr, value._ptr)
+
+    _user_attributes = property(
+        fget=_StreamConst.user_attributes.fget, fset=_user_attributes
+    )
+
+    def _name(self, name):
+        utils._check_str(name)
+        native_bt.stream_set_name(self._ptr, name)
 
-        return bt2.packet._Packet._create_from_ptr(packet_ptr)
+    _name = property(fget=_StreamConst.name.fget, fset=_name)