perf evlist: Avoid iteration for empty evlist.
Ian Rogers
reviewerPATCH v2 1/1 perf evlist: Avoid iteration for empty evlist.
As seen with 'perf stat --null ..' and reported in:
https://lore.kernel.org/lkml/[email protected]/
v2. Avoids setting evsel in the empty list case as suggested by Jiri
Olsa <[email protected]>.
--- tools/perf/util/evlist.c | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-)
tools/perf/util/evlist.c +17 -11
@@ -346,7 +346,7 @@ struct evlist_cpu_iterator evlist__cpu_begin(struct evlist *evlist, struct affin {struct evlist_cpu_iterator itr = { .container = evlist, - .evsel =evlist__first (evlist), + .evsel =NULL , .cpu_map_idx =0 , .evlist_cpu_map_idx =0 , .evlist_cpu_map_nr =perf_cpu_map__nr (evlist->core.all_cpus),
@@ -354,16 +354,22 @@ struct evlist_cpu_iterator evlist__cpu_begin(struct evlist *evlist, struct affin .affinity = affinity, }; -if (itr.affinity) { - itr.cpu =perf_cpu_map__cpu (evlist->core.all_cpus,0 ); -affinity__set (itr.affinity, itr.cpu.cpu); - itr.cpu_map_idx =perf_cpu_map__idx (itr.evsel->core.cpus, itr.cpu); -/* -* If this CPU isn't in the evsel's cpu map then advance through -* the list. -*/ -if (itr.cpu_map_idx ==-1 ) -evlist_cpu_iterator__next (&itr); +if (evlist__empty (evlist)) { +/* Ensure the empty list doesn't iterate. */ + itr.evlist_cpu_map_idx = itr.evlist_cpu_map_nr; + }else { + itr.evsel =evlist__first (evlist); +if (itr.affinity) { + itr.cpu =perf_cpu_map__cpu (evlist->core.all_cpus,0 ); +affinity__set (itr.affinity, itr.cpu.cpu); + itr.cpu_map_idx =perf_cpu_map__idx (itr.evsel->core.cpus, itr.cpu); +/* +* If this CPU isn't in the evsel's cpu map then advance +* through the list. +*/ +if (itr.cpu_map_idx ==-1 ) +evlist_cpu_iterator__next (&itr); + } }return itr; }
Signature · 1 line
2.35.1.894.gb6a874cedc-goog
Arnaldo Carvalho de Melo
maintainerEm Thu, Mar 17, 2022 at 04:16:43PM -0700, Ian Rogers escreveu:
Quoted 7 lines
As seen with 'perf stat --null ..' and reported in:
https://lore.kernel.org/lkml/[email protected]/v2. Avoids setting evsel in the empty list case as suggested by Jiri
Olsa <[email protected]>.Fixes 472832d2c000 ("perf evlist: Refactor evlist__for_each_cpu()")Signed-off-by Ian Rogers <[email protected]>
Thanks, replaced v1 with this new one.
- Arnaldo
Quoted 52 lines
--- tools/perf/util/evlist.c | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-)tools/perf/util/evlist.c +17
-11@@ -346,7 +346,7 @@ struct evlist_cpu_iterator evlist__cpu_begin(struct evlist *evlist, struct affin {struct evlist_cpu_iterator itr = { .container = evlist, - .evsel =evlist__first (evlist), + .evsel =NULL , .cpu_map_idx =0 , .evlist_cpu_map_idx =0 , .evlist_cpu_map_nr =perf_cpu_map__nr (evlist->core.all_cpus),@@ -354,16 +354,22 @@ struct evlist_cpu_iterator evlist__cpu_begin(struct evlist *evlist, struct affin .affinity = affinity, }; -if (itr.affinity) { - itr.cpu =perf_cpu_map__cpu (evlist->core.all_cpus,0 ); -affinity__set (itr.affinity, itr.cpu.cpu); - itr.cpu_map_idx =perf_cpu_map__idx (itr.evsel->core.cpus, itr.cpu); -/* -* If this CPU isn't in the evsel's cpu map then advance through -* the list. -*/ -if (itr.cpu_map_idx ==-1 ) -evlist_cpu_iterator__next (&itr); +if (evlist__empty (evlist)) { +/* Ensure the empty list doesn't iterate. */ + itr.evlist_cpu_map_idx = itr.evlist_cpu_map_nr; + }else { + itr.evsel =evlist__first (evlist); +if (itr.affinity) { + itr.cpu =perf_cpu_map__cpu (evlist->core.all_cpus,0 ); +affinity__set (itr.affinity, itr.cpu.cpu); + itr.cpu_map_idx =perf_cpu_map__idx (itr.evsel->core.cpus, itr.cpu); +/* +* If this CPU isn't in the evsel's cpu map then advance +* through the list. +*/ +if (itr.cpu_map_idx ==-1 ) +evlist_cpu_iterator__next (&itr); + } }return itr; }Signature · 1 line
2.35.1.894.gb6a874cedc-goog
Signature · 1 line
- Arnaldo
Quoted 7 lines · Ian Rogers
As seen with 'perf stat --null ..' and reported in:
https://lore.kernel.org/lkml/[email protected]/v2. Avoids setting evsel in the empty list case as suggested by Jiri
Olsa <[email protected]>.Fixes 472832d2c000 ("perf evlist: Refactor evlist__for_each_cpu()")Signed-off-by Ian Rogers <[email protected]>
thanks,
jirka
Quoted 53 lines
--- tools/perf/util/evlist.c | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-)tools/perf/util/evlist.c +17
-11@@ -346,7 +346,7 @@ struct evlist_cpu_iterator evlist__cpu_begin(struct evlist *evlist, struct affin {struct evlist_cpu_iterator itr = { .container = evlist, - .evsel =evlist__first (evlist), + .evsel =NULL , .cpu_map_idx =0 , .evlist_cpu_map_idx =0 , .evlist_cpu_map_nr =perf_cpu_map__nr (evlist->core.all_cpus),@@ -354,16 +354,22 @@ struct evlist_cpu_iterator evlist__cpu_begin(struct evlist *evlist, struct affin .affinity = affinity, }; -if (itr.affinity) { - itr.cpu =perf_cpu_map__cpu (evlist->core.all_cpus,0 ); -affinity__set (itr.affinity, itr.cpu.cpu); - itr.cpu_map_idx =perf_cpu_map__idx (itr.evsel->core.cpus, itr.cpu); -/* -* If this CPU isn't in the evsel's cpu map then advance through -* the list. -*/ -if (itr.cpu_map_idx ==-1 ) -evlist_cpu_iterator__next (&itr); +if (evlist__empty (evlist)) { +/* Ensure the empty list doesn't iterate. */ + itr.evlist_cpu_map_idx = itr.evlist_cpu_map_nr; + }else { + itr.evsel =evlist__first (evlist); +if (itr.affinity) { + itr.cpu =perf_cpu_map__cpu (evlist->core.all_cpus,0 ); +affinity__set (itr.affinity, itr.cpu.cpu); + itr.cpu_map_idx =perf_cpu_map__idx (itr.evsel->core.cpus, itr.cpu); +/* +* If this CPU isn't in the evsel's cpu map then advance +* through the list. +*/ +if (itr.cpu_map_idx ==-1 ) +evlist_cpu_iterator__next (&itr); + } }return itr; }Signature · 1 line
2.35.1.894.gb6a874cedc-goog