|
@@ -106,12 +106,24 @@ void perf_evlist__add_pollfd(struct perf_evlist *evlist, int fd)
|
|
|
evlist->nr_fds++;
|
|
|
}
|
|
|
|
|
|
-static int perf_evlist__id_hash(struct perf_evlist *evlist, struct perf_evsel *evsel,
|
|
|
- int cpu, int thread, int fd)
|
|
|
+void perf_evlist__id_hash(struct perf_evlist *evlist, struct perf_evsel *evsel,
|
|
|
+ int cpu, int thread, u64 id)
|
|
|
+{
|
|
|
+ int hash;
|
|
|
+ struct perf_sample_id *sid = SID(evsel, cpu, thread);
|
|
|
+
|
|
|
+ sid->id = id;
|
|
|
+ sid->evsel = evsel;
|
|
|
+ hash = hash_64(sid->id, PERF_EVLIST__HLIST_BITS);
|
|
|
+ hlist_add_head(&sid->node, &evlist->heads[hash]);
|
|
|
+}
|
|
|
+
|
|
|
+static int perf_evlist__id_hash_fd(struct perf_evlist *evlist,
|
|
|
+ struct perf_evsel *evsel,
|
|
|
+ int cpu, int thread, int fd)
|
|
|
{
|
|
|
- struct perf_sample_id *sid;
|
|
|
u64 read_data[4] = { 0, };
|
|
|
- int hash, id_idx = 1; /* The first entry is the counter value */
|
|
|
+ int id_idx = 1; /* The first entry is the counter value */
|
|
|
|
|
|
if (!(evsel->attr.read_format & PERF_FORMAT_ID) ||
|
|
|
read(fd, &read_data, sizeof(read_data)) == -1)
|
|
@@ -122,11 +134,7 @@ static int perf_evlist__id_hash(struct perf_evlist *evlist, struct perf_evsel *e
|
|
|
if (evsel->attr.read_format & PERF_FORMAT_TOTAL_TIME_RUNNING)
|
|
|
++id_idx;
|
|
|
|
|
|
- sid = SID(evsel, cpu, thread);
|
|
|
- sid->id = read_data[id_idx];
|
|
|
- sid->evsel = evsel;
|
|
|
- hash = hash_64(sid->id, PERF_EVLIST__HLIST_BITS);
|
|
|
- hlist_add_head(&sid->node, &evlist->heads[hash]);
|
|
|
+ perf_evlist__id_hash(evlist, evsel, cpu, thread, read_data[id_idx]);
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
@@ -300,7 +308,7 @@ int perf_evlist__mmap(struct perf_evlist *evlist, int pages, bool overwrite)
|
|
|
goto out_unmap;
|
|
|
|
|
|
if ((evsel->attr.read_format & PERF_FORMAT_ID) &&
|
|
|
- perf_evlist__id_hash(evlist, evsel, cpu, thread, fd) < 0)
|
|
|
+ perf_evlist__id_hash_fd(evlist, evsel, cpu, thread, fd) < 0)
|
|
|
goto out_unmap;
|
|
|
}
|
|
|
}
|