Messages in this thread | | | Date | Wed, 27 Nov 2013 11:43:54 +0200 | From | Adrian Hunter <> | Subject | Re: [PATCH] perf util: Join four conditions in two in perf_evlist__create_maps(). |
| |
On 28/11/13 00:23, Dongsheng Yang wrote: > There are four condition branchs in perf_evlist__create_maps, but they > only do two kinds of thing. 1st and 4th call cpu_map__new(), and the others > call cpu_map__dummy_new(). This patch joins them in two branchs, decreasing > the number of branch and removing some duplicated code.
That code has changed again. See:
http://git.kernel.org/cgit/linux/kernel/git/acme/linux.git/log/?h=perf/core
> > Signed-off-by: Dongsheng Yang <yangds.fnst@cn.fujitsu.com> > --- > tools/perf/util/evlist.c | 8 +++----- > 1 file changed, 3 insertions(+), 5 deletions(-) > > diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c > index bbc746a..2258eb4 100644 > --- a/tools/perf/util/evlist.c > +++ b/tools/perf/util/evlist.c > @@ -819,11 +819,9 @@ int perf_evlist__create_maps(struct perf_evlist *evlist, struct target *target) > if (evlist->threads == NULL) > return -1; > > - if (target->force_per_cpu) > - evlist->cpus = cpu_map__new(target->cpu_list); > - else if (target__has_task(target)) > - evlist->cpus = cpu_map__dummy_new(); > - else if (!target__has_cpu(target) && !target->uses_mmap) > + if (!target->force_per_cpu && > + (target__has_task(target) || > + (!target__has_cpu(target) && !target->uses_mmap))) > evlist->cpus = cpu_map__dummy_new(); > else > evlist->cpus = cpu_map__new(target->cpu_list); >
| |