Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
perf script python: Remove mixed indentation
Remove mixed indentation in Python scripts. Revert to either all tabs
(most common form) or all spaces (4 or 8) depending on what was the
intent of the original commit. This is necessary to complete Python3
support as it will flag an error if it encounters mixed indentation.
Signed-off-by: Tony Jones <tonyj@suse.de>
Link: http://lkml.kernel.org/r/20190302011903.2416-2-tonyj@suse.de
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
authored by
Tony Jones
and committed by
Arnaldo Carvalho de Melo
b504d7f6
c1d3e633
+128
-127
+32
-33
tools/perf/scripts/python/check-perf-trace.py
+32
-33
tools/perf/scripts/python/check-perf-trace.py
···
23
23
pass
24
24
25
25
def trace_end():
26
-
print_unhandled()
26
+
print_unhandled()
27
27
28
28
def irq__softirq_entry(event_name, context, common_cpu,
29
-
common_secs, common_nsecs, common_pid, common_comm,
30
-
common_callchain, vec):
31
-
print_header(event_name, common_cpu, common_secs, common_nsecs,
32
-
common_pid, common_comm)
29
+
common_secs, common_nsecs, common_pid, common_comm,
30
+
common_callchain, vec):
31
+
print_header(event_name, common_cpu, common_secs, common_nsecs,
32
+
common_pid, common_comm)
33
33
34
-
print_uncommon(context)
34
+
print_uncommon(context)
35
35
36
-
print "vec=%s\n" % \
37
-
(symbol_str("irq__softirq_entry", "vec", vec)),
36
+
print "vec=%s\n" % (symbol_str("irq__softirq_entry", "vec", vec)),
38
37
39
38
def kmem__kmalloc(event_name, context, common_cpu,
40
-
common_secs, common_nsecs, common_pid, common_comm,
41
-
common_callchain, call_site, ptr, bytes_req, bytes_alloc,
42
-
gfp_flags):
43
-
print_header(event_name, common_cpu, common_secs, common_nsecs,
44
-
common_pid, common_comm)
39
+
common_secs, common_nsecs, common_pid, common_comm,
40
+
common_callchain, call_site, ptr, bytes_req, bytes_alloc,
41
+
gfp_flags):
42
+
print_header(event_name, common_cpu, common_secs, common_nsecs,
43
+
common_pid, common_comm)
45
44
46
-
print_uncommon(context)
45
+
print_uncommon(context)
47
46
48
-
print "call_site=%u, ptr=%u, bytes_req=%u, " \
47
+
print "call_site=%u, ptr=%u, bytes_req=%u, " \
49
48
"bytes_alloc=%u, gfp_flags=%s\n" % \
50
49
(call_site, ptr, bytes_req, bytes_alloc,
51
-
52
50
flag_str("kmem__kmalloc", "gfp_flags", gfp_flags)),
53
51
54
52
def trace_unhandled(event_name, context, event_fields_dict):
55
-
try:
56
-
unhandled[event_name] += 1
57
-
except TypeError:
58
-
unhandled[event_name] = 1
53
+
try:
54
+
unhandled[event_name] += 1
55
+
except TypeError:
56
+
unhandled[event_name] = 1
59
57
60
58
def print_header(event_name, cpu, secs, nsecs, pid, comm):
61
59
print "%-20s %5u %05u.%09u %8u %-20s " % \
62
-
(event_name, cpu, secs, nsecs, pid, comm),
60
+
(event_name, cpu, secs, nsecs, pid, comm),
63
61
64
62
# print trace fields not included in handler args
65
63
def print_uncommon(context):
66
-
print "common_preempt_count=%d, common_flags=%s, common_lock_depth=%d, " \
67
-
% (common_pc(context), trace_flag_str(common_flags(context)), \
68
-
common_lock_depth(context))
64
+
print "common_preempt_count=%d, common_flags=%s, " \
65
+
"common_lock_depth=%d, " % \
66
+
(common_pc(context), trace_flag_str(common_flags(context)),
67
+
common_lock_depth(context))
69
68
70
69
def print_unhandled():
71
-
keys = unhandled.keys()
72
-
if not keys:
73
-
return
70
+
keys = unhandled.keys()
71
+
if not keys:
72
+
return
74
73
75
-
print "\nunhandled events:\n\n",
74
+
print "\nunhandled events:\n\n",
76
75
77
-
print "%-40s %10s\n" % ("event", "count"),
78
-
print "%-40s %10s\n" % ("----------------------------------------", \
79
-
"-----------"),
76
+
print "%-40s %10s\n" % ("event", "count"),
77
+
print "%-40s %10s\n" % ("----------------------------------------", \
78
+
"-----------"),
80
79
81
-
for event_name in keys:
82
-
print "%-40s %10d\n" % (event_name, unhandled[event_name])
80
+
for event_name in keys:
81
+
print "%-40s %10d\n" % (event_name, unhandled[event_name])
+4
-4
tools/perf/scripts/python/compaction-times.py
+4
-4
tools/perf/scripts/python/compaction-times.py
···
216
216
pair(nr_migrated, nr_failed), None, None)
217
217
218
218
def compaction__mm_compaction_isolate_freepages(event_name, context, common_cpu,
219
-
common_secs, common_nsecs, common_pid, common_comm,
220
-
common_callchain, start_pfn, end_pfn, nr_scanned, nr_taken):
219
+
common_secs, common_nsecs, common_pid, common_comm,
220
+
common_callchain, start_pfn, end_pfn, nr_scanned, nr_taken):
221
221
222
222
chead.increment_pending(common_pid,
223
223
None, pair(nr_scanned, nr_taken), None)
224
224
225
225
def compaction__mm_compaction_isolate_migratepages(event_name, context, common_cpu,
226
-
common_secs, common_nsecs, common_pid, common_comm,
227
-
common_callchain, start_pfn, end_pfn, nr_scanned, nr_taken):
226
+
common_secs, common_nsecs, common_pid, common_comm,
227
+
common_callchain, start_pfn, end_pfn, nr_scanned, nr_taken):
228
228
229
229
chead.increment_pending(common_pid,
230
230
None, None, pair(nr_scanned, nr_taken))
+3
-3
tools/perf/scripts/python/event_analyzing_sample.py
+3
-3
tools/perf/scripts/python/event_analyzing_sample.py
···
37
37
con.isolation_level = None
38
38
39
39
def trace_begin():
40
-
print "In trace_begin:\n"
40
+
print "In trace_begin:\n"
41
41
42
42
#
43
43
# Will create several tables at the start, pebs_ll is for PEBS data with
···
102
102
event.ip, event.status, event.dse, event.dla, event.lat))
103
103
104
104
def trace_end():
105
-
print "In trace_end:\n"
105
+
print "In trace_end:\n"
106
106
# We show the basic info for the 2 type of event classes
107
107
show_general_events()
108
108
show_pebs_ll()
···
187
187
print "%32s %8d %s" % (row[0], row[1], num2sym(row[1]))
188
188
189
189
def trace_unhandled(event_name, context, event_fields_dict):
190
-
print ' '.join(['%s=%s'%(k,str(v))for k,v in sorted(event_fields_dict.items())])
190
+
print ' '.join(['%s=%s'%(k,str(v))for k,v in sorted(event_fields_dict.items())])
+17
-17
tools/perf/scripts/python/failed-syscalls-by-pid.py
+17
-17
tools/perf/scripts/python/failed-syscalls-by-pid.py
···
58
58
raw_syscalls__sys_exit(**locals())
59
59
60
60
def print_error_totals():
61
-
if for_comm is not None:
62
-
print("\nsyscall errors for %s:\n" % (for_comm))
63
-
else:
64
-
print("\nsyscall errors:\n")
61
+
if for_comm is not None:
62
+
print("\nsyscall errors for %s:\n" % (for_comm))
63
+
else:
64
+
print("\nsyscall errors:\n")
65
65
66
-
print("%-30s %10s" % ("comm [pid]", "count"))
67
-
print("%-30s %10s" % ("------------------------------", "----------"))
66
+
print("%-30s %10s" % ("comm [pid]", "count"))
67
+
print("%-30s %10s" % ("------------------------------", "----------"))
68
68
69
-
comm_keys = syscalls.keys()
70
-
for comm in comm_keys:
71
-
pid_keys = syscalls[comm].keys()
72
-
for pid in pid_keys:
73
-
print("\n%s [%d]" % (comm, pid))
74
-
id_keys = syscalls[comm][pid].keys()
75
-
for id in id_keys:
76
-
print(" syscall: %-16s" % syscall_name(id))
77
-
ret_keys = syscalls[comm][pid][id].keys()
78
-
for ret, val in sorted(syscalls[comm][pid][id].items(), key = lambda kv: (kv[1], kv[0]), reverse = True):
79
-
print(" err = %-20s %10d" % (strerror(ret), val))
69
+
comm_keys = syscalls.keys()
70
+
for comm in comm_keys:
71
+
pid_keys = syscalls[comm].keys()
72
+
for pid in pid_keys:
73
+
print("\n%s [%d]" % (comm, pid))
74
+
id_keys = syscalls[comm][pid].keys()
75
+
for id in id_keys:
76
+
print(" syscall: %-16s" % syscall_name(id))
77
+
ret_keys = syscalls[comm][pid][id].keys()
78
+
for ret, val in sorted(syscalls[comm][pid][id].items(), key = lambda kv: (kv[1], kv[0]), reverse = True):
79
+
print(" err = %-20s %10d" % (strerror(ret), val))
+1
-1
tools/perf/scripts/python/futex-contention.py
+1
-1
tools/perf/scripts/python/futex-contention.py
+14
-14
tools/perf/scripts/python/intel-pt-events.py
+14
-14
tools/perf/scripts/python/intel-pt-events.py
···
85
85
print "%16x %s (%s)" % (ip, symbol, dso)
86
86
87
87
def process_event(param_dict):
88
-
event_attr = param_dict["attr"]
89
-
sample = param_dict["sample"]
90
-
raw_buf = param_dict["raw_buf"]
91
-
comm = param_dict["comm"]
92
-
name = param_dict["ev_name"]
88
+
event_attr = param_dict["attr"]
89
+
sample = param_dict["sample"]
90
+
raw_buf = param_dict["raw_buf"]
91
+
comm = param_dict["comm"]
92
+
name = param_dict["ev_name"]
93
93
94
-
# Symbol and dso info are not always resolved
95
-
if (param_dict.has_key("dso")):
96
-
dso = param_dict["dso"]
97
-
else:
98
-
dso = "[unknown]"
94
+
# Symbol and dso info are not always resolved
95
+
if (param_dict.has_key("dso")):
96
+
dso = param_dict["dso"]
97
+
else:
98
+
dso = "[unknown]"
99
99
100
-
if (param_dict.has_key("symbol")):
101
-
symbol = param_dict["symbol"]
102
-
else:
103
-
symbol = "[unknown]"
100
+
if (param_dict.has_key("symbol")):
101
+
symbol = param_dict["symbol"]
102
+
else:
103
+
symbol = "[unknown]"
104
104
105
105
if name == "ptwrite":
106
106
print_common_start(comm, sample, name)
+4
-3
tools/perf/scripts/python/mem-phys-addr.py
+4
-3
tools/perf/scripts/python/mem-phys-addr.py
···
44
44
print("%-40s %10s %10s\n" % ("Memory type", "count", "percentage"), end='')
45
45
print("%-40s %10s %10s\n" % ("----------------------------------------",
46
46
"-----------", "-----------"),
47
-
end='');
47
+
end='');
48
48
total = sum(load_mem_type_cnt.values())
49
49
for mem_type, count in sorted(load_mem_type_cnt.most_common(), \
50
50
key = lambda kv: (kv[1], kv[0]), reverse = True):
51
-
print("%-40s %10d %10.1f%%\n" % (mem_type, count, 100 * count / total),
52
-
end='')
51
+
print("%-40s %10d %10.1f%%\n" %
52
+
(mem_type, count, 100 * count / total),
53
+
end='')
53
54
54
55
def trace_begin():
55
56
parse_iomem()
+1
-1
tools/perf/scripts/python/net_dropmonitor.py
+1
-1
tools/perf/scripts/python/net_dropmonitor.py
+7
-5
tools/perf/scripts/python/netdev-times.py
+7
-5
tools/perf/scripts/python/netdev-times.py
···
124
124
event = event_list[i]
125
125
if event['event_name'] == 'napi_poll':
126
126
print(PF_NAPI_POLL %
127
-
(diff_msec(base_t, event['event_t']), event['dev']))
127
+
(diff_msec(base_t, event['event_t']),
128
+
event['dev']))
128
129
if i == len(event_list) - 1:
129
130
print("")
130
131
else:
131
132
print(PF_JOINT)
132
133
else:
133
134
print(PF_NET_RECV %
134
-
(diff_msec(base_t, event['event_t']), event['skbaddr'],
135
+
(diff_msec(base_t, event['event_t']),
136
+
event['skbaddr'],
135
137
event['len']))
136
138
if 'comm' in event.keys():
137
139
print(PF_WJOINT)
···
258
256
all_event_list.append(event_info)
259
257
260
258
def napi__napi_poll(name, context, cpu, sec, nsec, pid, comm, callchain, napi,
261
-
dev_name, work=None, budget=None):
259
+
dev_name, work=None, budget=None):
262
260
event_info = (name, context, cpu, nsecs(sec, nsec), pid, comm,
263
261
napi, dev_name, work, budget)
264
262
all_event_list.append(event_info)
···
355
353
if irq_list == [] or event_list == 0:
356
354
return
357
355
rec_data = {'sirq_ent_t':sirq_ent_t, 'sirq_ext_t':time,
358
-
'irq_list':irq_list, 'event_list':event_list}
356
+
'irq_list':irq_list, 'event_list':event_list}
359
357
# merge information realted to a NET_RX softirq
360
358
receive_hunk_list.append(rec_data)
361
359
···
392
390
skbaddr, skblen, dev_name) = event_info
393
391
if cpu in net_rx_dic.keys():
394
392
rec_data = {'event_name':'netif_receive_skb',
395
-
'event_t':time, 'skbaddr':skbaddr, 'len':skblen}
393
+
'event_t':time, 'skbaddr':skbaddr, 'len':skblen}
396
394
event_list = net_rx_dic[cpu]['event_list']
397
395
event_list.append(rec_data)
398
396
rx_skb_list.insert(0, rec_data)
+3
-3
tools/perf/scripts/python/sched-migration.py
+3
-3
tools/perf/scripts/python/sched-migration.py
···
14
14
15
15
from collections import defaultdict
16
16
try:
17
-
from UserList import UserList
17
+
from UserList import UserList
18
18
except ImportError:
19
-
# Python 3: UserList moved to the collections package
20
-
from collections import UserList
19
+
# Python 3: UserList moved to the collections package
20
+
from collections import UserList
21
21
22
22
sys.path.append(os.environ['PERF_EXEC_PATH'] + \
23
23
'/scripts/python/Perf-Trace-Util/lib/Perf/Trace')
+7
-6
tools/perf/scripts/python/sctop.py
+7
-6
tools/perf/scripts/python/sctop.py
···
13
13
import os, sys, time
14
14
15
15
try:
16
-
import thread
16
+
import thread
17
17
except ImportError:
18
-
import _thread as thread
18
+
import _thread as thread
19
19
20
20
sys.path.append(os.environ['PERF_EXEC_PATH'] + \
21
21
'/scripts/python/Perf-Trace-Util/lib/Perf/Trace')
···
75
75
76
76
print("%-40s %10s" % ("event", "count"))
77
77
print("%-40s %10s" %
78
-
("----------------------------------------",
79
-
"----------"))
78
+
("----------------------------------------",
79
+
"----------"))
80
80
81
-
for id, val in sorted(syscalls.items(), key = lambda kv: (kv[1], kv[0]), \
82
-
reverse = True):
81
+
for id, val in sorted(syscalls.items(),
82
+
key = lambda kv: (kv[1], kv[0]),
83
+
reverse = True):
83
84
try:
84
85
print("%-40s %10d" % (syscall_name(id), val))
85
86
except TypeError:
+1
-1
tools/perf/scripts/python/stackcollapse.py
+1
-1
tools/perf/scripts/python/stackcollapse.py
+21
-22
tools/perf/scripts/python/syscall-counts-by-pid.py
+21
-22
tools/perf/scripts/python/syscall-counts-by-pid.py
···
39
39
print_syscall_totals()
40
40
41
41
def raw_syscalls__sys_enter(event_name, context, common_cpu,
42
-
common_secs, common_nsecs, common_pid, common_comm,
43
-
common_callchain, id, args):
44
-
42
+
common_secs, common_nsecs, common_pid, common_comm,
43
+
common_callchain, id, args):
45
44
if (for_comm and common_comm != for_comm) or \
46
-
(for_pid and common_pid != for_pid ):
45
+
(for_pid and common_pid != for_pid ):
47
46
return
48
47
try:
49
48
syscalls[common_comm][common_pid][id] += 1
···
50
51
syscalls[common_comm][common_pid][id] = 1
51
52
52
53
def syscalls__sys_enter(event_name, context, common_cpu,
53
-
common_secs, common_nsecs, common_pid, common_comm,
54
-
id, args):
54
+
common_secs, common_nsecs, common_pid, common_comm,
55
+
id, args):
55
56
raw_syscalls__sys_enter(**locals())
56
57
57
58
def print_syscall_totals():
58
-
if for_comm is not None:
59
-
print("\nsyscall events for %s:\n" % (for_comm))
60
-
else:
61
-
print("\nsyscall events by comm/pid:\n")
59
+
if for_comm is not None:
60
+
print("\nsyscall events for %s:\n" % (for_comm))
61
+
else:
62
+
print("\nsyscall events by comm/pid:\n")
62
63
63
-
print("%-40s %10s" % ("comm [pid]/syscalls", "count"))
64
-
print("%-40s %10s" % ("----------------------------------------",
65
-
"----------"))
64
+
print("%-40s %10s" % ("comm [pid]/syscalls", "count"))
65
+
print("%-40s %10s" % ("----------------------------------------",
66
+
"----------"))
66
67
67
-
comm_keys = syscalls.keys()
68
-
for comm in comm_keys:
69
-
pid_keys = syscalls[comm].keys()
70
-
for pid in pid_keys:
71
-
print("\n%s [%d]" % (comm, pid))
72
-
id_keys = syscalls[comm][pid].keys()
73
-
for id, val in sorted(syscalls[comm][pid].items(), \
74
-
key = lambda kv: (kv[1], kv[0]), reverse = True):
75
-
print(" %-38s %10d" % (syscall_name(id), val))
68
+
comm_keys = syscalls.keys()
69
+
for comm in comm_keys:
70
+
pid_keys = syscalls[comm].keys()
71
+
for pid in pid_keys:
72
+
print("\n%s [%d]" % (comm, pid))
73
+
id_keys = syscalls[comm][pid].keys()
74
+
for id, val in sorted(syscalls[comm][pid].items(),
75
+
key = lambda kv: (kv[1], kv[0]), reverse = True):
76
+
print(" %-38s %10d" % (syscall_name(id), val))
+13
-14
tools/perf/scripts/python/syscall-counts.py
+13
-14
tools/perf/scripts/python/syscall-counts.py
···
36
36
print_syscall_totals()
37
37
38
38
def raw_syscalls__sys_enter(event_name, context, common_cpu,
39
-
common_secs, common_nsecs, common_pid, common_comm,
40
-
common_callchain, id, args):
39
+
common_secs, common_nsecs, common_pid, common_comm,
40
+
common_callchain, id, args):
41
41
if for_comm is not None:
42
42
if common_comm != for_comm:
43
43
return
···
47
47
syscalls[id] = 1
48
48
49
49
def syscalls__sys_enter(event_name, context, common_cpu,
50
-
common_secs, common_nsecs, common_pid, common_comm,
51
-
id, args):
50
+
common_secs, common_nsecs, common_pid, common_comm, id, args):
52
51
raw_syscalls__sys_enter(**locals())
53
52
54
53
def print_syscall_totals():
55
-
if for_comm is not None:
56
-
print("\nsyscall events for %s:\n" % (for_comm))
57
-
else:
58
-
print("\nsyscall events:\n")
54
+
if for_comm is not None:
55
+
print("\nsyscall events for %s:\n" % (for_comm))
56
+
else:
57
+
print("\nsyscall events:\n")
59
58
60
-
print("%-40s %10s" % ("event", "count"))
61
-
print("%-40s %10s" % ("----------------------------------------",
62
-
"-----------"))
59
+
print("%-40s %10s" % ("event", "count"))
60
+
print("%-40s %10s" % ("----------------------------------------",
61
+
"-----------"))
63
62
64
-
for id, val in sorted(syscalls.items(), key = lambda kv: (kv[1], kv[0]), \
65
-
reverse = True):
66
-
print("%-40s %10d" % (syscall_name(id), val))
63
+
for id, val in sorted(syscalls.items(),
64
+
key = lambda kv: (kv[1], kv[0]), reverse = True):
65
+
print("%-40s %10d" % (syscall_name(id), val))