|
@@ -1261,15 +1261,42 @@ void perf_counts_values__scale(struct perf_counts_values *count,
|
|
*pscaled = scaled;
|
|
*pscaled = scaled;
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+static int perf_evsel__read_size(struct perf_evsel *evsel)
|
|
|
|
+{
|
|
|
|
+ u64 read_format = evsel->attr.read_format;
|
|
|
|
+ int entry = sizeof(u64); /* value */
|
|
|
|
+ int size = 0;
|
|
|
|
+ int nr = 1;
|
|
|
|
+
|
|
|
|
+ if (read_format & PERF_FORMAT_TOTAL_TIME_ENABLED)
|
|
|
|
+ size += sizeof(u64);
|
|
|
|
+
|
|
|
|
+ if (read_format & PERF_FORMAT_TOTAL_TIME_RUNNING)
|
|
|
|
+ size += sizeof(u64);
|
|
|
|
+
|
|
|
|
+ if (read_format & PERF_FORMAT_ID)
|
|
|
|
+ entry += sizeof(u64);
|
|
|
|
+
|
|
|
|
+ if (read_format & PERF_FORMAT_GROUP) {
|
|
|
|
+ nr = evsel->nr_members;
|
|
|
|
+ size += sizeof(u64);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ size += entry * nr;
|
|
|
|
+ return size;
|
|
|
|
+}
|
|
|
|
+
|
|
int perf_evsel__read(struct perf_evsel *evsel, int cpu, int thread,
|
|
int perf_evsel__read(struct perf_evsel *evsel, int cpu, int thread,
|
|
struct perf_counts_values *count)
|
|
struct perf_counts_values *count)
|
|
{
|
|
{
|
|
|
|
+ size_t size = perf_evsel__read_size(evsel);
|
|
|
|
+
|
|
memset(count, 0, sizeof(*count));
|
|
memset(count, 0, sizeof(*count));
|
|
|
|
|
|
if (FD(evsel, cpu, thread) < 0)
|
|
if (FD(evsel, cpu, thread) < 0)
|
|
return -EINVAL;
|
|
return -EINVAL;
|
|
|
|
|
|
- if (readn(FD(evsel, cpu, thread), count, sizeof(*count)) <= 0)
|
|
|
|
|
|
+ if (readn(FD(evsel, cpu, thread), count->values, size) <= 0)
|
|
return -errno;
|
|
return -errno;
|
|
|
|
|
|
return 0;
|
|
return 0;
|