Commit 3f604b5f authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

perf tool: Rename perf_tool::bpf_event to bpf 

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: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 6a1b3598

tools/perf/builtin-script.c

+2 −2
Original line number Diff line number Diff line
@@ -2493,7 +2493,7 @@ static int __cmd_script(struct perf_script *script) 
	}

	if (script->show_bpf_events) {

		script->tool.ksymbol = process_bpf_events;

		script->tool.bpf_event = process_bpf_events;

		script->tool.bpf     = process_bpf_events;

	}



	if (perf_script__setup_per_event_dump(script)) {

tools/perf/util/bpf-event.c

+5 −6
Original line number Diff line number Diff line
@@ -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:
@@ -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;
@@ -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;

	}

tools/perf/util/bpf-event.h

+5 −5
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ struct btf_node { 
};



#ifdef HAVE_LIBBPF_SUPPORT

int machine__process_bpf_event(struct machine *machine, union perf_event *event,

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,
@@ -43,7 +43,7 @@ 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,

static inline int machine__process_bpf(struct machine *machine __maybe_unused,

				       union perf_event *event __maybe_unused,

				       struct perf_sample *sample __maybe_unused)

{

tools/perf/util/event.c

+7 −7
Original line number Diff line number Diff line
@@ -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,

int perf_event__process_bpf(struct perf_tool *tool __maybe_unused,

			    union perf_event *event,

				  struct perf_sample *sample __maybe_unused,

			    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)
@@ -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);
@@ -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");

tools/perf/util/event.h

+5 −5
Original line number Diff line number Diff line
@@ -683,7 +683,7 @@ 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,

int perf_event__process_bpf(struct perf_tool *tool,

			    union perf_event *event,

			    struct perf_sample *sample,

			    struct machine *machine);
@@ -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,

CRA Git | Maintained and supported by SUSTech CRA and CCSE