Merge pull request #167 from brendangregg/master

improve examples using new features

examples/bitehist.py

@@ -44,9 +44,6 @@ dist_max = 64
 
 # header
 print("Tracing... Hit Ctrl-C to end.")
-last = {}
-for i in range(1, dist_max + 1):
-	last[i] = 0
 
 # functions
 stars_max = 38
@@ -67,7 +64,7 @@ def print_log2_hist(dist, val_type):
 	val_max = 0
 	for i in range(1, dist_max + 1):
 		try:
-			val = dist[c_int(i)].value - last[i]
+			val = dist[c_int(i)].value
 			if (val > 0):
 				idx_max = i
 			if (val > val_max):
@@ -82,10 +79,9 @@ def print_log2_hist(dist, val_type):
 		if (low == high):
 			low -= 1
 		try:
-			val = dist[c_int(i)].value - last[i]
+			val = dist[c_int(i)].value
 			print("%8d -> %-8d : %-8d |%-*s|" % (low, high, val,
 			    stars_max, stars(val, val_max, stars_max)))
-			last[i] = dist[c_int(i)].value
 		except:
 			break
 
@@ -104,5 +100,6 @@ while (1):
 
 	print
 	print_log2_hist(b["dist"], "kbytes")
+	b["dist"].clear()
 	if do_exit:
 		exit()

examples/disksnoop.py

@@ -33,16 +33,10 @@ except:
 
 # format output
 while 1:
-	try:
-		line = trace.readline().rstrip()
-	except KeyboardInterrupt:
-		pass; exit()
-	prolog, time_s, colon, bytes_s, flags_s, us_s = \
-		line.rsplit(" ", 5)
-
-	time_s = time_s[:-1]	# strip trailing ":"
-	flags = int(flags_s, 16)
-	if flags & REQ_WRITE:
+	(task, pid, cpu, flags, ts, msg) = b.trace_readline_fields()
+	(bytes_s, bflags_s, us_s) = msg.split()
+
+	if int(bflags_s, 16) & REQ_WRITE:
 		type_s = "W"
 	elif bytes_s == "0":	# see blk_fill_rwbs() for logic
 		type_s = "M"
@@ -50,4 +44,4 @@ while 1:
 		type_s = "R"
 	ms = float(int(us_s, 10)) / 1000
 
-	print("%-18s %-2s %-7s %8.2f" % (time_s, type_s, bytes_s, ms))
+	print("%-18.9f %-2s %-7s %8.2f" % (ts, type_s, bytes_s, ms))

examples/vfsreadlat.py

@@ -45,9 +45,6 @@ dist_max = 64
 
 # header
 print("Tracing... Hit Ctrl-C to end.")
-last = {}
-for i in range(1, dist_max + 1):
-	last[i] = 0
 
 # functions
 stars_max = 38
@@ -68,7 +65,7 @@ def print_log2_hist(dist, val_type):
 	val_max = 0
 	for i in range(1, dist_max + 1):
 		try:
-			val = dist[c_int(i)].value - last[i]
+			val = dist[c_int(i)].value
 			if (val > 0):
 				idx_max = i
 			if (val > val_max):
@@ -83,10 +80,9 @@ def print_log2_hist(dist, val_type):
 		if (low == high):
 			low -= 1
 		try:
-			val = dist[c_int(i)].value - last[i]
+			val = dist[c_int(i)].value
 			print("%8d -> %-8d : %-8d |%-*s|" % (low, high, val,
 			    stars_max, stars(val, val_max, stars_max)))
-			last[i] = dist[c_int(i)].value
 		except:
 			break
 
@@ -105,5 +101,6 @@ while (1):
 
 	print
 	print_log2_hist(b["dist"], "usecs")
+	b["dist"].clear()
 	if do_exit:
 		exit()

tools/pidpersec

@@ -28,7 +28,6 @@ S_COUNT = c_int(1)
 print("Tracing... Ctrl-C to end.")
 
 # output
-last = 0
 while (1):
 	try:
 		sleep(1)
@@ -36,5 +35,5 @@ while (1):
 		exit()
 
 	print("%s: PIDs/sec: %d" % (strftime("%H:%M:%S"),
-	    (b["stats"][S_COUNT].value)))
+	    b["stats"][S_COUNT].value))
 	b["stats"].clear()

tools/vfsstat

@@ -54,11 +54,9 @@ stat_types = {
 
 # header
 print("%-8s  " % "TIME", end="")
-last = {}
 for stype in stat_types.keys():
 	print(" %8s" % (stype + "/s"), end="")
 	idx = stat_types[stype]
-	last[idx] = 0
 print("")
 
 # output
@@ -78,9 +76,9 @@ while (1):
 	for stype in stat_types.keys():
 		idx = stat_types[stype]
 		try:
-			delta = b["stats"][c_int(idx)].value - last[idx]
-			print(" %8d" % (delta / interval), end="")
-			last[idx] = b["stats"][c_int(idx)].value
+			val = b["stats"][c_int(idx)].value / interval
+			print(" %8d" % val, end="")
 		except:
 			print(" %8d" % 0, end="")
+	b["stats"].clear()
 	print("")