perf script: Don't pass evsel with sample

As struct perf_sample now directly contains its own resolved evsel pointer,
passing the evsel separately is redundant and clutters the interface.

Remove the redundant evsel parameter from script-specific handlers and
structures, ensuring the tool always directly accesses the evsel bound to the
sample. This simplifies the API signatures and eliminates the risk of passing
an inconsistent evsel.

Signed-off-by: Ian Rogers <irogers@google.com>
Acked-by: Namhyung Kim <namhyung@kernel.org>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Albert Ou <aou@eecs.berkeley.edu>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Alexandre Ghiti <alex@ghiti.fr>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Andrew Jones <ajones@ventanamicro.com>
Cc: Anup Patel <anup@brainfault.org>
Cc: Athira Rajeev <atrajeev@linux.ibm.com>
Cc: Blake Jones <blakejones@google.com>
Cc: Chen Ni <nichen@iscas.ac.cn>
Cc: Chun-Tse Shao <ctshao@google.com>
Cc: Dapeng Mi <dapeng1.mi@linux.intel.com>
Cc: Derek Foreman <derek.foreman@collabora.com>
Cc: Dmitriy Vyukov <dvyukov@google.com>
Cc: Dr. David Alan Gilbert <linux@treblig.org>
Cc: Howard Chu <howardchu95@gmail.com>
Cc: Hrishikesh Suresh <hrishikesh123s@gmail.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: James Clark <james.clark@linaro.org>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Krzysztof Łopatowski <krzysztof.m.lopatowski@gmail.com>
Cc: Leo Yan <leo.yan@arm.com>
Cc: Palmer Dabbelt <palmer@dabbelt.com>
Cc: Paul Walmsley <pjw@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Quan Zhou <zhouquan@iscas.ac.cn>
Cc: Ravi Bangoria <ravi.bangoria@amd.com>
Cc: Swapnil Sapkal <swapnil.sapkal@amd.com>
Cc: Thomas Falcon <thomas.falcon@intel.com>
Cc: Tianyou Li <tianyou.li@intel.com>
Cc: Yujie Liu <yujie.liu@intel.com>
Cc: tanze <tanze@kylinos.cn>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/builtin-script.c b/tools/perf/builtin-script.c
index b94a199ffcc9306da85832999cc46713927deb1d..c0918006e0ab1b3e6db345c347709d55311f0faa 100644 (file)
--- a/tools/perf/builtin-script.c
+++ b/tools/perf/builtin-script.c
@@ -2419,12 +2419,13 @@ static bool show_event(struct perf_sample *sample,
 }
 
 static void process_event(struct perf_script *script,
-                         struct perf_sample *sample, struct evsel *evsel,
+                         struct perf_sample *sample,
                          struct addr_location *al,
                          struct addr_location *addr_al,
                          struct machine *machine)
 {
        struct thread *thread = al->thread;
+       struct evsel *evsel = sample->evsel;
        struct perf_event_attr *attr = &evsel->core.attr;
        unsigned int type = evsel__output_type(evsel);
        struct evsel_script *es = evsel->priv;
@@ -2716,9 +2717,9 @@ static int process_sample_event(const struct perf_tool *tool,
                                thread__resolve(al.thread, &addr_al, sample);
                        addr_al_ptr = &addr_al;
                }
-               scripting_ops->process_event(event, sample, evsel, &al, addr_al_ptr);
+               scripting_ops->process_event(event, sample, &al, addr_al_ptr);
        } else {
-               process_event(scr, sample, evsel, &al, &addr_al, machine);
+               process_event(scr, sample, &al, &addr_al, machine);
        }
 
 out_put:
