perf tools: Rename perf_event::bpf_event to perf_event::bpf
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: 6a1b359821eb8d929c4dd9f53178da84888d79ec Gitweb: https://git.kernel.org/tip/6a1b359821eb8d929c4dd9f53178da84888d79ec Author: Arnaldo Carvalho de Melo <[email protected]> AuthorDate: Mon, 26 Aug 2019 19:20:35 -03:00 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitterDate: Mon, 26 Aug 2019 19:39:11 -03:00
perf tools: Rename perf_event::bpf_event to perf_event::bpf
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 | 18 ++++++++---------- tools/perf/util/event.c | 3 +-- tools/perf/util/event.h | 2 +- 3 files changed, 10 insertions(+), 13 deletions(-)
tools/perf/util/bpf-event.c +8 -10
@@ -35,7 +35,7 @@ static int machine__process_bpf_event_load(struct machine *machine,struct bpf_prog_info_linear *info_linear;struct bpf_prog_info_node *info_node;struct perf_env *env = machine->env; -int id = event->bpf_event.id; +int id = event->bpf.id;unsigned int i;/* perf-record, no need to handle bpf-event */
@@ -71,7 +71,7 @@ int machine__process_bpf_event(struct machine *machine __maybe_unused,if (dump_trace)perf_event__fprintf_bpf_event (event, stdout); -switch (event->bpf_event.type) { +switch (event->bpf.type) {case PERF_BPF_EVENT_PROG_LOAD :return machine__process_bpf_event_load (machine, event, sample);
@@ -83,8 +83,7 @@ int machine__process_bpf_event(struct machine *machine __maybe_unused,*/ break ;default : -pr_debug ("unexpected bpf_event type of %d\n" , - event->bpf_event.type); +pr_debug ("unexpected bpf_event type of %d\n" , event->bpf.type);break ; }return 0 ;
@@ -162,7 +161,7 @@ static int perf_event__synthesize_one_bpf_prog(struct perf_session *session, struct record_opts *opts) {struct perf_record_ksymbol *ksymbol_event = &event->ksymbol; -struct perf_record_bpf_event *bpf_event = &event->bpf_event; +struct perf_record_bpf_event *bpf_event = &event->bpf;struct bpf_prog_info_linear *info_linear;struct perf_tool *tool = session->tool;struct bpf_prog_info_node *info_node;
@@ -302,7 +301,7 @@ int perf_event__synthesize_bpf_events(struct perf_session *session,int err;int fd; - event =malloc (sizeof (event->bpf_event) +KSYM_NAME_LEN + machine->id_hdr_size); + event =malloc (sizeof (event->bpf) +KSYM_NAME_LEN + machine->id_hdr_size);if (!event)return -1 ;while (true) {
@@ -399,9 +398,9 @@ static int bpf_event__sb_cb(union perf_event *event, void *data)if (event->header.type !=PERF_RECORD_BPF_EVENT )return -1 ; -switch (event->bpf_event.type) { +switch (event->bpf.type) {case PERF_BPF_EVENT_PROG_LOAD : -perf_env__add_bpf_info (env, event->bpf_event.id); +perf_env__add_bpf_info (env, event->bpf.id);case PERF_BPF_EVENT_PROG_UNLOAD :/*
@@ -411,8 +410,7 @@ static int bpf_event__sb_cb(union perf_event *event, void *data)*/ break ;default : -pr_debug ("unexpected bpf_event type of %d\n" , - event->bpf_event.type); +pr_debug ("unexpected bpf_event type of %d\n" , event->bpf.type);break ; }
tools/perf/util/event.c +1 -2
@@ -1494,8 +1494,7 @@ size_t perf_event__fprintf_ksymbol(union perf_event *event, FILE *fp)size_t perf_event__fprintf_bpf_event (union perf_event *event,FILE *fp) {return fprintf (fp," type %u, flags %u, id %u\n" , - event->bpf_event.type, event->bpf_event.flags, - event->bpf_event.id); + event->bpf.type, event->bpf.flags, event->bpf.id); }size_t perf_event__fprintf (union perf_event *event,FILE *fp)
tools/perf/util/event.h +1 -1
@@ -560,7 +560,7 @@ union perf_event {struct perf_record_read read;struct perf_record_throttle throttle;struct perf_record_sample sample; -struct perf_record_bpf_event bpf_event; +struct perf_record_bpf_event bpf;struct perf_record_ksymbol ksymbol;struct attr_event attr;struct event_update_event event_update;