perf python: Avoid duplicated code in get_tracepoint_field
authorIan Rogers <irogers@google.com>
Fri, 28 Feb 2025 22:23:05 +0000 (14:23 -0800)
committerNamhyung Kim <namhyung@kernel.org>
Wed, 12 Mar 2025 01:55:38 +0000 (18:55 -0700)
The code replicates computations done in evsel__tp_format, reuse
evsel__tp_format to simplify the python C code.

Reviewed-by: Howard Chu <howardchu95@gmail.com>
Signed-off-by: Ian Rogers <irogers@google.com>
Reviewed-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Link: https://lore.kernel.org/r/20250228222308.626803-9-irogers@google.com
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
tools/perf/util/python.c

index e244cc74f16d4c7325ec38ea6a633ba0e65051ac..7f2513ffe8661571ea13c8816d2abc44df342304 100644 (file)
@@ -342,23 +342,14 @@ get_tracepoint_field(struct pyrf_event *pevent, PyObject *attr_name)
 {
        const char *str = _PyUnicode_AsString(PyObject_Str(attr_name));
        struct evsel *evsel = pevent->evsel;
+       struct tep_event *tp_format = evsel__tp_format(evsel);
        struct tep_format_field *field;
 
-       if (!evsel->tp_format) {
-               struct tep_event *tp_format;
-
-               tp_format = trace_event__tp_format_id(evsel->core.attr.config);
-               if (IS_ERR_OR_NULL(tp_format))
-                       return NULL;
-
-               evsel->tp_format = tp_format;
-       }
-
-       field = tep_find_any_field(evsel->tp_format, str);
-       if (!field)
+       if (IS_ERR_OR_NULL(tp_format))
                return NULL;
 
-       return tracepoint_field(pevent, field);
+       field = tep_find_any_field(tp_format, str);
+       return field ? tracepoint_field(pevent, field) : NULL;
 }
 #endif /* HAVE_LIBTRACEEVENT */