@@ -2894,9 +2895,12 @@ static int print_event_with_time(const struct perf_tool *tool,
 {
        struct perf_script *script = container_of(tool, struct perf_script, tool);
        struct perf_session *session = script->session;
-       struct evsel *evsel = evlist__id2evsel(session->evlist, sample->id);
+       struct evsel *evsel = sample->evsel;
        struct thread *thread = NULL;
 
+       if (!evsel)
+               evsel = evlist__id2evsel(session->evlist, sample->id);
+
        if (evsel && !evsel->core.attr.sample_id_all) {
                sample->cpu = 0;
                sample->time = timestamp;

diff --git a/tools/perf/util/scripting-engines/trace-event-perl.c b/tools/perf/util/scripting-engines/trace-event-perl.c
index af0d514b23971bc8bcfb0a7fe68b8fb1ea561537..7a18ea4b7d50196518a6263bd2919321d54e3014 100644 (file)
--- a/tools/perf/util/scripting-engines/trace-event-perl.c
+++ b/tools/perf/util/scripting-engines/trace-event-perl.c
@@ -257,7 +257,6 @@ static void define_event_symbols(struct tep_event *event,
 }
 
 static SV *perl_process_callchain(struct perf_sample *sample,
-                                 struct evsel *evsel __maybe_unused,
                                  struct addr_location *al)
 {
        struct callchain_cursor *cursor;
@@ -340,7 +339,6 @@ exit:
 }
 
 static void perl_process_tracepoint(struct perf_sample *sample,
-                                   struct evsel *evsel,
                                    struct addr_location *al)
 {
        struct thread *thread = al->thread;
@@ -355,6 +353,7 @@ static void perl_process_tracepoint(struct perf_sample *sample,
        unsigned long long nsecs = sample->time;
        const char *comm = thread__comm_str(thread);
        DECLARE_BITMAP(events_defined, TRACE_EVENT_TYPE_MAX);
+       struct evsel *evsel = sample->evsel;
 
        bitmap_zero(events_defined, TRACE_EVENT_TYPE_MAX);
        dSP;
@@ -389,7 +388,7 @@ static void perl_process_tracepoint(struct perf_sample *sample,
        XPUSHs(sv_2mortal(newSVuv(ns)));
        XPUSHs(sv_2mortal(newSViv(pid)));
        XPUSHs(sv_2mortal(newSVpv(comm, 0)));
-       XPUSHs(sv_2mortal(perl_process_callchain(sample, evsel, al)));
+       XPUSHs(sv_2mortal(perl_process_callchain(sample, al)));
 
        /* common fields other than pid can be accessed via xsub fns */
 
@@ -426,7 +425,7 @@ static void perl_process_tracepoint(struct perf_sample *sample,
                XPUSHs(sv_2mortal(newSVuv(nsecs)));
                XPUSHs(sv_2mortal(newSViv(pid)));
                XPUSHs(sv_2mortal(newSVpv(comm, 0)));
-               XPUSHs(sv_2mortal(perl_process_callchain(sample, evsel, al)));
+               XPUSHs(sv_2mortal(perl_process_callchain(sample, al)));
                call_pv("main::trace_unhandled", G_SCALAR);
        }
        SPAGAIN;
@@ -435,9 +434,7 @@ static void perl_process_tracepoint(struct perf_sample *sample,
        LEAVE;
 }
 
-static void perl_process_event_generic(union perf_event *event,
-                                      struct perf_sample *sample,
-                                      struct evsel *evsel)
+static void perl_process_event_generic(union perf_event *event, struct perf_sample *sample)
 {
        dSP;
 
@@ -448,7 +445,8 @@ static void perl_process_event_generic(union perf_event *event,
        SAVETMPS;
        PUSHMARK(SP);
        XPUSHs(sv_2mortal(newSVpvn((const char *)event, event->header.size)));
-       XPUSHs(sv_2mortal(newSVpvn((const char *)&evsel->core.attr, sizeof(evsel->core.attr))));
+       XPUSHs(sv_2mortal(newSVpvn((const char *)&sample->evsel->core.attr,
+                                  sizeof(sample->evsel->core.attr))));
        XPUSHs(sv_2mortal(newSVpvn((const char *)sample, sizeof(*sample))));
        XPUSHs(sv_2mortal(newSVpvn((const char *)sample->raw_data, sample->raw_size)));
        PUTBACK;
@@ -461,13 +459,12 @@ static void perl_process_event_generic(union perf_event *event,
 
 static void perl_process_event(union perf_event *event,
                               struct perf_sample *sample,
-                              struct evsel *evsel,
                               struct addr_location *al,
                               struct addr_location *addr_al)
 {
-       scripting_context__update(scripting_context, event, sample, evsel, al, addr_al);
-       perl_process_tracepoint(sample, evsel, al);
-       perl_process_event_generic(event, sample, evsel);
+       scripting_context__update(scripting_context, event, sample, al, addr_al);
+       perl_process_tracepoint(sample, al);
+       perl_process_event_generic(event, sample);
 }
 
 static void run_start_sub(void)

diff --git a/tools/perf/util/scripting-engines/trace-event-python.c b/tools/perf/util/scripting-engines/trace-event-python.c
index 9e1069ec0578205cff2675573dc21b96968dabe0..8edd2f36e5a95829dee41637938c33efa1949793 100644 (file)
--- a/tools/perf/util/scripting-engines/trace-event-python.c
+++ b/tools/perf/util/scripting-engines/trace-event-python.c
@@ -390,7 +390,6 @@ static unsigned long get_offset(struct symbol *sym, struct addr_location *al)
 }
 
 static PyObject *python_process_callchain(struct perf_sample *sample,
-                                        struct evsel *evsel __maybe_unused,
                                         struct addr_location *al)
 {
        PyObject *pylist;
@@ -651,11 +650,9 @@ static PyObject *get_sample_value_as_tuple(struct sample_read_value *value,
        return t;
 }
 
-static void set_sample_read_in_dict(PyObject *dict_sample,
-                                        struct perf_sample *sample,
-                                        struct evsel *evsel)
+static void set_sample_read_in_dict(PyObject *dict_sample, struct perf_sample *sample)
 {
-       u64 read_format = evsel->core.attr.read_format;
+       u64 read_format = sample->evsel->core.attr.read_format;
        PyObject *values;
        unsigned int i;
 
@@ -741,11 +738,10 @@ static void regs_map(struct regs_dump *regs, uint64_t mask, uint16_t e_machine,
 
 static int set_regs_in_dict(PyObject *dict,
                             struct perf_sample *sample,
-                            struct evsel *evsel,
                             uint16_t e_machine,
                             uint32_t e_flags)
 {
-       struct perf_event_attr *attr = &evsel->core.attr;
+       struct perf_event_attr *attr = &sample->evsel->core.attr;
 
        int size = (__sw_hweight64(attr->sample_regs_intr) * MAX_REG_SIZE) + 1;
        char *bf = NULL;
@@ -831,7 +827,6 @@ static void python_process_sample_flags(struct perf_sample *sample, PyObject *di
 }
 
 static PyObject *get_perf_sample_dict(struct perf_sample *sample,
-                                        struct evsel *evsel,
                                         struct addr_location *al,
                                         struct addr_location *addr_al,
                                         PyObject *callchain)
@@ -839,6 +834,7 @@ static PyObject *get_perf_sample_dict(struct perf_sample *sample,
        PyObject *dict, *dict_sample, *brstack, *brstacksym;
        uint16_t e_machine = EM_HOST;
        uint32_t e_flags = EF_HOST;
+       struct evsel *evsel = sample->evsel;
 
        dict = PyDict_New();
        if (!dict)
@@ -871,7 +867,7 @@ static PyObject *get_perf_sample_dict(struct perf_sample *sample,
                        PyLong_FromUnsignedLongLong(sample->phys_addr));
        pydict_set_item_string_decref(dict_sample, "addr",
                        PyLong_FromUnsignedLongLong(sample->addr));
-       set_sample_read_in_dict(dict_sample, sample, evsel);
+       set_sample_read_in_dict(dict_sample, sample);
        pydict_set_item_string_decref(dict_sample, "weight",
                        PyLong_FromUnsignedLongLong(sample->weight));
        pydict_set_item_string_decref(dict_sample, "ins_lat",
@@ -928,7 +924,7 @@ static PyObject *get_perf_sample_dict(struct perf_sample *sample,
        if (al->thread)
                e_machine = thread__e_machine(al->thread, /*machine=*/NULL, &e_flags);
 
-       if (set_regs_in_dict(dict, sample, evsel, e_machine, e_flags))
+       if (set_regs_in_dict(dict, sample, e_machine, e_flags))
                Py_FatalError("Failed to setting regs in dict");
 
        return dict;
@@ -936,7 +932,6 @@ static PyObject *get_perf_sample_dict(struct perf_sample *sample,
 
 #ifdef HAVE_LIBTRACEEVENT
 static void python_process_tracepoint(struct perf_sample *sample,
-                                     struct evsel *evsel,
                                      struct addr_location *al,
                                      struct addr_location *addr_al)
 {
@@ -954,6 +949,7 @@ static void python_process_tracepoint(struct perf_sample *sample,
        const char *comm = thread__comm_str(al->thread);
        const char *default_handler_name = "trace_unhandled";
        DECLARE_BITMAP(events_defined, TRACE_EVENT_TYPE_MAX);
+       struct evsel *evsel = sample->evsel;
 
        bitmap_zero(events_defined, TRACE_EVENT_TYPE_MAX);
 
@@ -995,7 +991,7 @@ static void python_process_tracepoint(struct perf_sample *sample,
        PyTuple_SetItem(t, n++, context);
 
        /* ip unwinding */
-       callchain = python_process_callchain(sample, evsel, al);
+       callchain = python_process_callchain(sample, al);
        /* Need an additional reference for the perf_sample dict */
        Py_INCREF(callchain);
 
@@ -1051,7 +1047,7 @@ static void python_process_tracepoint(struct perf_sample *sample,
                PyTuple_SetItem(t, n++, dict);
 
        if (get_argument_count(handler) == (int) n + 1) {
-               all_entries_dict = get_perf_sample_dict(sample, evsel, al, addr_al,
+               all_entries_dict = get_perf_sample_dict(sample, al, addr_al,
                        callchain);
                PyTuple_SetItem(t, n++, all_entries_dict);
        } else {
@@ -1070,7 +1066,6 @@ static void python_process_tracepoint(struct perf_sample *sample,
 }
 #else
 static void python_process_tracepoint(struct perf_sample *sample __maybe_unused,
-                                     struct evsel *evsel __maybe_unused,
                                      struct addr_location *al __maybe_unused,
                                      struct addr_location *addr_al __maybe_unused)
 {
@@ -1465,7 +1460,6 @@ static int python_process_call_return(struct call_return *cr, u64 *parent_db_id,
 }
 
 static void python_process_general_event(struct perf_sample *sample,
-                                        struct evsel *evsel,
                                         struct addr_location *al,
                                         struct addr_location *addr_al)
 {
@@ -1488,8 +1482,8 @@ static void python_process_general_event(struct perf_sample *sample,
                Py_FatalError("couldn't create Python tuple");
 
        /* ip unwinding */
-       callchain = python_process_callchain(sample, evsel, al);
-       dict = get_perf_sample_dict(sample, evsel, al, addr_al, callchain);
+       callchain = python_process_callchain(sample, al);
+       dict = get_perf_sample_dict(sample, al, addr_al, callchain);
 
        PyTuple_SetItem(t, n++, dict);
        if (_PyTuple_Resize(&t, n) == -1)
@@ -1502,24 +1496,23 @@ static void python_process_general_event(struct perf_sample *sample,
 
 static void python_process_event(union perf_event *event,
                                 struct perf_sample *sample,
-                                struct evsel *evsel,
                                 struct addr_location *al,
                                 struct addr_location *addr_al)
 {
        struct tables *tables = &tables_global;
 
-       scripting_context__update(scripting_context, event, sample, evsel, al, addr_al);
+       scripting_context__update(scripting_context, event, sample, al, addr_al);
 
-       switch (evsel->core.attr.type) {
+       switch (sample->evsel->core.attr.type) {
        case PERF_TYPE_TRACEPOINT:
-               python_process_tracepoint(sample, evsel, al, addr_al);
+               python_process_tracepoint(sample, al, addr_al);
                break;
        /* Reserve for future process_hw/sw/raw APIs */
        default:
                if (tables->db_export_mode)
                        db_export__sample(&tables->dbe, event, sample, al, addr_al);
                else
-                       python_process_general_event(sample, evsel, al, addr_al);
+                       python_process_general_event(sample, al, addr_al);
        }
 }
 

diff --git a/tools/perf/util/trace-event-scripting.c b/tools/perf/util/trace-event-scripting.c
index fa850e44cb46cfd70970c425ff7e20ac8921f9b1..dc584ac316a34841546de673a062859a40a8ccd5 100644 (file)
--- a/tools/perf/util/trace-event-scripting.c
+++ b/tools/perf/util/trace-event-scripting.c
@@ -103,12 +103,11 @@ int script_spec__for_each(int (*cb)(struct scripting_ops *ops, const char *spec)
 void scripting_context__update(struct scripting_context *c,
                               union perf_event *event,
                               struct perf_sample *sample,
-                              struct evsel *evsel,
                               struct addr_location *al,
                               struct addr_location *addr_al)
 {
 #ifdef HAVE_LIBTRACEEVENT
-       const struct tep_event *tp_format = evsel__tp_format(evsel);
+       const struct tep_event *tp_format = evsel__tp_format(sample->evsel);
 
        c->pevent = tp_format ? tp_format->tep : NULL;
 #else
@@ -117,7 +116,6 @@ void scripting_context__update(struct scripting_context *c,
        c->event_data = sample->raw_data;
        c->event = event;
        c->sample = sample;
-       c->evsel = evsel;
        c->al = al;
        c->addr_al = addr_al;
 }
@@ -134,7 +132,6 @@ static int stop_script_unsupported(void)
 
 static void process_event_unsupported(union perf_event *event __maybe_unused,
                                      struct perf_sample *sample __maybe_unused,
-                                     struct evsel *evsel __maybe_unused,
                                      struct addr_location *al __maybe_unused,
                                      struct addr_location *addr_al __maybe_unused)
 {

diff --git a/tools/perf/util/trace-event.h b/tools/perf/util/trace-event.h
index 914d9b69ed626f753e2a1dc9bd397205b146bbb2..720121c74f1dc6e6bb31917c5c4c2059ff828e02 100644 (file)
--- a/tools/perf/util/trace-event.h
+++ b/tools/perf/util/trace-event.h
@@ -94,7 +94,6 @@ struct scripting_ops {
        int (*stop_script) (void);
        void (*process_event) (union perf_event *event,
                               struct perf_sample *sample,
-                              struct evsel *evsel,
                               struct addr_location *al,
                               struct addr_location *addr_al);
        void (*process_switch)(union perf_event *event,
@@ -124,7 +123,6 @@ struct scripting_context {
        void *event_data;
        union perf_event *event;
        struct perf_sample *sample;
-       struct evsel *evsel;
        struct addr_location *al;
        struct addr_location *addr_al;
        struct perf_session *session;
@@ -133,7 +131,6 @@ struct scripting_context {
 void scripting_context__update(struct scripting_context *scripting_context,
                               union perf_event *event,
                               struct perf_sample *sample,
-                              struct evsel *evsel,
                               struct addr_location *al,
                               struct addr_location *addr_al);