X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=bindings%2Fpython%2Fbt2%2Fbt2%2Ftrace_class.py;h=5713db8c9e5d68ad98c97a960a11abfbcd23218e;hb=2c6f8520ad68e1ca0c9554d705c39790e7d3ef5f;hp=b8eeb30f22ef7a1d5059df15bf5e1787141ecad1;hpb=4430bc809d78701c128ced642fb4e9597bc00ad0;p=babeltrace.git

diff --git a/bindings/python/bt2/bt2/trace_class.py b/bindings/python/bt2/bt2/trace_class.py
index b8eeb30f..5713db8c 100644
--- a/bindings/python/bt2/bt2/trace_class.py
+++ b/bindings/python/bt2/bt2/trace_class.py
@@ -22,10 +22,11 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-__all__ = ['TraceClass']
+__all__ = ['_TraceClass']
 
 import bt2
 from bt2 import native_bt, utils, object
+import bt2.stream_class
 import uuid as uuidp
 import collections.abc
 import functools
@@ -95,11 +96,11 @@ class _StreamClassIterator(collections.abc.Iterator):
 
 
 def _trace_class_destruction_listener_from_native(user_listener, trace_class_ptr):
-    trace_class = bt2.trace_class.TraceClass._create_from_ptr_and_get_ref(trace_class_ptr)
+    trace_class = bt2.trace_class._TraceClass._create_from_ptr_and_get_ref(trace_class_ptr)
     user_listener(trace_class)
 
 
-class TraceClass(object._SharedObject, collections.abc.Mapping):
+class _TraceClass(object._SharedObject, collections.abc.Mapping):
     _get_ref = staticmethod(native_bt.trace_class_get_ref)
     _put_ref = staticmethod(native_bt.trace_class_put_ref)
 
@@ -125,7 +126,7 @@ class TraceClass(object._SharedObject, collections.abc.Mapping):
         if trace_ptr is None:
             raise bt2.CreationError('cannot create trace class object')
 
-        trace = bt2.trace.Trace._create_from_ptr(trace_ptr)
+        trace = bt2.trace._Trace._create_from_ptr(trace_ptr)
 
         if name is not None:
             trace._name = name
@@ -148,7 +149,7 @@ class TraceClass(object._SharedObject, collections.abc.Mapping):
         if sc_ptr is None:
             raise KeyError(key)
 
-        return bt2.StreamClass._create_from_ptr_and_get_ref(sc_ptr)
+        return bt2.stream_class._StreamClass._create_from_ptr_and_get_ref(sc_ptr)
 
     def __iter__(self):
         for idx in range(len(self)):
@@ -171,8 +172,12 @@ class TraceClass(object._SharedObject, collections.abc.Mapping):
                             default_clock_class=None,
                             assigns_automatic_event_class_id=True,
                             assigns_automatic_stream_id=True,
-                            packets_have_default_beginning_clock_snapshot=False,
-                            packets_have_default_end_clock_snapshot=False):
+                            packets_have_beginning_default_clock_snapshot=False,
+                            packets_have_end_default_clock_snapshot=False,
+                            supports_discarded_events=False,
+                            discarded_events_have_default_clock_snapshots=False,
+                            supports_discarded_packets=False,
+                            discarded_packets_have_default_clock_snapshots=False):
 
         if self.assigns_automatic_stream_class_id:
             if id is not None:
@@ -186,7 +191,7 @@ class TraceClass(object._SharedObject, collections.abc.Mapping):
             utils._check_uint64(id)
             sc_ptr = native_bt.stream_class_create_with_id(self._ptr, id)
 
-        sc = bt2.stream_class.StreamClass._create_from_ptr(sc_ptr)
+        sc = bt2.stream_class._StreamClass._create_from_ptr(sc_ptr)
 
         if name is not None:
             sc._name = name
@@ -202,9 +207,12 @@ class TraceClass(object._SharedObject, collections.abc.Mapping):
 
         sc._assigns_automatic_event_class_id = assigns_automatic_event_class_id
         sc._assigns_automatic_stream_id = assigns_automatic_stream_id
-        sc._packets_have_default_beginning_clock_snapshot = packets_have_default_beginning_clock_snapshot
-        sc._packets_have_default_end_clock_snapshot = packets_have_default_end_clock_snapshot
-
+        sc._packets_have_beginning_default_clock_snapshot = packets_have_beginning_default_clock_snapshot
+        sc._packets_have_end_default_clock_snapshot = packets_have_end_default_clock_snapshot
+        sc._set_supports_discarded_events(supports_discarded_events,
+                                          discarded_events_have_default_clock_snapshots)
+        sc._set_supports_discarded_packets(supports_discarded_packets,
+                                           discarded_packets_have_default_clock_snapshots)
         return sc
 
     @property