perf annotate browser: Make lines more compact

But now we have a lot of space on the right...

Perhaps we should add a "Trending on G+" gizmo... ;-)

Requested-by: Linus Torvalds <torvalds@linux-foundation.org>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Namhyung Kim <namhyung@gmail.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/n/tip-igoynvtg2wc6mdfinc69prp6@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/ui/browsers/annotate.c b/tools/perf/ui/browsers/annotate.c
index c5ab21c50a74a4cf3110aad79a57612ec5e93be7..34b86ea3e54d5d8727a1068f0ee5398286c0b46d 100644 (file)
--- a/tools/perf/ui/browsers/annotate.c
+++ b/tools/perf/ui/browsers/annotate.c
@@ -82,11 +82,11 @@ static void annotate_browser__write(struct ui_browser *self, void *entry, int ro
                ui_browser__set_color(self, HE_COLORSET_CODE);
 
        if (!*dl->line)
-               slsmg_write_nstring(" ", width - 18);
+               slsmg_write_nstring(" ", width - 10);
        else if (dl->offset == -1)
-               slsmg_write_nstring(dl->line, width - 18);
+               slsmg_write_nstring(dl->line, width - 10);
        else {
-               char bf[256], *line = dl->line;
+               char bf[256];
                u64 addr = dl->offset;
                int printed, color = -1;
 
@@ -114,12 +114,12 @@ static void annotate_browser__write(struct ui_browser *self, void *entry, int ro
                        dl->ins->ops->scnprintf(dl->ins, bf, sizeof(bf),
                                                !ab->use_offset ? dl->operands : NULL,
                                                dl->target);
-                       line = bf;
-                       slsmg_write_nstring(" ", 7);
-                       printed += 7;
-               }
+                       slsmg_write_nstring(" ", 2);
+                       printed += 2;
+               } else
+                       scnprintf(bf, sizeof(bf), "  %-6.6s %s", dl->name, dl->operands);
 
-               slsmg_write_nstring(line, width - 18 - printed);
+               slsmg_write_nstring(bf, width - 10 - printed);
        }
 
        if (current_entry)
@@ -653,6 +653,7 @@ int symbol__tui_annotate(struct symbol *sym, struct map *map, int evidx,
                        .priv    = &ms,
                        .use_navkeypressed = true,
                },
+               .use_offset = true,
        };
        int ret = -1;