Skip to contentSkip to conversation

perf annotate browser: Make lines more compact

tip:perf/core tip-bot for Arnaldo Carvalho de Melo 1 participant 1 message Apr 27, 2012 perf events

lore
Share & tools
lore

tip-bot for Arnaldo Carvalho de Melo

author
#0 lore raw
Commit-ID:  8bf39cb81bdad01ad0d830e8c3639b9e8f552d57
Gitweb:     http://git.kernel.org/tip/8bf39cb81bdad01ad0d830e8c3639b9e8f552d57
Author:     Arnaldo Carvalho de Melo <[email protected]>
AuthorDate: Thu, 19 Apr 2012 15:07:46 -0300
Committer:  Arnaldo Carvalho de Melo <[email protected]>
CommitDate: Thu, 19 Apr 2012 17:08:24 -0300

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 <[email protected]>
Cc David Ahern <[email protected]>
Cc Frederic Weisbecker <[email protected]>
Cc Linus Torvalds <[email protected]>
Cc Mike Galbraith <[email protected]>
Cc Namhyung Kim <[email protected]>
Cc Paul Mackerras <[email protected]>
Cc Peter Zijlstra <[email protected]>
Cc Stephane Eranian <[email protected]>
Link http://lkml.kernel.org/n/[email protected] open here
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
---
 tools/perf/ui/browsers/annotate.c |   17 +++++++++--------
 1 files changed, 9 insertions(+), 8 deletions(-)
tools/perf/ui/browsers/annotate.c +9 -8
index c5ab21c..34b86ea 100644
@@ -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;