aboutsummaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorKeir Fraser <keir@xensource.com>2007-10-08 10:47:58 +0100
committerKeir Fraser <keir@xensource.com>2007-10-08 10:47:58 +0100
commitf94f6e258de82f13747c7b00e2569c12b96c7011 (patch)
treefff2bcdba401a2cfb49a176df10a56ff918a2e0e /tools
parent10f71216a1d3b80ec21a893fabfaaec9355e2180 (diff)
downloadxen-f94f6e258de82f13747c7b00e2569c12b96c7011.tar.gz
xen-f94f6e258de82f13747c7b00e2569c12b96c7011.tar.bz2
xen-f94f6e258de82f13747c7b00e2569c12b96c7011.zip
Remove tabs from python scripts xenmon and xentrace_format.
Signed-off-by: Masaki Kanno <kanno.masaki@jp.fujitsu.com>
Diffstat (limited to 'tools')
-rw-r--r--tools/xenmon/xenmon.py14
-rw-r--r--tools/xentrace/xentrace_format60
2 files changed, 37 insertions, 37 deletions
diff --git a/tools/xenmon/xenmon.py b/tools/xenmon/xenmon.py
index 7f42bb9d44..01b96fecad 100644
--- a/tools/xenmon/xenmon.py
+++ b/tools/xenmon/xenmon.py
@@ -310,10 +310,10 @@ def show_livestats(cpu):
len = struct.calcsize(ST_DOM_INFO)
dom = struct.unpack(ST_DOM_INFO, shm[idx:idx+len])
doms.append(dom)
-# (last_update_time, start_time, runnable_start_time, blocked_start_time,
-# ns_since_boot, ns_oncpu_since_boot, runnable_at_last_update,
-# runnable, in_use, domid, junk, name) = dom
-# dom_in_use.append(in_use)
+# (last_update_time, start_time, runnable_start_time, blocked_start_time,
+# ns_since_boot, ns_oncpu_since_boot, runnable_at_last_update,
+# runnable, in_use, domid, junk, name) = dom
+# dom_in_use.append(in_use)
dom_in_use.append(dom[8])
domid = dom[9]
if domid == 32767 :
@@ -599,9 +599,9 @@ def writelog():
len = struct.calcsize(ST_DOM_INFO)
dom = struct.unpack(ST_DOM_INFO, shm[idx:idx+len])
# doms.append(dom)
-# (last_update_time, start_time, runnable_start_time, blocked_start_time,
-# ns_since_boot, ns_oncpu_since_boot, runnable_at_last_update,
-# runnable, in_use, domid, junk, name) = dom
+# (last_update_time, start_time, runnable_start_time, blocked_start_time,
+# ns_since_boot, ns_oncpu_since_boot, runnable_at_last_update,
+# runnable, in_use, domid, junk, name) = dom
dom_in_use.append(dom[8])
domid = dom[9]
if domid == 32767:
diff --git a/tools/xentrace/xentrace_format b/tools/xentrace/xentrace_format
index fe019b08d2..43ea46ebbe 100644
--- a/tools/xentrace/xentrace_format
+++ b/tools/xentrace/xentrace_format
@@ -43,14 +43,14 @@ def read_defs(defs_file):
line = fd.readline()
if not line:
break
-
- if line[0] == '#' or line[0] == '\n':
- continue
-
+
+ if line[0] == '#' or line[0] == '\n':
+ continue
+
m = reg.match(line)
if not m: print >> sys.stderr, "Bad format file" ; sys.exit(1)
-
+
defs[str(eval(m.group(1)))] = m.group(2)
return defs
@@ -70,7 +70,7 @@ try:
opts, arg = getopt.getopt(sys.argv[1:], "c:" )
for opt in opts:
- if opt[0] == '-c' : mhz = int(opt[1])
+ if opt[0] == '-c' : mhz = int(opt[1])
except getopt.GetoptError:
usage()
@@ -108,7 +108,7 @@ i=0
while not interrupted:
try:
- i=i+1
+ i=i+1
line = sys.stdin.read(struct.calcsize(HDRREC))
if not line:
break
@@ -121,7 +121,7 @@ while not interrupted:
d3 = 0
d4 = 0
d5 = 0
-
+
tsc = 0
if tsc_in == 1:
@@ -162,26 +162,26 @@ while not interrupted:
cpu = d1
- #tsc = (tscH<<32) | tscL
+ #tsc = (tscH<<32) | tscL
- #print i, tsc
+ #print i, tsc
if cpu >= len(last_tsc):
last_tsc += [0] * (cpu - len(last_tsc) + 1)
- elif tsc < last_tsc[cpu] and tsc_in == 1:
- print "TSC stepped backward cpu %d ! %d %d" % (cpu,tsc,last_tsc[cpu])
+ elif tsc < last_tsc[cpu] and tsc_in == 1:
+ print "TSC stepped backward cpu %d ! %d %d" % (cpu,tsc,last_tsc[cpu])
- # provide relative TSC
- if last_tsc[cpu] > 0 and tsc_in == 1:
- reltsc = tsc - last_tsc[cpu]
- else:
- reltsc = 0
+ # provide relative TSC
+ if last_tsc[cpu] > 0 and tsc_in == 1:
+ reltsc = tsc - last_tsc[cpu]
+ else:
+ reltsc = 0
- if tsc_in == 1:
- last_tsc[cpu] = tsc
+ if tsc_in == 1:
+ last_tsc[cpu] = tsc
- if mhz:
- tsc = tsc / (mhz*1000000.0)
+ if mhz:
+ tsc = tsc / (mhz*1000000.0)
args = {'cpu' : cpu,
'tsc' : tsc,
@@ -193,15 +193,15 @@ while not interrupted:
'4' : d4,
'5' : d5 }
- try:
+ try:
+
+ if defs.has_key(str(event)):
+ print defs[str(event)] % args
+ else:
+ if defs.has_key(str(0)): print defs[str(0)] % args
+ except TypeError:
+ print defs[str(event)]
+ print args
- if defs.has_key(str(event)):
- print defs[str(event)] % args
- else:
- if defs.has_key(str(0)): print defs[str(0)] % args
- except TypeError:
- print defs[str(event)]
- print args
-
except IOError, struct.error: sys.exit()