Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

perf bpf: Add bpf__setup_output_event() strerror() counterpart 

That is just bpf__strerror_setup_stdout() renamed to the more general
"setup_output_event" method, keep the existing stdout() as a wrapper.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Wang Nan <wangnan0@huawei.com>
Link: https://lkml.kernel.org/n/tip-nwnveo428qn0b48axj50vkc7@git.kernel.org


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 92bbe8d8

tools/perf/util/bpf-loader.c

+2 −2
Original line number Diff line number Diff line
@@ -1791,7 +1791,7 @@ int bpf__strerror_apply_obj_config(int err, char *buf, size_t size) 
	return 0;

}



int bpf__strerror_setup_stdout(struct perf_evlist *evlist __maybe_unused,

int bpf__strerror_setup_output_event(struct perf_evlist *evlist __maybe_unused,

				     int err, char *buf, size_t size)

{

	bpf__strerror_head(err, buf, size);

tools/perf/util/bpf-loader.h

+9 −6
Original line number Diff line number Diff line
@@ -83,9 +83,7 @@ int bpf__strerror_apply_obj_config(int err, char *buf, size_t size); 


int bpf__setup_stdout(struct perf_evlist *evlist);

int bpf__setup_output_event(struct perf_evlist *evlist, const char *name);

int bpf__strerror_setup_stdout(struct perf_evlist *evlist, int err,

			       char *buf, size_t size);



int bpf__strerror_setup_output_event(struct perf_evlist *evlist, int err, char *buf, size_t size);

#else

#include <errno.h>
@@ -200,11 +198,16 @@ bpf__strerror_apply_obj_config(int err __maybe_unused, 
}



static inline int

bpf__strerror_setup_stdout(struct perf_evlist *evlist __maybe_unused,

			   int err __maybe_unused, char *buf,

			   size_t size)

bpf__strerror_setup_output_event(struct perf_evlist *evlist __maybe_unused,

				 int err __maybe_unused, char *buf, size_t size)

{

	return __bpf_strerror(buf, size);

}



#endif



static inline int bpf__strerror_setup_stdout(struct perf_evlist *evlist, int err, char *buf, size_t size)

{

	return bpf__strerror_setup_output_event(evlist, err, buf, size);

}

#endif