X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=bindings%2Fpython%2Fexamples%2Fsched_switch.py;h=1f4f48c7e0e3897acc293921a61e9a3ffc021b98;hp=9ab2b10fd04c2271b263d7d402f8d390fcd3cfea;hb=74ea15add8dd5d0d6ee70c2062b8671104000b4e;hpb=3c2ce778cc0d5e5be91e2fd1d176365a2ad65aa3

diff --git a/bindings/python/examples/sched_switch.py b/bindings/python/examples/sched_switch.py
index 9ab2b10f..1f4f48c7 100644
--- a/bindings/python/examples/sched_switch.py
+++ b/bindings/python/examples/sched_switch.py
@@ -35,23 +35,16 @@ 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
@@ -65,7 +58,7 @@ while event is not None:
 			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_with_scope(sco, "prev_comm")
@@ -117,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