p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

perf annotate: Add annotation_line__next function 

Rename disasm__get_next_ip_line() to annotation_line__next() to make it
work over a generic struct annotation_line.

Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Cc: Andi Kleen <andi@firstfloor.org>
Cc: David Ahern <dsahern@gmail.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/20171011150158.11895-12-jolsa@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Jiri Olsa 2017-10-11 17:01:34 +02:00 committed by Arnaldo Carvalho de Melo
parent d03a686ea6
commit c4c724364d
3 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tools/perf/ui/browsers/annotate.c
View File

@ -440,7 +440,8 @@ static void annotate_browser__calc_percent(struct annotate_browser *browser,
struct map_symbol *ms = browser->b.priv;
struct symbol *sym = ms->sym;
struct annotation *notes = symbol__annotation(sym);
struct disasm_line *pos, *next;
struct annotation_line *next;
struct disasm_line *pos;
s64 len = symbol__size(sym);
browser->entries = RB_ROOT;
@ -458,7 +459,7 @@ static void annotate_browser__calc_percent(struct annotate_browser *browser,
continue;
}
next = disasm__get_next_ip_line(&notes->src->source, pos);
next = annotation_line__next(&pos->al, &notes->src->source);
for (i = 0; i < browser->nr_events; i++) {
struct sym_hist_entry sample;
@ -466,7 +467,7 @@ static void annotate_browser__calc_percent(struct annotate_browser *browser,
bpos->samples[i].percent = disasm__calc_percent(notes,
evsel->idx + i,
pos->al.offset,
next ? next->al.offset : len,
next ? next->offset : len,
&path, &sample);
bpos->samples[i].he = sample;

13
tools/perf/util/annotate.c
View File

@ -942,10 +942,11 @@ static void disasm__add(struct list_head *head, struct disasm_line *line)
list_add_tail(&line->al.node, head);
}
struct disasm_line *disasm__get_next_ip_line(struct list_head *head, struct disasm_line *pos)
struct annotation_line *
annotation_line__next(struct annotation_line *pos, struct list_head *head)
{
list_for_each_entry_continue(pos, head, al.node)
if (pos->al.offset >= 0)
list_for_each_entry_continue(pos, head, node)
if (pos->offset >= 0)
return pos;
return NULL;
@ -1096,10 +1097,10 @@ static int disasm_line__print(struct disasm_line *dl, struct symbol *sym, u64 st
struct annotation *notes = symbol__annotation(sym);
s64 offset = dl->al.offset;
const u64 addr = start + offset;
struct disasm_line *next;
struct annotation_line *next;
struct block_range *br;
next = disasm__get_next_ip_line(&notes->src->source, dl);
next = annotation_line__next(&dl->al, &notes->src->source);
if (perf_evsel__is_group_event(evsel)) {
nr_percent = evsel->nr_members;
@ -1114,7 +1115,7 @@ static int disasm_line__print(struct disasm_line *dl, struct symbol *sym, u64 st
percent = disasm__calc_percent(notes,
notes->src->lines ? i : evsel->idx + i,
offset,
next ? next->al.offset : (s64) len,
next ? next->offset : (s64) len,
&path, &sample);
ppercents[i] = percent;

3
tools/perf/util/annotate.h
View File

@ -85,7 +85,8 @@ struct sym_hist_entry {
};
void disasm_line__free(struct disasm_line *dl);
struct disasm_line *disasm__get_next_ip_line(struct list_head *head, struct disasm_line *pos);
struct annotation_line *
annotation_line__next(struct annotation_line *pos, struct list_head *head);
int disasm_line__scnprintf(struct disasm_line *dl, char *bf, size_t size, bool raw);
size_t disasm__fprintf(struct list_head *head, FILE *fp);
double disasm__calc_percent(struct annotation *notes, int evidx, s64 offset,