perf tools: Rename perf_event::ksymbol_event to perf_event::ksymbol

Just like all the other meta events, that extra _event suffix is just
redundant, ditch it.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Song Liu <songliubraving@fb.com>
Link: https://lkml.kernel.org/n/tip-0q8b2xnfs17q0g523oej75s0@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/util/bpf-event.c b/tools/perf/util/bpf-event.c
index 3be8c480fa1f5dbce254623264e816f90318874b..69795c32ecf35313984e6da6e269f0cddd5c54d6 100644 (file)
--- a/tools/perf/util/bpf-event.c
+++ b/tools/perf/util/bpf-event.c
@@ -161,7 +161,7 @@ static int perf_event__synthesize_one_bpf_prog(struct perf_session *session,
                                               union perf_event *event,
                                               struct record_opts *opts)
 {
-       struct perf_record_ksymbol *ksymbol_event = &event->ksymbol_event;
+       struct perf_record_ksymbol *ksymbol_event = &event->ksymbol;
        struct perf_record_bpf_event *bpf_event = &event->bpf_event;
        struct bpf_prog_info_linear *info_linear;
        struct perf_tool *tool = session->tool;

diff --git a/tools/perf/util/event.c b/tools/perf/util/event.c
index 4447cd25e3f2df142ac778e5c7d24c1a6cb52b80..bdeaad434e52c616b49857b420b2b95e09f1e0c5 100644 (file)
--- a/tools/perf/util/event.c
+++ b/tools/perf/util/event.c
@@ -1486,9 +1486,9 @@ static size_t perf_event__fprintf_lost(union perf_event *event, FILE *fp)
 size_t perf_event__fprintf_ksymbol(union perf_event *event, FILE *fp)
 {
        return fprintf(fp, " addr %" PRI_lx64 " len %u type %u flags 0x%x name %s\n",
-                      event->ksymbol_event.addr, event->ksymbol_event.len,
-                      event->ksymbol_event.ksym_type,
-                      event->ksymbol_event.flags, event->ksymbol_event.name);
+                      event->ksymbol.addr, event->ksymbol.len,
+                      event->ksymbol.ksym_type,
+                      event->ksymbol.flags, event->ksymbol.name);
 }
 
 size_t perf_event__fprintf_bpf_event(union perf_event *event, FILE *fp)

diff --git a/tools/perf/util/event.h b/tools/perf/util/event.h
index 25f5309a3442378d6b870314c15034a46b46c475..34190e01f30772db4899635e5f808730f4332338 100644 (file)
--- a/tools/perf/util/event.h
+++ b/tools/perf/util/event.h
@@ -561,7 +561,7 @@ union perf_event {
        struct perf_record_throttle     throttle;
        struct perf_record_sample       sample;
        struct perf_record_bpf_event    bpf_event;
-       struct perf_record_ksymbol      ksymbol_event;
+       struct perf_record_ksymbol      ksymbol;
        struct attr_event               attr;
        struct event_update_event       event_update;
        struct event_type_event         event_type;

diff --git a/tools/perf/util/machine.c b/tools/perf/util/machine.c
index 823aaf7b1b83b227efece29d98544aceef356b78..86b7fd24b1e12c1a1c9a40dbdf8f7d4be13b7080 100644 (file)
--- a/tools/perf/util/machine.c
+++ b/tools/perf/util/machine.c
@@ -713,20 +713,20 @@ static int machine__process_ksymbol_register(struct machine *machine,
        struct symbol *sym;
        struct map *map;
 
-       map = map_groups__find(&machine->kmaps, event->ksymbol_event.addr);
+       map = map_groups__find(&machine->kmaps, event->ksymbol.addr);
        if (!map) {
-               map = dso__new_map(event->ksymbol_event.name);
+               map = dso__new_map(event->ksymbol.name);
                if (!map)
                        return -ENOMEM;
 
-               map->start = event->ksymbol_event.addr;
-               map->end = map->start + event->ksymbol_event.len;
+               map->start = event->ksymbol.addr;
+               map->end = map->start + event->ksymbol.len;
                map_groups__insert(&machine->kmaps, map);
        }
 
        sym = symbol__new(map->map_ip(map, map->start),
-                         event->ksymbol_event.len,
-                         0, 0, event->ksymbol_event.name);
+                         event->ksymbol.len,
+                         0, 0, event->ksymbol.name);
        if (!sym)
                return -ENOMEM;
        dso__insert_symbol(map->dso, sym);
@@ -739,7 +739,7 @@ static int machine__process_ksymbol_unregister(struct machine *machine,
 {
        struct map *map;
 
-       map = map_groups__find(&machine->kmaps, event->ksymbol_event.addr);
+       map = map_groups__find(&machine->kmaps, event->ksymbol.addr);
        if (map)
                map_groups__remove(&machine->kmaps, map);
 
@@ -753,7 +753,7 @@ int machine__process_ksymbol(struct machine *machine __maybe_unused,
        if (dump_trace)
                perf_event__fprintf_ksymbol(event, stdout);
 
-       if (event->ksymbol_event.flags & PERF_RECORD_KSYMBOL_FLAGS_UNREGISTER)
+       if (event->ksymbol.flags & PERF_RECORD_KSYMBOL_FLAGS_UNREGISTER)
                return machine__process_ksymbol_unregister(machine, event,
                                                           sample);
        return machine__process_ksymbol_register(machine, event, sample);