perf annotate: Add annotation_line__print function

Separating struct annotation_line display function, it will hold the
generic line display code.

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-24-jolsa@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c
index 29cf2a5..5c6f739 100644 (file)
--- a/tools/perf/util/annotate.c
+++ b/tools/perf/util/annotate.c
@@ -1189,6 +1189,18 @@ static int disasm_line__print(struct disasm_line *dl, struct symbol *sym, u64 st
        return 0;
 }
 
+static int
+annotation_line__print(struct annotation_line *al, struct symbol *sym, u64 start,
+                      struct perf_evsel *evsel, u64 len, int min_pcnt, int printed,
+                      int max_lines, struct annotation_line *aq)
+{
+       struct disasm_line *dl    = container_of(al, struct disasm_line, al);
+       struct disasm_line *queue = container_of(aq, struct disasm_line, al);
+
+       return disasm_line__print(dl, sym, start, evsel, len, min_pcnt, printed,
+                                 max_lines, queue);
+}
+
 /*
  * symbol__parse_objdump_line() parses objdump output (with -d --no-show-raw)
  * which looks like following
@@ -1797,7 +1809,7 @@ int symbol__annotate_printf(struct symbol *sym, struct map *map,
        const char *evsel_name = perf_evsel__name(evsel);
        struct annotation *notes = symbol__annotation(sym);
        struct sym_hist *h = annotation__histogram(notes, evsel->idx);
-       struct disasm_line *pos, *queue = NULL;
+       struct annotation_line *pos, *queue = NULL;
        u64 start = map__rip_2objdump(map, sym->start);
        int printed = 2, queue_len = 0;
        int more = 0;
@@ -1830,15 +1842,19 @@ int symbol__annotate_printf(struct symbol *sym, struct map *map,
        if (verbose > 0)
                symbol__annotate_hits(sym, evsel);
 
-       list_for_each_entry(pos, &notes->src->source, al.node) {
+       list_for_each_entry(pos, &notes->src->source, node) {
+               int err;
+
                if (context && queue == NULL) {
                        queue = pos;
                        queue_len = 0;
                }
 
-               switch (disasm_line__print(pos, sym, start, evsel, len,
-                                           min_pcnt, printed, max_lines,
-                                           queue)) {
+               err = annotation_line__print(pos, sym, start, evsel, len,
+                                            min_pcnt, printed, max_lines,
+                                            queue);
+
+               switch (err) {
                case 0:
                        ++printed;
                        if (context) {
@@ -1860,7 +1876,7 @@ int symbol__annotate_printf(struct symbol *sym, struct map *map,
                        if (!context)
                                break;
                        if (queue_len == context)
-                               queue = list_entry(queue->al.node.next, typeof(*queue), al.node);
+                               queue = list_entry(queue->node.next, typeof(*queue), node);
                        else
                                ++queue_len;
                        break;