projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
86f5fe0
)
perf evsel: Fix up leftover perf_evsel_stat usage via evsel->priv
author
Arnaldo Carvalho de Melo
<
[email protected]
>
Thu, 9 Nov 2017 15:03:40 +0000
(12:03 -0300)
committer
Arnaldo Carvalho de Melo
<
[email protected]
>
Thu, 16 Nov 2017 17:49:53 +0000
(14:49 -0300)
I forgot one conversion, which got noticed by Thomas when running:
$ perf stat -e '{cpu-clock,instructions}' kill
kill: not enough arguments
Segmentation fault (core dumped)
$
Fix it, those stats are in evsel->stats, not anymore in evsel->priv.
Reported-by: Thomas-Mich Richter <
[email protected]
>
Tested-by: Thomas-Mich Richter <
[email protected]
>
Cc: Adrian Hunter <
[email protected]
>
Cc: Andi Kleen <
[email protected]
>
Cc: David Ahern <
[email protected]
>
Cc: Hendrik Brueckner <
[email protected]
>
Cc: Jiri Olsa <
[email protected]
>
Cc: Namhyung Kim <
[email protected]
>
Cc: Wang Nan <
[email protected]
>
Fixes: e669e833da8d ("perf evsel: Restore evsel->priv as a tool private area")
Link:
http://lkml.kernel.org/r/
[email protected]
Signed-off-by: Arnaldo Carvalho de Melo <
[email protected]
>
tools/perf/util/evsel.c
patch
|
blob
|
history
diff --git
a/tools/perf/util/evsel.c
b/tools/perf/util/evsel.c
index 4376cdfaea499847516852bcc3940846d168f687..cb9bcdb065ea8a499402e59f1300d70370fce765 100644
(file)
--- a/
tools/perf/util/evsel.c
+++ b/
tools/perf/util/evsel.c
@@
-1377,7
+1377,7
@@
perf_evsel__process_group_data(struct perf_evsel *leader,
static int
perf_evsel__read_group(struct perf_evsel *leader, int cpu, int thread)
{
- struct perf_stat_evsel *ps = leader->
priv
;
+ struct perf_stat_evsel *ps = leader->
stats
;
u64 read_format = leader->attr.read_format;
int size = perf_evsel__read_size(leader);
u64 *data = ps->group_data;