perf evlist: Rename struct perf_evlist to struct evlist
Rename struct perf_evlist to struct evlist, so we don't have a name clash when we add struct perf_evlist in libperf. Committer notes: Added fixes to build on arm64, from Jiri and from me (tools/perf/util/cs-etm.c) Signed-off-by: Jiri Olsa <jolsa@kernel.org> Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> Cc: Alexey Budankov <alexey.budankov@linux.intel.com> Cc: Andi Kleen <ak@linux.intel.com> Cc: Michael Petlan <mpetlan@redhat.com> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Peter Zijlstra <peterz@infradead.org> Link: http://lkml.kernel.org/r/20190721112506.12306-6-jolsa@kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
committed by
Arnaldo Carvalho de Melo
parent
32dcd021d0
commit
63503dba87
@@ -40,7 +40,7 @@ enum bpf_loader_errno {
|
||||
};
|
||||
|
||||
struct evsel;
|
||||
struct perf_evlist;
|
||||
struct evlist;
|
||||
struct bpf_object;
|
||||
struct parse_events_term;
|
||||
#define PERF_BPF_PROBE_GROUP "perf_bpf_probe"
|
||||
@@ -70,18 +70,18 @@ int bpf__foreach_event(struct bpf_object *obj,
|
||||
bpf_prog_iter_callback_t func, void *arg);
|
||||
|
||||
int bpf__config_obj(struct bpf_object *obj, struct parse_events_term *term,
|
||||
struct perf_evlist *evlist, int *error_pos);
|
||||
struct evlist *evlist, int *error_pos);
|
||||
int bpf__strerror_config_obj(struct bpf_object *obj,
|
||||
struct parse_events_term *term,
|
||||
struct perf_evlist *evlist,
|
||||
struct evlist *evlist,
|
||||
int *error_pos, int err, char *buf,
|
||||
size_t size);
|
||||
int bpf__apply_obj_config(void);
|
||||
int bpf__strerror_apply_obj_config(int err, char *buf, size_t size);
|
||||
|
||||
int bpf__setup_stdout(struct perf_evlist *evlist);
|
||||
struct evsel *bpf__setup_output_event(struct perf_evlist *evlist, const char *name);
|
||||
int bpf__strerror_setup_output_event(struct perf_evlist *evlist, int err, char *buf, size_t size);
|
||||
int bpf__setup_stdout(struct evlist *evlist);
|
||||
struct evsel *bpf__setup_output_event(struct evlist *evlist, const char *name);
|
||||
int bpf__strerror_setup_output_event(struct evlist *evlist, int err, char *buf, size_t size);
|
||||
#else
|
||||
#include <errno.h>
|
||||
#include <string.h>
|
||||
@@ -119,7 +119,7 @@ bpf__foreach_event(struct bpf_object *obj __maybe_unused,
|
||||
static inline int
|
||||
bpf__config_obj(struct bpf_object *obj __maybe_unused,
|
||||
struct parse_events_term *term __maybe_unused,
|
||||
struct perf_evlist *evlist __maybe_unused,
|
||||
struct evlist *evlist __maybe_unused,
|
||||
int *error_pos __maybe_unused)
|
||||
{
|
||||
return 0;
|
||||
@@ -132,13 +132,13 @@ bpf__apply_obj_config(void)
|
||||
}
|
||||
|
||||
static inline int
|
||||
bpf__setup_stdout(struct perf_evlist *evlist __maybe_unused)
|
||||
bpf__setup_stdout(struct evlist *evlist __maybe_unused)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
static inline struct evsel *
|
||||
bpf__setup_output_event(struct perf_evlist *evlist __maybe_unused, const char *name __maybe_unused)
|
||||
bpf__setup_output_event(struct evlist *evlist __maybe_unused, const char *name __maybe_unused)
|
||||
{
|
||||
return NULL;
|
||||
}
|
||||
@@ -182,7 +182,7 @@ static inline int bpf__strerror_load(struct bpf_object *obj __maybe_unused,
|
||||
static inline int
|
||||
bpf__strerror_config_obj(struct bpf_object *obj __maybe_unused,
|
||||
struct parse_events_term *term __maybe_unused,
|
||||
struct perf_evlist *evlist __maybe_unused,
|
||||
struct evlist *evlist __maybe_unused,
|
||||
int *error_pos __maybe_unused,
|
||||
int err __maybe_unused,
|
||||
char *buf, size_t size)
|
||||
@@ -198,7 +198,7 @@ bpf__strerror_apply_obj_config(int err __maybe_unused,
|
||||
}
|
||||
|
||||
static inline int
|
||||
bpf__strerror_setup_output_event(struct perf_evlist *evlist __maybe_unused,
|
||||
bpf__strerror_setup_output_event(struct evlist *evlist __maybe_unused,
|
||||
int err __maybe_unused, char *buf, size_t size)
|
||||
{
|
||||
return __bpf_strerror(buf, size);
|
||||
@@ -206,7 +206,7 @@ bpf__strerror_setup_output_event(struct perf_evlist *evlist __maybe_unused,
|
||||
|
||||
#endif
|
||||
|
||||
static inline int bpf__strerror_setup_stdout(struct perf_evlist *evlist, int err, char *buf, size_t size)
|
||||
static inline int bpf__strerror_setup_stdout(struct evlist *evlist, int err, char *buf, size_t size)
|
||||
{
|
||||
return bpf__strerror_setup_output_event(evlist, err, buf, size);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user