Move ids from struct evsel to libperf's struct perf_evsel.
Link: http://lkml.kernel.org/n/tip-oaox9ryle29sepvxaur57...@git.kernel.org
Signed-off-by: Jiri Olsa <jo...@kernel.org>
---
tools/perf/lib/include/internal/evsel.h | 1 +
tools/perf/util/evlist.c | 2 +-
tools/perf/util/evsel.c | 2 +-
tools/perf/util/evsel.h | 1 -
tools/perf/util/header.c | 16 ++++++++--------
tools/perf/util/intel-bts.c | 2 +-
tools/perf/util/intel-pt.c | 2 +-
tools/perf/util/session.c | 4 ++--
8 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/tools/perf/lib/include/internal/evsel.h
b/tools/perf/lib/include/internal/evsel.h
index bea14e6e28f5..0b04065cae8e 100644
--- a/tools/perf/lib/include/internal/evsel.h
+++ b/tools/perf/lib/include/internal/evsel.h
@@ -17,6 +17,7 @@ struct perf_evsel {
struct xyarray *fd;
struct xyarray *sample_id;
u64 *id;
+ u32 ids;
/* parse modifier helper */
int nr_members;
diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c
index ae7f62ae1d29..9dcecb5e05a0 100644
--- a/tools/perf/util/evlist.c
+++ b/tools/perf/util/evlist.c
@@ -481,7 +481,7 @@ void perf_evlist__id_add(struct evlist *evlist, struct
evsel *evsel,
int cpu, int thread, u64 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,
diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c
index 194bead17f64..7501b4403b7f 100644
--- a/tools/perf/util/evsel.c
+++ b/tools/perf/util/evsel.c
@@ -1253,7 +1253,7 @@ static void perf_evsel__free_id(struct evsel *evsel)
xyarray__delete(evsel->core.sample_id);
evsel->core.sample_id = NULL;
zfree(&evsel->core.id);
- evsel->ids = 0;
+ evsel->core.ids = 0;
}
static void perf_evsel__free_config_terms(struct evsel *evsel)
diff --git a/tools/perf/util/evsel.h b/tools/perf/util/evsel.h
index f313e07925c4..765f722fc128 100644
--- a/tools/perf/util/evsel.h
+++ b/tools/perf/util/evsel.h
@@ -120,7 +120,6 @@ struct evsel {
struct perf_counts *counts;
struct perf_counts *prev_raw_counts;
int idx;
- u32 ids;
unsigned long max_events;
unsigned long nr_events_printed;
char *name;
diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c
index ebdabaa33d8b..360fc61c5754 100644
--- a/tools/perf/util/header.c
+++ b/tools/perf/util/header.c
@@ -524,7 +524,7 @@ static int write_event_desc(struct feat_fd *ff,
* copy into an nri to be independent of the
* type of ids,
*/
- nri = evsel->ids;
+ nri = evsel->core.ids;
ret = do_write(ff, &nri, sizeof(nri));
if (ret < 0)
return ret;
@@ -538,7 +538,7 @@ static int write_event_desc(struct feat_fd *ff,
/*
* 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)
return ret;
}
@@ -1664,7 +1664,7 @@ static struct evsel *read_event_desc(struct feat_fd *ff)
id = calloc(nr, sizeof(*id));
if (!id)
goto error;
- evsel->ids = nr;
+ evsel->core.ids = nr;
evsel->core.id = id;
for (j = 0 ; j < nr; j++) {
@@ -1707,9 +1707,9 @@ static void print_event_desc(struct feat_fd *ff, FILE *fp)
for (evsel = events; evsel->core.attr.size; evsel++) {
fprintf(fp, "# event : name = %s, ", evsel->name);
- if (evsel->ids) {
+ if (evsel->core.ids) {
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)
fputc(',', fp);
fprintf(fp, " %"PRIu64, *id);
@@ -3083,7 +3083,7 @@ int perf_session__write_header(struct perf_session
*session,
evlist__for_each_entry(session->evlist, evsel) {
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) {
pr_debug("failed to write perf header\n");
return err;
@@ -3097,7 +3097,7 @@ int perf_session__write_header(struct perf_session
*session,
.attr = evsel->core.attr,
.ids = {
.offset = evsel->id_offset,
- .size = evsel->ids * sizeof(u64),
+ .size = evsel->core.ids * sizeof(u64),
}
};
err = do_write(&ff, &f_attr, sizeof(f_attr));
@@ -3951,7 +3951,7 @@ int perf_event__synthesize_attrs(struct perf_tool *tool,
int err = 0;
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);
if (err) {
pr_debug("failed to create perf header attribute\n");
diff --git a/tools/perf/util/intel-bts.c b/tools/perf/util/intel-bts.c
index daf42915b326..e49d38b21909 100644
--- a/tools/perf/util/intel-bts.c
+++ b/tools/perf/util/intel-bts.c
@@ -768,7 +768,7 @@ static int intel_bts_synth_events(struct intel_bts *bts,
int err;
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;
break;
}
diff --git a/tools/perf/util/intel-pt.c b/tools/perf/util/intel-pt.c
index 4a1d46158401..b08d80adfa32 100644
--- a/tools/perf/util/intel-pt.c
+++ b/tools/perf/util/intel-pt.c
@@ -2734,7 +2734,7 @@ static struct evsel *intel_pt_evsel(struct intel_pt *pt,
struct evsel *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;
}
diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c
index f50cd54cf96b..32226e71949e 100644
--- a/tools/perf/util/session.c
+++ b/tools/perf/util/session.c
@@ -2429,7 +2429,7 @@ int perf_event__synthesize_id_index(struct perf_tool
*tool,
sizeof(struct id_index_entry);
evlist__for_each_entry(evlist, evsel)
- nr += evsel->ids;
+ nr += evsel->core.ids;
n = nr > max_nr ? max_nr : nr;
sz = sizeof(struct perf_record_id_index) + n * sizeof(struct
id_index_entry);
@@ -2444,7 +2444,7 @@ int perf_event__synthesize_id_index(struct perf_tool
*tool,
evlist__for_each_entry(evlist, evsel) {
u32 j;
- for (j = 0; j < evsel->ids; j++) {
+ for (j = 0; j < evsel->core.ids; j++) {
struct id_index_entry *e;
struct perf_sample_id *sid;
--
2.21.0
