lkml.org 
[lkml]   [2013]   [Mar]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 04/12] perf annotate: Cleanup disasm__calc_percent()
Date
From: Namhyung Kim <namhyung.kim@lge.com>

The loop end condition is calculated from next disasm_line or the
symbol size if it's the last disasm_line. But it doesn't need to be
calculated at every iteration. Moving it out of the function can
simplify code a bit. Also the src_line doesn't need to be checked in
every time.

Signed-off-by: Namhyung Kim <namhyung@kernel.org>
---
tools/perf/util/annotate.c | 30 +++++++++++++++---------------
1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c
index a91d7b186081..ae71325d3dc7 100644
--- a/tools/perf/util/annotate.c
+++ b/tools/perf/util/annotate.c
@@ -603,29 +603,28 @@ struct disasm_line *disasm__get_next_ip_line(struct list_head *head, struct disa
return NULL;
}

-static double disasm__calc_percent(struct disasm_line *next,
- struct annotation *notes, int evidx,
- s64 offset, u64 len, const char **path)
+static double disasm__calc_percent(struct annotation *notes, int evidx,
+ s64 offset, s64 end, const char **path)
{
struct source_line *src_line = notes->src->lines;
struct sym_hist *h = annotation__histogram(notes, evidx);
unsigned int hits = 0;
double percent = 0.0;

- while (offset < (s64)len &&
- (next == NULL || offset < next->offset)) {
- if (src_line) {
+ if (src_line) {
+ while (offset < end) {
if (*path == NULL)
*path = src_line[offset].path;
- percent += src_line[offset].percent;
- } else
- hits += h->addr[offset];

- ++offset;
- }
+ percent += src_line[offset++].percent;
+ }
+ } else {
+ while (offset < end)
+ hits += h->addr[offset++];

- if (src_line == NULL && h->sum)
- percent = 100.0 * hits / h->sum;
+ if (h->sum)
+ percent = 100.0 * hits / h->sum;
+ }

return percent;
}
@@ -648,8 +647,9 @@ static int disasm_line__print(struct disasm_line *dl, struct symbol *sym, u64 st

next = disasm__get_next_ip_line(&notes->src->source, dl);

- percent = disasm__calc_percent(next, notes, evsel->idx,
- offset, len, &path);
+ percent = disasm__calc_percent(notes, evsel->idx, offset,
+ next ? next->offset : (s64) len,
+ &path);
if (percent < min_pcnt)
return -1;

--
1.7.11.7


\
 
 \ /
  Last update: 2013-03-05 07:41    [W:0.201 / U:0.024 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site