Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S936022AbdGTTNW (ORCPT ); Thu, 20 Jul 2017 15:13:22 -0400 Received: from mail.kernel.org ([198.145.29.99]:50976 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932226AbdGTTNV (ORCPT ); Thu, 20 Jul 2017 15:13:21 -0400 DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 19EDE22B4E Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=acme@kernel.org Date: Thu, 20 Jul 2017 16:13:16 -0300 From: Arnaldo Carvalho de Melo To: Taeung Song Cc: linux-kernel@vger.kernel.org, Namhyung Kim , Jiri Olsa Subject: Re: [PATCH v3 2/9] perf annotate: Properly rename 'sum' to 'total_samples' in struct sym_hist Message-ID: <20170720191316.GC4134@kernel.org> References: <1500500211-16599-1-git-send-email-treeze.taeung@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1500500211-16599-1-git-send-email-treeze.taeung@gmail.com> X-Url: http://acmel.wordpress.com User-Agent: Mutt/1.8.3 (2017-05-23) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 5095 Lines: 131 Em Thu, Jul 20, 2017 at 06:36:51AM +0900, Taeung Song escreveu: > Cc: Namhyung Kim > Cc: Jiri Olsa > Signed-off-by: Taeung Song Better to rename it to symhist->nr_samples, to be consistent with the per address nr_samples, i.e. sym_hist->nr_samples = sum(sym_hist->addr[0 .. symbol__size(sym)]->nr_samples) I'm tentatively doing it here, holler if you guys dislike it... - Arnaldo > --- > tools/perf/ui/gtk/annotate.c | 2 +- > tools/perf/util/annotate.c | 22 +++++++++++----------- > tools/perf/util/annotate.h | 2 +- > 3 files changed, 13 insertions(+), 13 deletions(-) > > diff --git a/tools/perf/ui/gtk/annotate.c b/tools/perf/ui/gtk/annotate.c > index d736fd5..c088abe 100644 > --- a/tools/perf/ui/gtk/annotate.c > +++ b/tools/perf/ui/gtk/annotate.c > @@ -37,7 +37,7 @@ static int perf_gtk__get_percent(char *buf, size_t size, struct symbol *sym, > if (!symbol_conf.event_group && !symhist->addr[dl->offset].nr_samples) > return 0; > > - percent = 100.0 * symhist->addr[dl->offset].nr_samples / symhist->sum; > + percent = 100.0 * symhist->addr[dl->offset].nr_samples / symhist->total_samples; > > markup = perf_gtk__get_percent_color(percent); > if (markup) > diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c > index c382955..a62067a 100644 > --- a/tools/perf/util/annotate.c > +++ b/tools/perf/util/annotate.c > @@ -713,7 +713,7 @@ static int __symbol__inc_addr_samples(struct symbol *sym, struct map *map, > > offset = addr - sym->start; > h = annotation__histogram(notes, evidx); > - h->sum++; > + h->total_samples++; > h->addr[offset].nr_samples++; > > pr_debug3("%#" PRIx64 " %s: period++ [addr: %#" PRIx64 ", %#" PRIx64 > @@ -957,9 +957,9 @@ double disasm__calc_percent(struct annotation *notes, int evidx, s64 offset, > while (offset < end) > hits += h->addr[offset++].nr_samples; > > - if (h->sum) { > + if (h->total_samples) { > sample->nr_samples = hits; > - percent = 100.0 * hits / h->sum; > + percent = 100.0 * hits / h->total_samples; > } > } > > @@ -1672,13 +1672,13 @@ static int symbol__get_source_line(struct symbol *sym, struct map *map, > struct sym_hist *h = annotation__histogram(notes, evidx); > struct rb_root tmp_root = RB_ROOT; > int nr_pcnt = 1; > - u64 h_sum = h->sum; > + u64 h_sum = h->total_samples; > size_t sizeof_src_line = sizeof(struct source_line); > > if (perf_evsel__is_group_event(evsel)) { > for (i = 1; i < evsel->nr_members; i++) { > h = annotation__histogram(notes, evidx + i); > - h_sum += h->sum; > + h_sum += h->total_samples; > } > nr_pcnt = evsel->nr_members; > sizeof_src_line += (nr_pcnt - 1) * sizeof(src_line->samples); > @@ -1704,8 +1704,8 @@ static int symbol__get_source_line(struct symbol *sym, struct map *map, > > h = annotation__histogram(notes, evidx + k); > nr_samples = h->addr[i].nr_samples; > - if (h->sum) > - percent = 100.0 * nr_samples / h->sum; > + if (h->total_samples) > + percent = 100.0 * nr_samples / h->total_samples; > > if (percent > percent_max) > percent_max = percent; > @@ -1777,7 +1777,7 @@ static void symbol__annotate_hits(struct symbol *sym, struct perf_evsel *evsel) > if (h->addr[offset].nr_samples != 0) > printf("%*" PRIx64 ": %" PRIu64 "\n", BITS_PER_LONG / 2, > sym->start + offset, h->addr[offset].nr_samples); > - printf("%*s: %" PRIu64 "\n", BITS_PER_LONG / 2, "h->sum", h->sum); > + printf("%*s: %" PRIu64 "\n", BITS_PER_LONG / 2, "h->total_samples", h->total_samples); > } > > int symbol__annotate_printf(struct symbol *sym, struct map *map, > @@ -1813,7 +1813,7 @@ int symbol__annotate_printf(struct symbol *sym, struct map *map, > width *= evsel->nr_members; > > graph_dotted_len = printf(" %-*.*s| Source code & Disassembly of %s for %s (%" PRIu64 " samples)\n", > - width, width, "Percent", d_filename, evsel_name, h->sum); > + width, width, "Percent", d_filename, evsel_name, h->total_samples); > > printf("%-*.*s----\n", > graph_dotted_len, graph_dotted_len, graph_dotted_line); > @@ -1877,10 +1877,10 @@ void symbol__annotate_decay_histogram(struct symbol *sym, int evidx) > struct sym_hist *h = annotation__histogram(notes, evidx); > int len = symbol__size(sym), offset; > > - h->sum = 0; > + h->total_samples = 0; > for (offset = 0; offset < len; ++offset) { > h->addr[offset].nr_samples = h->addr[offset].nr_samples * 7 / 8; > - h->sum += h->addr[offset].nr_samples; > + h->total_samples += h->addr[offset].nr_samples; > } > } > > diff --git a/tools/perf/util/annotate.h b/tools/perf/util/annotate.h > index 3a17663..bef1d02 100644 > --- a/tools/perf/util/annotate.h > +++ b/tools/perf/util/annotate.h > @@ -87,7 +87,7 @@ double disasm__calc_percent(struct annotation *notes, int evidx, s64 offset, > s64 end, const char **path, struct sym_hist_entry *sample); > > struct sym_hist { > - u64 sum; > + u64 total_samples; > struct sym_hist_entry addr[0]; > }; > > -- > 2.7.4