diff options
author | Jeremy Cline <jeremy@jcline.org> | 2018-05-08 17:27:45 -0400 |
---|---|---|
committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2018-07-11 09:01:50 -0400 |
commit | 770d2f86c0051d4f2c0ab9d74d68434cb383241d (patch) | |
tree | 25400345971c8fbde76c91f127ca3f9ed2f08524 /tools/perf/scripts/python | |
parent | 877cc639686b68c7de179a485544f4761e376b30 (diff) |
perf scripts python: Add Python 3 support to Core.py
Support both Python 2 and Python 3 in Core.py. This should have no
functional change.
Signed-off-by: Jeremy Cline <jeremy@jcline.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Herton Krzesinski <herton@redhat.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/0100016341a72ebe-e572899e-f445-4765-98f0-c314935727f9-000000@email.amazonses.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf/scripts/python')
-rw-r--r-- | tools/perf/scripts/python/Perf-Trace-Util/lib/Perf/Trace/Core.py | 40 |
1 files changed, 17 insertions, 23 deletions
diff --git a/tools/perf/scripts/python/Perf-Trace-Util/lib/Perf/Trace/Core.py b/tools/perf/scripts/python/Perf-Trace-Util/lib/Perf/Trace/Core.py index 38dfb720fb6f..54ace2f6bc36 100644 --- a/tools/perf/scripts/python/Perf-Trace-Util/lib/Perf/Trace/Core.py +++ b/tools/perf/scripts/python/Perf-Trace-Util/lib/Perf/Trace/Core.py | |||
@@ -31,10 +31,8 @@ def flag_str(event_name, field_name, value): | |||
31 | string = "" | 31 | string = "" |
32 | 32 | ||
33 | if flag_fields[event_name][field_name]: | 33 | if flag_fields[event_name][field_name]: |
34 | print_delim = 0 | 34 | print_delim = 0 |
35 | keys = flag_fields[event_name][field_name]['values'].keys() | 35 | for idx in sorted(flag_fields[event_name][field_name]['values']): |
36 | keys.sort() | ||
37 | for idx in keys: | ||
38 | if not value and not idx: | 36 | if not value and not idx: |
39 | string += flag_fields[event_name][field_name]['values'][idx] | 37 | string += flag_fields[event_name][field_name]['values'][idx] |
40 | break | 38 | break |
@@ -51,14 +49,12 @@ def symbol_str(event_name, field_name, value): | |||
51 | string = "" | 49 | string = "" |
52 | 50 | ||
53 | if symbolic_fields[event_name][field_name]: | 51 | if symbolic_fields[event_name][field_name]: |
54 | keys = symbolic_fields[event_name][field_name]['values'].keys() | 52 | for idx in sorted(symbolic_fields[event_name][field_name]['values']): |
55 | keys.sort() | ||
56 | for idx in keys: | ||
57 | if not value and not idx: | 53 | if not value and not idx: |
58 | string = symbolic_fields[event_name][field_name]['values'][idx] | 54 | string = symbolic_fields[event_name][field_name]['values'][idx] |
59 | break | 55 | break |
60 | if (value == idx): | 56 | if (value == idx): |
61 | string = symbolic_fields[event_name][field_name]['values'][idx] | 57 | string = symbolic_fields[event_name][field_name]['values'][idx] |
62 | break | 58 | break |
63 | 59 | ||
64 | return string | 60 | return string |
@@ -74,19 +70,17 @@ def trace_flag_str(value): | |||
74 | string = "" | 70 | string = "" |
75 | print_delim = 0 | 71 | print_delim = 0 |
76 | 72 | ||
77 | keys = trace_flags.keys() | 73 | for idx in trace_flags: |
78 | 74 | if not value and not idx: | |
79 | for idx in keys: | 75 | string += "NONE" |
80 | if not value and not idx: | 76 | break |
81 | string += "NONE" | 77 | |
82 | break | 78 | if idx and (value & idx) == idx: |
83 | 79 | if print_delim: | |
84 | if idx and (value & idx) == idx: | 80 | string += " | "; |
85 | if print_delim: | 81 | string += trace_flags[idx] |
86 | string += " | "; | 82 | print_delim = 1 |
87 | string += trace_flags[idx] | 83 | value &= ~idx |
88 | print_delim = 1 | ||
89 | value &= ~idx | ||
90 | 84 | ||
91 | return string | 85 | return string |
92 | 86 | ||