Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Jeremy Cline and committed by
Arnaldo Carvalho de Melo
770d2f86 877cc639

+16 -22
+16 -22
tools/perf/scripts/python/Perf-Trace-Util/lib/Perf/Trace/Core.py
··· 31 31 string = "" 32 32 33 33 if flag_fields[event_name][field_name]: 34 - print_delim = 0 35 - keys = flag_fields[event_name][field_name]['values'].keys() 36 - keys.sort() 37 - for idx in keys: 34 + print_delim = 0 35 + for idx in sorted(flag_fields[event_name][field_name]['values']): 38 36 if not value and not idx: 39 37 string += flag_fields[event_name][field_name]['values'][idx] 40 38 break ··· 49 51 string = "" 50 52 51 53 if symbolic_fields[event_name][field_name]: 52 - keys = symbolic_fields[event_name][field_name]['values'].keys() 53 - keys.sort() 54 - for idx in keys: 54 + for idx in sorted(symbolic_fields[event_name][field_name]['values']): 55 55 if not value and not idx: 56 - string = symbolic_fields[event_name][field_name]['values'][idx] 56 + string = symbolic_fields[event_name][field_name]['values'][idx] 57 57 break 58 - if (value == idx): 59 - string = symbolic_fields[event_name][field_name]['values'][idx] 58 + if (value == idx): 59 + string = symbolic_fields[event_name][field_name]['values'][idx] 60 60 break 61 61 62 62 return string ··· 70 74 string = "" 71 75 print_delim = 0 72 76 73 - keys = trace_flags.keys() 77 + for idx in trace_flags: 78 + if not value and not idx: 79 + string += "NONE" 80 + break 74 81 75 - for idx in keys: 76 - if not value and not idx: 77 - string += "NONE" 78 - break 79 - 80 - if idx and (value & idx) == idx: 81 - if print_delim: 82 - string += " | "; 83 - string += trace_flags[idx] 84 - print_delim = 1 85 - value &= ~idx 82 + if idx and (value & idx) == idx: 83 + if print_delim: 84 + string += " | "; 85 + string += trace_flags[idx] 86 + print_delim = 1 87 + value &= ~idx 86 88 87 89 return string 88 90