perf tools: Rename perf_event::ksymbol_event to perf_event::ksymbol
A message that is not in the archive (sent off-list or not yet received): [email protected]
The following commit has been merged into the perf/core branch of tip:
Commit-ID: ebdba16e95f728e94dba07fe0f1221b0e8efdb9d Gitweb: https://git.kernel.org/tip/ebdba16e95f728e94dba07fe0f1221b0e8efdb9d Author: Arnaldo Carvalho de Melo <[email protected]> AuthorDate: Mon, 26 Aug 2019 19:15:18 -03:00 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitterDate: Mon, 26 Aug 2019 19:39:11 -03:00
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 <[email protected]>
Cc Jiri Olsa <[email protected]>
Cc Namhyung Kim <[email protected]>
Cc Song Liu <[email protected]>
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
--- tools/perf/util/bpf-event.c | 2 +- tools/perf/util/event.c | 6 +++--- tools/perf/util/event.h | 2 +- tools/perf/util/machine.c | 16 ++++++++-------- 4 files changed, 13 insertions(+), 13 deletions(-)
tools/perf/util/bpf-event.c +1 -1
@@ -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;
tools/perf/util/event.c +3 -3
@@ -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)
tools/perf/util/event.h +1 -1
@@ -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;
tools/perf/util/machine.c +8 -8
@@ -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);