Skip to contentSkip to conversation

perf annotate browser: More clearly separate columns

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

lore
Share & tools
lore
#0 lore raw
Commit-ID:  83b1f2aad46c4af7df5ba6071fbba2d5cb025985
Gitweb:     http://git.kernel.org/tip/83b1f2aad46c4af7df5ba6071fbba2d5cb025985
Author:     Arnaldo Carvalho de Melo <[email protected]>
AuthorDate: Thu, 3 May 2012 13:12:49 -0300
Committer:  Arnaldo Carvalho de Melo <[email protected]>
CommitDate: Thu, 3 May 2012 13:12:49 -0300

perf annotate browser: More clearly separate columns

The first column (columns in the near future) are for the per line event overhead(s), that only appear when they are not zero.

To clearly separate it, add back a solid vertical line, with just one colour, not influenced by the per line overheads.

Then have the addr/offset column, then optionally the dynamic (static in the future) jump->target arrows, if 'j' enables it.

Then the instructions.

Cc David Ahern <[email protected]>
Cc Frederic Weisbecker <[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]>
---
 tools/perf/ui/browser.c           |   14 +++++-----
 tools/perf/ui/browser.h           |    2 +-
 tools/perf/ui/browsers/annotate.c |   48 +++++++++++++++++++++---------------
 3 files changed, 36 insertions(+), 28 deletions(-)
tools/perf/ui/browser.c +7 -7
index b075e09..cde4d0f 100644
@@ -611,7 +611,7 @@ void ui_browser__write_graph(struct ui_browser *browser __used, int graph)
 
 static void __ui_browser__line_arrow_up(struct ui_browser *browser,
 					unsigned int column,
-					u64 start, u64 end, int start_width)
+					u64 start, u64 end)
 {
 	unsigned int row, end_row;
 
@@ -622,7 +622,7 @@ static void __ui_browser__line_arrow_up(struct ui_browser *browser,
 		ui_browser__gotorc(browser, row, column);
 		SLsmg_write_char(SLSMG_LLCORN_CHAR);
 		ui_browser__gotorc(browser, row, column + 1);
-		SLsmg_draw_hline(start_width);
+		SLsmg_draw_hline(2);
 
 		if (row-- == 0)
 			goto out;
@@ -651,7 +651,7 @@ out:
 
 static void __ui_browser__line_arrow_down(struct ui_browser *browser,
 					  unsigned int column,
-					  u64 start, u64 end, int start_width)
+					  u64 start, u64 end)
 {
 	unsigned int row, end_row;
 
@@ -662,7 +662,7 @@ static void __ui_browser__line_arrow_down(struct ui_browser *browser,
 		ui_browser__gotorc(browser, row, column);
 		SLsmg_write_char(SLSMG_ULCORN_CHAR);
 		ui_browser__gotorc(browser, row, column + 1);
-		SLsmg_draw_hline(start_width);
+		SLsmg_draw_hline(2);
 
 		if (row++ == 0)
 			goto out;
@@ -690,12 +690,12 @@ out:
 }
 
 void __ui_browser__line_arrow(struct ui_browser *browser, unsigned int column,
-			      u64 start, u64 end, int start_width)
+			      u64 start, u64 end)
 {
 	if (start > end)
-		__ui_browser__line_arrow_up(browser, column, start, end, start_width);
+		__ui_browser__line_arrow_up(browser, column, start, end);
 	else
-		__ui_browser__line_arrow_down(browser, column, start, end, start_width);
+		__ui_browser__line_arrow_down(browser, column, start, end);
 }
 
 void ui_browser__init(void)
tools/perf/ui/browser.h +1 -1
index 511e24d..dd96d82 100644
@@ -39,7 +39,7 @@ void ui_browser__reset_index(struct ui_browser *self);
 void ui_browser__gotorc(struct ui_browser *self, int y, int x);
 void ui_browser__write_graph(struct ui_browser *browser, int graph);
 void __ui_browser__line_arrow(struct ui_browser *browser, unsigned int column,
-			      u64 start, u64 end, int start_width);
+			      u64 start, u64 end);
 void __ui_browser__show_title(struct ui_browser *browser, const char *title);
 void ui_browser__show_title(struct ui_browser *browser, const char *title);
 int ui_browser__show(struct ui_browser *self, const char *title,
tools/perf/ui/browsers/annotate.c +28 -20

111 lines not on this page · raw message