perf evsel: Fix up leftover perf_evsel_stat usage via evsel->priv
A message that is not in the archive (sent off-list or not yet received): [email protected]
tip-bot for Arnaldo Carvalho de Melo
merge botCommit-ID: 82806c3aae7496d6974429f3bd43ebeeef18b9b2 Gitweb: https://git.kernel.org/tip/82806c3aae7496d6974429f3bd43ebeeef18b9b2 Author: Arnaldo Carvalho de Melo <[email protected]> AuthorDate: Thu, 9 Nov 2017 12:03:40 -0300 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Thu, 16 Nov 2017 14:49:53 -0300
perf evsel: Fix up leftover perf_evsel_stat usage via evsel->priv
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")
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
--- tools/perf/util/evsel.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/util/evsel.c +1 -1
@@ -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;
tip-bot for Arnaldo Carvalho de Melo
merge botperf evsel: Fix up leftover perf_evsel_stat usage via evsel->priv
Commit-ID: 8e2d8e204247aa9eeb87893f6b8bf0cf29428b31 Gitweb: https://git.kernel.org/tip/8e2d8e204247aa9eeb87893f6b8bf0cf29428b31 Author: Arnaldo Carvalho de Melo <[email protected]> AuthorDate: Thu, 9 Nov 2017 12:03:40 -0300 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Tue, 28 Nov 2017 14:20:32 -0300
perf evsel: Fix up leftover perf_evsel_stat usage via evsel->priv
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")
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
--- tools/perf/util/evsel.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/util/evsel.c +1 -1
@@ -1375,7 +1375,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;