iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

perf tools: Address python 3.6 DeprecationWarning for string scapes

Browse Source 
Python 3.6 introduced a DeprecationWarning for invalid escape sequences.
This is upgraded to a SyntaxWarning in Python 3.12, and will eventually
be a syntax error.

Fix these now to get ahead of it before it's an error.

Signed-off-by: Benjamin Gray <bgray@linux.ibm.com>
Acked-by: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Andrii Nakryiko <andrii@kernel.org>
Cc: Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: Ian Rogers <irogers@google.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jan Kiszka <jan.kiszka@siemens.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Jonathan Corbet <corbet@lwn.net>
Cc: Kieran Bingham <kbingham@kernel.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Mykola Lysenko <mykolal@fb.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Nathan Chancellor <nathan@kernel.org>
Cc: Nick Desaulniers <ndesaulniers@google.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Shuah Khan <shuah@kernel.org>
Cc: Todd E Brandt <todd.e.brandt@linux.intel.com>
Cc: Tom Rix <trix@redhat.com>
Cc: linux-doc@vger.kernel.org
Cc: linux-ia64@vger.kernel.org
Cc: linux-kselftest@vger.kernel.org
Cc: linux-pm@vger.kernel.org
Cc: llvm@lists.linux.dev
Link: https://lore.kernel.org/r/20230912060801.95533-6-bgray@linux.ibm.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Benjamin Gray 2023-09-12 16:07:59 +10:00 committed by Arnaldo Carvalho de Melo
parent acbf6de674
commit 280b4e4a9e
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/perf/pmu-events/jevents.py
View File

@ -83,7 +83,7 @@ def c_len(s: str) -> int:
"""Return the length of s a C string """Return the length of s a C string
This doesn't handle all escape characters properly. It first assumes This doesn't handle all escape characters properly. It first assumes
all \ are for escaping, it then adjusts as it will have over counted all \\ are for escaping, it then adjusts as it will have over counted
\\. The code uses \000 rather than \0 as a terminator as an adjacent \\. The code uses \000 rather than \0 as a terminator as an adjacent
number would be folded into a string of \0 (ie. "\0" + "5" doesn't number would be folded into a string of \0 (ie. "\0" + "5" doesn't
equal a terminator followed by the number 5 but the escape of equal a terminator followed by the number 5 but the escape of

4
tools/perf/scripts/python/arm-cs-trace-disasm.py
View File

@ -45,8 +45,8 @@ parser = OptionParser(option_list=option_list)
# Initialize global dicts and regular expression # Initialize global dicts and regular expression
disasm_cache = dict() disasm_cache = dict()
cpu_data = dict() cpu_data = dict()
disasm_re = re.compile("^\s*([0-9a-fA-F]+):") disasm_re = re.compile(r"^\s*([0-9a-fA-F]+):")
disasm_func_re = re.compile("^\s*([0-9a-fA-F]+)\s.*:") disasm_func_re = re.compile(r"^\s*([0-9a-fA-F]+)\s.*:")
cache_size = 64*1024 cache_size = 64*1024
glb_source_file_name = None glb_source_file_name = None

2
tools/perf/scripts/python/compaction-times.py
View File

@ -260,7 +260,7 @@ def pr_help():
comm_re = None comm_re = None
pid_re = None pid_re = None
pid_regex = "^(\d*)-(\d*)$|^(\d*)$" pid_regex = r"^(\d*)-(\d*)$|^(\d*)$"
opt_proc = popt.DISP_DFL opt_proc = popt.DISP_DFL
opt_disp = topt.DISP_ALL opt_disp = topt.DISP_ALL

4
tools/perf/scripts/python/exported-sql-viewer.py
View File

@ -677,8 +677,8 @@ class CallGraphModelBase(TreeModel):
# sqlite supports GLOB (text only) which uses * and ? and is case sensitive # sqlite supports GLOB (text only) which uses * and ? and is case sensitive
if not self.glb.dbref.is_sqlite3: if not self.glb.dbref.is_sqlite3:
# Escape % and _ # Escape % and _
s = value.replace("%", "\%") s = value.replace("%", "\\%")
s = s.replace("_", "\_") s = s.replace("_", "\\_")
# Translate * and ? into SQL LIKE pattern characters % and _ # Translate * and ? into SQL LIKE pattern characters % and _
trans = string.maketrans("*?", "%_") trans = string.maketrans("*?", "%_")
match = " LIKE '" + str(s).translate(trans) + "'" match = " LIKE '" + str(s).translate(trans) + "'"