perf annotate: Cleanup disasm__calc_percent()
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> Cc: Andi Kleen <andi@firstfloor.org> Cc: Ingo Molnar <mingo@kernel.org> Cc: Jiri Olsa <jolsa@redhat.com> Cc: Paul Mackerras <paulus@samba.org> Cc: Pekka Enberg <penberg@kernel.org> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> Link: http://lkml.kernel.org/r/1362462812-30885-5-git-send-email-namhyung@kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
parent
e5ccf9f45d
commit
bd64fcb880
|
@ -603,30 +603,29 @@ struct disasm_line *disasm__get_next_ip_line(struct list_head *head, struct disa
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
static double disasm__calc_percent(struct disasm_line *next,
|
static double disasm__calc_percent(struct annotation *notes, int evidx,
|
||||||
struct annotation *notes, int evidx,
|
s64 offset, s64 end, const char **path)
|
||||||
s64 offset, u64 len, const char **path)
|
|
||||||
{
|
{
|
||||||
struct source_line *src_line = notes->src->lines;
|
struct source_line *src_line = notes->src->lines;
|
||||||
struct sym_hist *h = annotation__histogram(notes, evidx);
|
struct sym_hist *h = annotation__histogram(notes, evidx);
|
||||||
unsigned int hits = 0;
|
unsigned int hits = 0;
|
||||||
double percent = 0.0;
|
double percent = 0.0;
|
||||||
|
|
||||||
while (offset < (s64)len &&
|
if (src_line) {
|
||||||
(next == NULL || offset < next->offset)) {
|
while (offset < end) {
|
||||||
if (src_line) {
|
|
||||||
if (*path == NULL)
|
if (*path == NULL)
|
||||||
*path = src_line[offset].path;
|
*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 (h->sum)
|
||||||
|
percent = 100.0 * hits / h->sum;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (src_line == NULL && h->sum)
|
|
||||||
percent = 100.0 * hits / h->sum;
|
|
||||||
|
|
||||||
return percent;
|
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(¬es->src->source, dl);
|
next = disasm__get_next_ip_line(¬es->src->source, dl);
|
||||||
|
|
||||||
percent = disasm__calc_percent(next, notes, evsel->idx,
|
percent = disasm__calc_percent(notes, evsel->idx, offset,
|
||||||
offset, len, &path);
|
next ? next->offset : (s64) len,
|
||||||
|
&path);
|
||||||
if (percent < min_pcnt)
|
if (percent < min_pcnt)
|
||||||
return -1;
|
return -1;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue