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

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

Browse Source 
Move 'ids' from 'struct evsel' to libperf's 'struct perf_evsel'.

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-26-jolsa@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Jiri Olsa
2019-09-02 22:15:47 +02:00
committed by Arnaldo Carvalho de Melo
parent deaf321913
commit e7eb9002d4
8 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -19,6 +19,7 @@ struct perf_evsel {
struct xyarray *fd; struct xyarray *fd;
struct xyarray *sample_id; struct xyarray *sample_id;
u64 *id; u64 *id;
u32 ids;
/* parse modifier helper */ /* parse modifier helper */
int nr_members; int nr_members;

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->core.id[evsel->ids++] = id; evsel->core.id[evsel->core.ids++] = id;
} }
int perf_evlist__id_add_fd(struct evlist *evlist, int perf_evlist__id_add_fd(struct evlist *evlist,

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

@@ -1254,7 +1254,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->core.id); zfree(&evsel->core.id);
evsel->ids = 0; evsel->core.ids = 0;
} }
static void perf_evsel__free_config_terms(struct evsel *evsel) static void perf_evsel__free_config_terms(struct evsel *evsel)

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

@@ -119,7 +119,6 @@ struct evsel {
struct perf_counts *counts; struct perf_counts *counts;
struct perf_counts *prev_raw_counts; struct perf_counts *prev_raw_counts;
int idx; int idx;
u32 ids;
unsigned long max_events; unsigned long max_events;
unsigned long nr_events_printed; unsigned long nr_events_printed;
char *name; char *name;

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

@@ -516,7 +516,7 @@ static int write_event_desc(struct feat_fd *ff,
* copy into an nri to be independent of the * copy into an nri to be independent of the
* type of ids, * type of ids,
*/ */
nri = evsel->ids; nri = evsel->core.ids;
ret = do_write(ff, &nri, sizeof(nri)); ret = do_write(ff, &nri, sizeof(nri));
if (ret < 0) if (ret < 0)
return ret; return ret;
@@ -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->core.id, evsel->ids * sizeof(u64)); ret = do_write(ff, evsel->core.id, evsel->core.ids * sizeof(u64));
if (ret < 0) if (ret < 0)
return ret; return ret;
} }
@@ -1656,7 +1656,7 @@ static struct evsel *read_event_desc(struct feat_fd *ff)
id = calloc(nr, sizeof(*id)); id = calloc(nr, sizeof(*id));
if (!id) if (!id)
goto error; goto error;
evsel->ids = nr; evsel->core.ids = nr;
evsel->core.id = id; evsel->core.id = id;
for (j = 0 ; j < nr; j++) { for (j = 0 ; j < nr; j++) {
@@ -1699,9 +1699,9 @@ static void print_event_desc(struct feat_fd *ff, FILE *fp)
for (evsel = events; evsel->core.attr.size; evsel++) { for (evsel = events; evsel->core.attr.size; evsel++) {
fprintf(fp, "# event : name = %s, ", evsel->name); fprintf(fp, "# event : name = %s, ", evsel->name);
if (evsel->ids) { if (evsel->core.ids) {
fprintf(fp, ", id = {"); fprintf(fp, ", id = {");
for (j = 0, id = evsel->core.id; j < evsel->ids; j++, id++) { for (j = 0, id = evsel->core.id; j < evsel->core.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->core.id, evsel->ids * sizeof(u64)); err = do_write(&ff, evsel->core.id, evsel->core.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;
@@ -3082,7 +3082,7 @@ int perf_session__write_header(struct perf_session *session,
.attr = evsel->core.attr, .attr = evsel->core.attr,
.ids = { .ids = {
.offset = evsel->id_offset, .offset = evsel->id_offset,
.size = evsel->ids * sizeof(u64), .size = evsel->core.ids * sizeof(u64),
} }
}; };
err = do_write(&ff, &f_attr, sizeof(f_attr)); err = do_write(&ff, &f_attr, sizeof(f_attr));

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

@@ -768,7 +768,7 @@ static int intel_bts_synth_events(struct intel_bts *bts,
int err; int err;
evlist__for_each_entry(evlist, evsel) { evlist__for_each_entry(evlist, evsel) {
if (evsel->core.attr.type == bts->pmu_type && evsel->ids) { if (evsel->core.attr.type == bts->pmu_type && evsel->core.ids) {
found = true; found = true;
break; break;
} }

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

@@ -2735,7 +2735,7 @@ static struct evsel *intel_pt_evsel(struct intel_pt *pt,
struct evsel *evsel; struct evsel *evsel;
evlist__for_each_entry(evlist, evsel) { evlist__for_each_entry(evlist, evsel) {
if (evsel->core.attr.type == pt->pmu_type && evsel->ids) if (evsel->core.attr.type == pt->pmu_type && evsel->core.ids)
return evsel; return evsel;
} }

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

@@ -1413,7 +1413,7 @@ int perf_event__synthesize_id_index(struct perf_tool *tool, perf_event__handler_
sizeof(struct id_index_entry); sizeof(struct id_index_entry);
evlist__for_each_entry(evlist, evsel) evlist__for_each_entry(evlist, evsel)
nr += evsel->ids; nr += evsel->core.ids;
n = nr > max_nr ? max_nr : nr; n = nr > max_nr ? max_nr : nr;
sz = sizeof(struct perf_record_id_index) + n * sizeof(struct id_index_entry); sz = sizeof(struct perf_record_id_index) + n * sizeof(struct id_index_entry);
@@ -1428,7 +1428,7 @@ int perf_event__synthesize_id_index(struct perf_tool *tool, perf_event__handler_
evlist__for_each_entry(evlist, evsel) { evlist__for_each_entry(evlist, evsel) {
u32 j; u32 j;
for (j = 0; j < evsel->ids; j++) { for (j = 0; j < evsel->core.ids; j++) {
struct id_index_entry *e; struct id_index_entry *e;
struct perf_sample_id *sid; struct perf_sample_id *sid;
@@ -1595,7 +1595,7 @@ int perf_event__synthesize_attrs(struct perf_tool *tool, struct evlist *evlist,
int err = 0; int err = 0;
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->core.ids,
evsel->core.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");