Skip to content

Commit

Permalink
perf tool: Rename perf_tool::bpf_event to bpf
Browse files Browse the repository at this point in the history 
No need for that _event suffix, do just like all the other meta event
handlers and suppress that suffix.

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-03spzxtqafbabbbmnm7y4xfx@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
  • Loading branch information
Arnaldo Carvalho de Melo committed Aug 26, 2019
1 parent 6a1b359 commit 3f604b5
Show file tree
Hide file tree
Showing 8 changed files with 29 additions and 30 deletions.
4 changes: 2 additions & 2 deletions tools/perf/builtin-script.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2492,8 +2492,8 @@ static int __cmd_script(struct perf_script *script)
script->tool.finished_round = process_finished_round_event;
}
if (script->show_bpf_events) {
script->tool.ksymbol = process_bpf_events;
script->tool.bpf_event = process_bpf_events;
script->tool.ksymbol = process_bpf_events;
script->tool.bpf = process_bpf_events;
}

if (perf_script__setup_per_event_dump(script)) {
Expand Down
11 changes: 5 additions & 6 deletions tools/perf/util/bpf-event.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,12 +64,11 @@ static int machine__process_bpf_event_load(struct machine *machine,
return 0;
}

int machine__process_bpf_event(struct machine *machine __maybe_unused,
union perf_event *event,
struct perf_sample *sample __maybe_unused)
int machine__process_bpf(struct machine *machine, union perf_event *event,
struct perf_sample *sample)
{
if (dump_trace)
perf_event__fprintf_bpf_event(event, stdout);
perf_event__fprintf_bpf(event, stdout);

switch (event->bpf.type) {
case PERF_BPF_EVENT_PROG_LOAD:
Expand All @@ -83,7 +82,7 @@ int machine__process_bpf_event(struct machine *machine __maybe_unused,
*/
break;
default:
pr_debug("unexpected bpf_event type of %d\n", event->bpf.type);
pr_debug("unexpected bpf event type of %d\n", event->bpf.type);
break;
}
return 0;
Expand Down Expand Up @@ -410,7 +409,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.type);
pr_debug("unexpected bpf event type of %d\n", event->bpf.type);
break;
}

Expand Down
10 changes: 5 additions & 5 deletions tools/perf/util/bpf-event.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ struct btf_node {
};

#ifdef HAVE_LIBBPF_SUPPORT
int machine__process_bpf_event(struct machine *machine, union perf_event *event,
struct perf_sample *sample);
int machine__process_bpf(struct machine *machine, union perf_event *event,
struct perf_sample *sample);

int perf_event__synthesize_bpf_events(struct perf_session *session,
perf_event__handler_t process,
Expand All @@ -43,9 +43,9 @@ void bpf_event__print_bpf_prog_info(struct bpf_prog_info *info,
struct perf_env *env,
FILE *fp);
#else
static inline int machine__process_bpf_event(struct machine *machine __maybe_unused,
union perf_event *event __maybe_unused,
struct perf_sample *sample __maybe_unused)
static inline int machine__process_bpf(struct machine *machine __maybe_unused,
union perf_event *event __maybe_unused,
struct perf_sample *sample __maybe_unused)
{
return 0;
}
Expand Down
14 changes: 7 additions & 7 deletions tools/perf/util/event.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1343,12 +1343,12 @@ int perf_event__process_ksymbol(struct perf_tool *tool __maybe_unused,
return machine__process_ksymbol(machine, event, sample);
}

int perf_event__process_bpf_event(struct perf_tool *tool __maybe_unused,
union perf_event *event,
struct perf_sample *sample __maybe_unused,
struct machine *machine)
int perf_event__process_bpf(struct perf_tool *tool __maybe_unused,
union perf_event *event,
struct perf_sample *sample,
struct machine *machine)
{
return machine__process_bpf_event(machine, event, sample);
return machine__process_bpf(machine, event, sample);
}

size_t perf_event__fprintf_mmap(union perf_event *event, FILE *fp)
Expand Down Expand Up @@ -1491,7 +1491,7 @@ size_t perf_event__fprintf_ksymbol(union perf_event *event, FILE *fp)
event->ksymbol.flags, event->ksymbol.name);
}

