Python-bindings: Refactor the Context class

[babeltrace.git] / bindings / python / examples / sched_switch.py

diff --git a/bindings/python/examples/sched_switch.py b/bindings/python/examples/sched_switch.py
index d5ed25bd6dfdb78b6696db15d52e71ab52469aa5..1f4f48c7e0e3897acc293921a61e9a3ffc021b98 100644 (file)
--- a/bindings/python/examples/sched_switch.py
+++ b/bindings/python/examples/sched_switch.py
@@ -35,81 +35,72 @@ elif len(sys.argv) == 3:
 else:
        usePID = False
 
-
-ctx = Context()
-ret = ctx.add_trace(sys.argv[len(sys.argv)-1], "ctf")
+traces = TraceCollection()
+ret = traces.add_trace(sys.argv[len(sys.argv)-1], "ctf")
 if ret is None:
        raise IOError("Error adding trace")
 
-# Setting iterator
-bp = IterPos(SEEK_BEGIN)
-ctf_it = ctf.Iterator(ctx, bp)
-
-# Reading events
-event = ctf_it.read_event()
-while event is not None:
+for event in traces.events:
        while True:
                if event.get_name() == "sched_switch":
                        # Getting scope definition
-                       sco = event.get_top_level_scope(ctf.scope.STREAM_EVENT_CONTEXT)
+                       sco = event.get_top_level_scope(CTFReader.scope.STREAM_EVENT_CONTEXT)
                        if sco is None:
                                print("ERROR: Cannot get definition scope for sched_switch")
                                break # Next event
 
                        # Getting PID
-                       pid_field = event.get_field(sco, "_pid")
-                       pid = pid_field.get_int64()
-
-                       if ctf.field_error():
+                       pid_field = event.get_field_with_scope(sco, "pid")
+                       if pid_field is None:
                                print("ERROR: Missing PID info for sched_switch")
                                break # Next event
-
+                       pid = pid_field.get_value()
                        if usePID and (pid != long(sys.argv[1])):
                                break # Next event
 
-                       sco = event.get_top_level_scope(ctf.scope.EVENT_FIELDS)
+                       sco = event.get_top_level_scope(CTFReader.scope.EVENT_FIELDS)
 
                        # prev_comm
-                       field = event.get_field(sco, "_prev_comm")
-                       prev_comm = field.get_char_array()
-                       if ctf.field_error():
+                       field = event.get_field_with_scope(sco, "prev_comm")
+                       if field is None:
                                print("ERROR: Missing prev_comm context info")
+                       prev_comm = field.get_value()
 
                        # prev_tid
-                       field = event.get_field(sco, "_prev_tid")
-                       prev_tid = field.get_int64()
-                       if ctf.field_error():
+                       field = event.get_field_with_scope(sco, "prev_tid")
+                       if field is None:
                                print("ERROR: Missing prev_tid context info")
+                       prev_tid = field.get_value()
 
                        # prev_prio
-                       field = event.get_field(sco, "_prev_prio")
-                       prev_prio = field.get_int64()
-                       if ctf.field_error():
+                       field = event.get_field_with_scope(sco, "prev_prio")
+                       if field is None:
                                print("ERROR: Missing prev_prio context info")
+                       prev_prio = field.get_value()
 
                        # prev_state
-                       field = event.get_field(sco, "_prev_state")
-                       prev_state = field.get_int64()
-                       if ctf.field_error():
+                       field = event.get_field_with_scope(sco, "prev_state")
+                       if field is None:
                                print("ERROR: Missing prev_state context info")
+                       prev_state = field.get_value()
 
                        # next_comm
-                       field = event.get_field(sco, "_next_comm")
-                       next_comm = field.get_char_array()
-                       if ctf.field_error():
+                       field = event.get_field_with_scope(sco, "next_comm")
+                       if field is None:
                                print("ERROR: Missing next_comm context info")
+                       next_comm = field.get_value()
 
                        # next_tid
-                       field = event.get_field(sco, "_next_tid")
-                       next_tid = field.get_int64()
-                       if ctf.field_error():
+                       field = event.get_field_with_scope(sco, "next_tid")
+                       if field is None:
                                print("ERROR: Missing next_tid context info")
+                       next_tid = field.get_value()
 
                        # next_prio
-                       field = event.get_field(sco, "_next_prio")
-                       next_prio = field.get_int64()
-                       if ctf.field_error():
+                       field = event.get_field_with_scope(sco, "next_prio")
+                       if field is None:
                                print("ERROR: Missing next_prio context info")
+                       next_prio = field.get_value()
 
                        # Output
                        print("sched_switch, pid = {}, TS = {}, prev_comm = {},\n\t"
@@ -119,11 +110,3 @@ while event is not None:
                                prev_prio, prev_state, next_comm, next_tid, next_prio))
 
                break # Next event
-
-       # Next event
-       ret = ctf_it.next()
-       if ret < 0:
-               break
-       event = ctf_it.read_event()
-
-del ctf_it