bt2: add user attributes property support

[babeltrace.git] / src / bindings / python / bt2 / bt2 / trace.py

diff --git a/src/bindings/python/bt2/bt2/trace.py b/src/bindings/python/bt2/bt2/trace.py
index 86bd90d05ae1d58844e9654a2f6009fe3eb0d3b1..7f98ac8698f39a7f9aeb615e33c901a28b941152 100644 (file)
--- a/src/bindings/python/bt2/bt2/trace.py
+++ b/src/bindings/python/bt2/bt2/trace.py
@@ -21,11 +21,11 @@
 # THE SOFTWARE.
 
 from bt2 import native_bt, object, utils
-import bt2.field_class
 import collections.abc
-import bt2.value
-import bt2.stream
-import bt2.trace_class
+from bt2 import value as bt2_value
+from bt2 import stream as bt2_stream
+from bt2 import trace_class as bt2_trace_class
+from bt2 import stream_class as bt2_stream_class
 import bt2
 import functools
 import uuid as uuidp
@@ -44,7 +44,7 @@ class _TraceEnv(collections.abc.MutableMapping):
         if value_ptr is None:
             raise KeyError(key)
 
-        return bt2.value._create_from_ptr_and_get_ref(value_ptr)
+        return bt2_value._create_from_ptr_and_get_ref(value_ptr)
 
     def __setitem__(self, key, value):
         if isinstance(value, str):
@@ -76,7 +76,7 @@ class _TraceEnv(collections.abc.MutableMapping):
 
 
 def _trace_destruction_listener_from_native(user_listener, trace_ptr):
-    trace = bt2.trace._Trace._create_from_ptr_and_get_ref(trace_ptr)
+    trace = _Trace._create_from_ptr_and_get_ref(trace_ptr)
     user_listener(trace)
 
 
@@ -97,7 +97,7 @@ class _Trace(object._SharedObject, collections.abc.Mapping):
         if stream_ptr is None:
             raise KeyError(id)
 
-        return bt2.stream._Stream._create_from_ptr_and_get_ref(stream_ptr)
+        return bt2_stream._Stream._create_from_ptr_and_get_ref(stream_ptr)
 
     def __iter__(self):
         for idx in range(len(self)):
@@ -113,7 +113,20 @@ class _Trace(object._SharedObject, collections.abc.Mapping):
     def cls(self):
         trace_class_ptr = native_bt.trace_borrow_class(self._ptr)
         assert trace_class_ptr is not None
-        return bt2.trace_class._TraceClass._create_from_ptr_and_get_ref(trace_class_ptr)
+        return bt2_trace_class._TraceClass._create_from_ptr_and_get_ref(trace_class_ptr)
+
+    @property
+    def user_attributes(self):
+        ptr = native_bt.trace_borrow_user_attributes(self._ptr)
+        assert ptr is not None
+        return bt2_value._create_from_ptr_and_get_ref(ptr)
+
+    def _user_attributes(self, user_attributes):
+        value = bt2_value.create_value(user_attributes)
+        utils._check_type(value, bt2_value.MapValue)
+        native_bt.trace_set_user_attributes(self._ptr, value._ptr)
+
+    _user_attributes = property(fset=_user_attributes)
 
     @property
     def name(self):
@@ -144,8 +157,8 @@ class _Trace(object._SharedObject, collections.abc.Mapping):
     def env(self):
         return _TraceEnv(self)
 
-    def create_stream(self, stream_class, id=None, name=None):
-        utils._check_type(stream_class, bt2.stream_class._StreamClass)
+    def create_stream(self, stream_class, id=None, name=None, user_attributes=None):
+        utils._check_type(stream_class, bt2_stream_class._StreamClass)
 
         if stream_class.assigns_automatic_stream_id:
             if id is not None:
@@ -166,13 +179,16 @@ class _Trace(object._SharedObject, collections.abc.Mapping):
             )
 
         if stream_ptr is None:
-            raise bt2.CreationError('cannot create stream object')
+            raise bt2._MemoryError('cannot create stream object')
 
-        stream = bt2.stream._Stream._create_from_ptr(stream_ptr)
+        stream = bt2_stream._Stream._create_from_ptr(stream_ptr)
 
         if name is not None:
             stream._name = name
 
+        if user_attributes is not None:
+            stream._user_attributes = user_attributes
+
         return stream
 
     def add_destruction_listener(self, listener):
@@ -190,4 +206,4 @@ class _Trace(object._SharedObject, collections.abc.Mapping):
             status, 'cannot add destruction listener to trace object'
         )
 
-        return bt2._ListenerHandle(listener_id, self)
+        return utils._ListenerHandle(listener_id, self)