size_t perf_event__fprintf_bpf_event(union perf_event *event, FILE *fp)
size_t perf_event__fprintf_bpf(union perf_event *event, FILE *fp)
{
return fprintf(fp, " type %u, flags %u, id %u\n",
event->bpf.type, event->bpf.flags, event->bpf.id);
Expand Down Expand Up @@ -1536,7 +1536,7 @@ size_t perf_event__fprintf(union perf_event *event, FILE *fp)
ret += perf_event__fprintf_ksymbol(event, fp);
break;
case PERF_RECORD_BPF_EVENT:
ret += perf_event__fprintf_bpf_event(event, fp);
ret += perf_event__fprintf_bpf(event, fp);
break;
default:
ret += fprintf(fp, "\n");
Expand Down
10 changes: 5 additions & 5 deletions tools/perf/util/event.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -683,10 +683,10 @@ int perf_event__process_ksymbol(struct perf_tool *tool,
union perf_event *event,
struct perf_sample *sample,
struct machine *machine);
int perf_event__process_bpf_event(struct perf_tool *tool,
union perf_event *event,
struct perf_sample *sample,
struct machine *machine);
int perf_event__process_bpf(struct perf_tool *tool,
union perf_event *event,
struct perf_sample *sample,
struct machine *machine);
int perf_tool__process_synth_event(struct perf_tool *tool,
union perf_event *event,
struct machine *machine,
Expand Down Expand Up @@ -751,7 +751,7 @@ size_t perf_event__fprintf_thread_map(union perf_event *event, FILE *fp);
size_t perf_event__fprintf_cpu_map(union perf_event *event, FILE *fp);
size_t perf_event__fprintf_namespaces(union perf_event *event, FILE *fp);
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);
size_t perf_event__fprintf_bpf(union perf_event *event, FILE *fp);
size_t perf_event__fprintf(union perf_event *event, FILE *fp);

int kallsyms__get_function_start(const char *kallsyms_filename,
Expand Down
2 changes: 1 addition & 1 deletion tools/perf/util/machine.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1922,7 +1922,7 @@ int machine__process_event(struct machine *machine, union perf_event *event,
case PERF_RECORD_KSYMBOL:
ret = machine__process_ksymbol(machine, event, sample); break;
case PERF_RECORD_BPF_EVENT:
ret = machine__process_bpf_event(machine, event, sample); break;
ret = machine__process_bpf(machine, event, sample); break;
default:
ret = -1;
break;
Expand Down
6 changes: 3 additions & 3 deletions tools/perf/util/session.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -473,8 +473,8 @@ void perf_tool__fill_defaults(struct perf_tool *tool)
tool->context_switch = perf_event__process_switch;
if (tool->ksymbol == NULL)
tool->ksymbol = perf_event__process_ksymbol;
if (tool->bpf_event == NULL)
tool->bpf_event = perf_event__process_bpf_event;
if (tool->bpf == NULL)
tool->bpf = perf_event__process_bpf;
if (tool->read == NULL)
tool->read = process_event_sample_stub;
if (tool->throttle == NULL)
Expand Down Expand Up @@ -1452,7 +1452,7 @@ static int machines__deliver_event(struct machines *machines,
case PERF_RECORD_KSYMBOL:
return tool->ksymbol(tool, event, sample, machine);
case PERF_RECORD_BPF_EVENT:
return tool->bpf_event(tool, event, sample, machine);
return tool->bpf(tool, event, sample, machine);
default:
++evlist->stats.nr_unknown_events;
return -1;
Expand Down
2 changes: 1 addition & 1 deletion tools/perf/util/tool.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ struct perf_tool {
throttle,
unthrottle,
ksymbol,
bpf_event;
bpf;

event_attr_op attr;
event_attr_op event_update;
Expand Down

0 comments on commit 3f604b5

Please sign in to comment.