leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libperf: Move 'id' from 'struct evsel' to 'struct perf_evsel'

Browse Source 
Move the 'id' array from 'struct evsel' to libperf's 'struct perf_evsel'.

Committer note:

Fix the tools/perf/util/cs-etm.c build, i.e. aarch64's CoreSight.

Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Michael Petlan <mpetlan@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lore.kernel.org/lkml/20190913132355.21634-25-jolsa@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Jiri Olsa 2019-09-02 22:12:26 +02:00 committed by Arnaldo Carvalho de Melo
parent 8cd36f3ef4
commit deaf321913
9 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tools/perf/lib/include/internal/evsel.h
View File

@ -18,6 +18,7 @@ struct perf_evsel {
struct perf_thread_map *threads; struct perf_thread_map *threads;
struct xyarray *fd; struct xyarray *fd;
struct xyarray *sample_id; struct xyarray *sample_id;
u64 *id;
/* parse modifier helper */ /* parse modifier helper */
int nr_members; int nr_members;

2
tools/perf/util/cs-etm.c
View File

@ -1298,7 +1298,7 @@ static int cs_etm__synth_events(struct cs_etm_auxtrace *etm,
attr.read_format = evsel->core.attr.read_format; attr.read_format = evsel->core.attr.read_format;
/* create new id val to be a fixed offset from evsel id */ /* create new id val to be a fixed offset from evsel id */
id = evsel->id[0] + 1000000000; id = evsel->core.id[0] + 1000000000;
if (!id) if (!id)
id = 1; id = 1;

2
tools/perf/util/evlist.c
View File

@ -482,7 +482,7 @@ void perf_evlist__id_add(struct evlist *evlist, struct evsel *evsel,
int cpu, int thread, u64 id) int cpu, int thread, u64 id)
{ {
perf_evlist__id_hash(evlist, evsel, cpu, thread, id); perf_evlist__id_hash(evlist, evsel, cpu, thread, id);
evsel->id[evsel->ids++] = id; evsel->core.id[evsel->ids++] = id;
} }
int perf_evlist__id_add_fd(struct evlist *evlist, int perf_evlist__id_add_fd(struct evlist *evlist,

6
tools/perf/util/evsel.c
View File

@ -1239,8 +1239,8 @@ int perf_evsel__alloc_id(struct evsel *evsel, int ncpus, int nthreads)
if (evsel->core.sample_id == NULL) if (evsel->core.sample_id == NULL)
return -ENOMEM; return -ENOMEM;
evsel->id = zalloc(ncpus * nthreads * sizeof(u64)); evsel->core.id = zalloc(ncpus * nthreads * sizeof(u64));
if (evsel->id == NULL) { if (evsel->core.id == NULL) {
xyarray__delete(evsel->core.sample_id); xyarray__delete(evsel->core.sample_id);
evsel->core.sample_id = NULL; evsel->core.sample_id = NULL;
return -ENOMEM; return -ENOMEM;
@ -1253,7 +1253,7 @@ static void perf_evsel__free_id(struct evsel *evsel)
{ {
xyarray__delete(evsel->core.sample_id); xyarray__delete(evsel->core.sample_id);
evsel->core.sample_id = NULL; evsel->core.sample_id = NULL;
zfree(&evsel->id); zfree(&evsel->core.id);
evsel->ids = 0; evsel->ids = 0;
} }

1
tools/perf/util/evsel.h
View File

@ -116,7 +116,6 @@ struct evsel {
struct perf_evsel core; struct perf_evsel core;
struct evlist *evlist; struct evlist *evlist;
char *filter; char *filter;
u64 *id;
struct perf_counts *counts; struct perf_counts *counts;
struct perf_counts *prev_raw_counts; struct perf_counts *prev_raw_counts;
int idx; int idx;

10
tools/perf/util/header.c
View File

@ -530,7 +530,7 @@ static int write_event_desc(struct feat_fd *ff,
/* /*
* write unique ids for this event * write unique ids for this event
*/ */
ret = do_write(ff, evsel->id, evsel->ids * sizeof(u64)); ret = do_write(ff, evsel->core.id, evsel->ids * sizeof(u64));
if (ret < 0) if (ret < 0)
return ret; return ret;
} }
@ -1590,7 +1590,7 @@ static void free_event_desc(struct evsel *events)
for (evsel = events; evsel->core.attr.size; evsel++) { for (evsel = events; evsel->core.attr.size; evsel++) {
zfree(&evsel->name); zfree(&evsel->name);
zfree(&evsel->id); zfree(&evsel->core.id);
} }
free(events); free(events);
@ -1657,7 +1657,7 @@ static struct evsel *read_event_desc(struct feat_fd *ff)
if (!id) if (!id)
goto error; goto error;
evsel->ids = nr; evsel->ids = nr;
evsel->id = id; evsel->core.id = id;
for (j = 0 ; j < nr; j++) { for (j = 0 ; j < nr; j++) {
if (do_read_u64(ff, id)) if (do_read_u64(ff, id))
@ -1701,7 +1701,7 @@ static void print_event_desc(struct feat_fd *ff, FILE *fp)
if (evsel->ids) { if (evsel->ids) {
fprintf(fp, ", id = {"); fprintf(fp, ", id = {");
for (j = 0, id = evsel->id; j < evsel->ids; j++, id++) { for (j = 0, id = evsel->core.id; j < evsel->ids; j++, id++) {
if (j) if (j)
fputc(',', fp); fputc(',', fp);
fprintf(fp, " %"PRIu64, *id); fprintf(fp, " %"PRIu64, *id);
@ -3068,7 +3068,7 @@ int perf_session__write_header(struct perf_session *session,
evlist__for_each_entry(session->evlist, evsel) { evlist__for_each_entry(session->evlist, evsel) {
evsel->id_offset = lseek(fd, 0, SEEK_CUR); evsel->id_offset = lseek(fd, 0, SEEK_CUR);
err = do_write(&ff, evsel->id, evsel->ids * sizeof(u64)); err = do_write(&ff, evsel->core.id, evsel->ids * sizeof(u64));
if (err < 0) { if (err < 0) {
pr_debug("failed to write perf header\n"); pr_debug("failed to write perf header\n");
return err; return err;

2
tools/perf/util/intel-bts.c
View File

@ -795,7 +795,7 @@ static int intel_bts_synth_events(struct intel_bts *bts,
attr.sample_id_all = evsel->core.attr.sample_id_all; attr.sample_id_all = evsel->core.attr.sample_id_all;
attr.read_format = evsel->core.attr.read_format; attr.read_format = evsel->core.attr.read_format;
id = evsel->id[0] + 1000000000; id = evsel->core.id[0] + 1000000000;
if (!id) if (!id)
id = 1; id = 1;

8
tools/perf/util/intel-pt.c
View File

@ -1705,7 +1705,7 @@ static int intel_pt_synth_pebs_sample(struct intel_pt_queue *ptq)
struct intel_pt *pt = ptq->pt; struct intel_pt *pt = ptq->pt;
struct evsel *evsel = pt->pebs_evsel; struct evsel *evsel = pt->pebs_evsel;
u64 sample_type = evsel->core.attr.sample_type; u64 sample_type = evsel->core.attr.sample_type;
u64 id = evsel->id[0]; u64 id = evsel->core.id[0];
u8 cpumode; u8 cpumode;
if (intel_pt_skip_event(pt)) if (intel_pt_skip_event(pt))
@ -2720,7 +2720,7 @@ static void intel_pt_set_event_name(struct evlist *evlist, u64 id,
struct evsel *evsel; struct evsel *evsel;
evlist__for_each_entry(evlist, evsel) { evlist__for_each_entry(evlist, evsel) {
if (evsel->id && evsel->id[0] == id) { if (evsel->core.id && evsel->core.id[0] == id) {
if (evsel->name) if (evsel->name)
zfree(&evsel->name); zfree(&evsel->name);
evsel->name = strdup(name); evsel->name = strdup(name);
@ -2776,7 +2776,7 @@ static int intel_pt_synth_events(struct intel_pt *pt,
attr.sample_id_all = evsel->core.attr.sample_id_all; attr.sample_id_all = evsel->core.attr.sample_id_all;
attr.read_format = evsel->core.attr.read_format; attr.read_format = evsel->core.attr.read_format;
id = evsel->id[0] + 1000000000; id = evsel->core.id[0] + 1000000000;
if (!id) if (!id)
id = 1; id = 1;
@ -2903,7 +2903,7 @@ static void intel_pt_setup_pebs_events(struct intel_pt *pt)
return; return;
evlist__for_each_entry(pt->session->evlist, evsel) { evlist__for_each_entry(pt->session->evlist, evsel) {
if (evsel->core.attr.aux_output && evsel->id) { if (evsel->core.attr.aux_output && evsel->core.id) {
pt->sample_pebs = true; pt->sample_pebs = true;
pt->pebs_evsel = evsel; pt->pebs_evsel = evsel;
return; return;

12
tools/perf/util/synthetic-events.c
View File

@ -1442,7 +1442,7 @@ int perf_event__synthesize_id_index(struct perf_tool *tool, perf_event__handler_
e = &ev->id_index.entries[i++]; e = &ev->id_index.entries[i++];
e->id = evsel->id[j]; e->id = evsel->core.id[j];
sid = perf_evlist__id2sid(evlist, e->id); sid = perf_evlist__id2sid(evlist, e->id);
if (!sid) { if (!sid) {
@ -1515,7 +1515,7 @@ int perf_event__synthesize_event_update_unit(struct perf_tool *tool, struct evse
struct perf_record_event_update *ev; struct perf_record_event_update *ev;
int err; int err;
ev = event_update_event__new(size + 1, PERF_EVENT_UPDATE__UNIT, evsel->id[0]); ev = event_update_event__new(size + 1, PERF_EVENT_UPDATE__UNIT, evsel->core.id[0]);
if (ev == NULL) if (ev == NULL)
return -ENOMEM; return -ENOMEM;
@ -1532,7 +1532,7 @@ int perf_event__synthesize_event_update_scale(struct perf_tool *tool, struct evs
struct perf_record_event_update_scale *ev_data; struct perf_record_event_update_scale *ev_data;
int err; int err;
ev = event_update_event__new(sizeof(*ev_data), PERF_EVENT_UPDATE__SCALE, evsel->id[0]); ev = event_update_event__new(sizeof(*ev_data), PERF_EVENT_UPDATE__SCALE, evsel->core.id[0]);
if (ev == NULL) if (ev == NULL)
return -ENOMEM; return -ENOMEM;
@ -1550,7 +1550,7 @@ int perf_event__synthesize_event_update_name(struct perf_tool *tool, struct evse
size_t len = strlen(evsel->name); size_t len = strlen(evsel->name);
int err; int err;
ev = event_update_event__new(len + 1, PERF_EVENT_UPDATE__NAME, evsel->id[0]); ev = event_update_event__new(len + 1, PERF_EVENT_UPDATE__NAME, evsel->core.id[0]);
if (ev == NULL) if (ev == NULL)
return -ENOMEM; return -ENOMEM;
@ -1578,7 +1578,7 @@ int perf_event__synthesize_event_update_cpus(struct perf_tool *tool, struct evse
ev->header.type = PERF_RECORD_EVENT_UPDATE; ev->header.type = PERF_RECORD_EVENT_UPDATE;
ev->header.size = (u16)size; ev->header.size = (u16)size;
ev->type = PERF_EVENT_UPDATE__CPUS; ev->type = PERF_EVENT_UPDATE__CPUS;
ev->id = evsel->id[0]; ev->id = evsel->core.id[0];
cpu_map_data__synthesize((struct perf_record_cpu_map_data *)ev->data, cpu_map_data__synthesize((struct perf_record_cpu_map_data *)ev->data,
evsel->core.own_cpus, type, max); evsel->core.own_cpus, type, max);
@ -1596,7 +1596,7 @@ int perf_event__synthesize_attrs(struct perf_tool *tool, struct evlist *evlist,
evlist__for_each_entry(evlist, evsel) { evlist__for_each_entry(evlist, evsel) {
err = perf_event__synthesize_attr(tool, &evsel->core.attr, evsel->ids, err = perf_event__synthesize_attr(tool, &evsel->core.attr, evsel->ids,
evsel->id, process); evsel->core.id, process);
if (err) { if (err) {
pr_debug("failed to create perf header attribute\n"); pr_debug("failed to create perf header attribute\n");
return err; return err;