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

perf python: Stop using deprecated PyUnicode_AsString()

As noticed while building for Fedora 43:

GEN /tmp/build/perf/python/perf.cpython-314-x86_64-linux-gnu.so
/git/perf-6.16.0-rc3/tools/perf/util/python.c: In function ‘get_tracepoint_field’:
/git/perf-6.16.0-rc3/tools/perf/util/python.c:340:9: error: ‘_PyUnicode_AsString’ is deprecated [-Werror=deprecated-declarations]
340 | const char *str = _PyUnicode_AsString(PyObject_Str(attr_name));
| ^~~~~
In file included from /usr/include/python3.14/unicodeobject.h:1022,
from /usr/include/python3.14/Python.h:89,
from /git/perf-6.16.0-rc3/tools/perf/util/python.c:2:
/usr/include/python3.14/cpython/unicodeobject.h:648:1: note: declared here
648 | _PyUnicode_AsString(PyObject *unicode)
| ^~~~~~~~~~~~~~~~~~~
cc1: all warnings being treated as errors
error: command '/usr/bin/gcc' failed with exit code 1

Use PyUnicode_AsUTF8() instead and also check if PyObject_Str() fails
before doing so.

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Link: https://lore.kernel.org/r/aIofXNK8QLtLIaI3@x1
Signed-off-by: Namhyung Kim <namhyung@kernel.org>

authored by

Arnaldo Carvalho de Melo and committed by
Namhyung Kim
59edbec7 b91a9abb

+11 -1
+11 -1
tools/perf/util/python.c
··· 337 337 static PyObject* 338 338 get_tracepoint_field(struct pyrf_event *pevent, PyObject *attr_name) 339 339 { 340 - const char *str = _PyUnicode_AsString(PyObject_Str(attr_name)); 341 340 struct evsel *evsel = pevent->evsel; 342 341 struct tep_event *tp_format = evsel__tp_format(evsel); 343 342 struct tep_format_field *field; ··· 344 345 if (IS_ERR_OR_NULL(tp_format)) 345 346 return NULL; 346 347 348 + PyObject *obj = PyObject_Str(attr_name); 349 + if (obj == NULL) 350 + return NULL; 351 + 352 + const char *str = PyUnicode_AsUTF8(obj); 353 + if (str == NULL) { 354 + Py_DECREF(obj); 355 + return NULL; 356 + } 357 + 347 358 field = tep_find_any_field(tp_format, str); 359 + Py_DECREF(obj); 348 360 return field ? tracepoint_field(pevent, field) : NULL; 349 361 } 350 362 #endif /* HAVE_LIBTRACEEVENT */