perf evsel: Rename struct perf_evsel to struct evsel
Rename struct perf_evsel to struct evsel, so we don't have a name clash when we add struct perf_evsel in libperf. Committer notes: Added fixes for arm64, provided by Jiri. 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-5-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
9749b90e56
commit
32dcd021d0
@@ -392,7 +392,7 @@ static const char *get_dsoname(struct map *map)
|
||||
}
|
||||
|
||||
static PyObject *python_process_callchain(struct perf_sample *sample,
|
||||
struct perf_evsel *evsel,
|
||||
struct evsel *evsel,
|
||||
struct addr_location *al)
|
||||
{
|
||||
PyObject *pylist;
|
||||
@@ -634,7 +634,7 @@ static PyObject *get_sample_value_as_tuple(struct sample_read_value *value)
|
||||
|
||||
static void set_sample_read_in_dict(PyObject *dict_sample,
|
||||
struct perf_sample *sample,
|
||||
struct perf_evsel *evsel)
|
||||
struct evsel *evsel)
|
||||
{
|
||||
u64 read_format = evsel->attr.read_format;
|
||||
PyObject *values;
|
||||
@@ -705,7 +705,7 @@ static int regs_map(struct regs_dump *regs, uint64_t mask, char *bf, int size)
|
||||
|
||||
static void set_regs_in_dict(PyObject *dict,
|
||||
struct perf_sample *sample,
|
||||
struct perf_evsel *evsel)
|
||||
struct evsel *evsel)
|
||||
{
|
||||
struct perf_event_attr *attr = &evsel->attr;
|
||||
char bf[512];
|
||||
@@ -722,7 +722,7 @@ static void set_regs_in_dict(PyObject *dict,
|
||||
}
|
||||
|
||||
static PyObject *get_perf_sample_dict(struct perf_sample *sample,
|
||||
struct perf_evsel *evsel,
|
||||
struct evsel *evsel,
|
||||
struct addr_location *al,
|
||||
PyObject *callchain)
|
||||
{
|
||||
@@ -790,7 +790,7 @@ static PyObject *get_perf_sample_dict(struct perf_sample *sample,
|
||||
}
|
||||
|
||||
static void python_process_tracepoint(struct perf_sample *sample,
|
||||
struct perf_evsel *evsel,
|
||||
struct evsel *evsel,
|
||||
struct addr_location *al)
|
||||
{
|
||||
struct tep_event *event = evsel->tp_format;
|
||||
@@ -955,7 +955,7 @@ static int tuple_set_bytes(PyObject *t, unsigned int pos, void *bytes,
|
||||
return PyTuple_SetItem(t, pos, _PyBytes_FromStringAndSize(bytes, sz));
|
||||
}
|
||||
|
||||
static int python_export_evsel(struct db_export *dbe, struct perf_evsel *evsel)
|
||||
static int python_export_evsel(struct db_export *dbe, struct evsel *evsel)
|
||||
{
|
||||
struct tables *tables = container_of(dbe, struct tables, dbe);
|
||||
PyObject *t;
|
||||
@@ -1275,7 +1275,7 @@ static int python_process_call_return(struct call_return *cr, u64 *parent_db_id,
|
||||
}
|
||||
|
||||
static void python_process_general_event(struct perf_sample *sample,
|
||||
struct perf_evsel *evsel,
|
||||
struct evsel *evsel,
|
||||
struct addr_location *al)
|
||||
{
|
||||
PyObject *handler, *t, *dict, *callchain;
|
||||
@@ -1311,7 +1311,7 @@ static void python_process_general_event(struct perf_sample *sample,
|
||||
|
||||
static void python_process_event(union perf_event *event,
|
||||
struct perf_sample *sample,
|
||||
struct perf_evsel *evsel,
|
||||
struct evsel *evsel,
|
||||
struct addr_location *al)
|
||||
{
|
||||
struct tables *tables = &tables_global;
|
||||
@@ -1340,7 +1340,7 @@ static void python_process_switch(union perf_event *event,
|
||||
}
|
||||
|
||||
static void get_handler_name(char *str, size_t size,
|
||||
struct perf_evsel *evsel)
|
||||
struct evsel *evsel)
|
||||
{
|
||||
char *p = str;
|
||||
|
||||
@@ -1353,7 +1353,7 @@ static void get_handler_name(char *str, size_t size,
|
||||
}
|
||||
|
||||
static void
|
||||
process_stat(struct perf_evsel *counter, int cpu, int thread, u64 tstamp,
|
||||
process_stat(struct evsel *counter, int cpu, int thread, u64 tstamp,
|
||||
struct perf_counts_values *count)
|
||||
{
|
||||
PyObject *handler, *t;
|
||||
@@ -1390,7 +1390,7 @@ process_stat(struct perf_evsel *counter, int cpu, int thread, u64 tstamp,
|
||||
}
|
||||
|
||||
static void python_process_stat(struct perf_stat_config *config,
|
||||
struct perf_evsel *counter, u64 tstamp)
|
||||
struct evsel *counter, u64 tstamp)
|
||||
{
|
||||
struct perf_thread_map *threads = counter->threads;
|
||||
struct perf_cpu_map *cpus = counter->cpus;
|
||||
|
Reference in New Issue
Block a user