diff options
author | Taeung Song <treeze.taeung@gmail.com> | 2016-01-08 03:16:11 -0500 |
---|---|---|
committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2016-01-26 09:52:46 -0500 |
commit | 78ce08dfbd180fb85312ee76e607a6c5fe34a06c (patch) | |
tree | 9cf36114cb46c24f00549b185db1da80ea7ff21b | |
parent | 3379e0c3effa87d7734fc06277a7023292aadb0c (diff) |
perf annotate: Rename 'colors.code' to 'colors.jump_arrows'
USe 'jump_arrows' config name instead of 'code' on 'colors' section.
'colors.code' config is only for jump arrows on assembly code listings
i.e.
│ ┌──jmp 1333
│ │ xchg %ax,%ax
│ │ mov %r15,%r10
│ └─→cmp %r15,%r14
But this config name seems unfit.
'jump_arrows' is more descriptive than 'code'.
Signed-off-by: Taeung Song <treeze.taeung@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Link: http://lkml.kernel.org/r/1452240971-25418-1-git-send-email-treeze.taeung@gmail.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
-rw-r--r-- | tools/perf/Documentation/perf-config.txt | 2 | ||||
-rw-r--r-- | tools/perf/Documentation/perfconfig.example | 2 | ||||
-rw-r--r-- | tools/perf/ui/browser.c | 4 | ||||
-rw-r--r-- | tools/perf/ui/browser.h | 2 | ||||
-rw-r--r-- | tools/perf/ui/browsers/annotate.c | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/tools/perf/Documentation/perf-config.txt b/tools/perf/Documentation/perf-config.txt index b9ca1e304158..1ee488b9aaf7 100644 --- a/tools/perf/Documentation/perf-config.txt +++ b/tools/perf/Documentation/perf-config.txt | |||
@@ -62,7 +62,7 @@ Given a $HOME/.perfconfig like this: | |||
62 | medium = green, default | 62 | medium = green, default |
63 | normal = lightgray, default | 63 | normal = lightgray, default |
64 | selected = white, lightgray | 64 | selected = white, lightgray |
65 | code = blue, default | 65 | jump_arrows = blue, default |
66 | addr = magenta, default | 66 | addr = magenta, default |
67 | root = white, blue | 67 | root = white, blue |
68 | 68 | ||
diff --git a/tools/perf/Documentation/perfconfig.example b/tools/perf/Documentation/perfconfig.example index 767ea2436e1c..1d8d5bc4cd2d 100644 --- a/tools/perf/Documentation/perfconfig.example +++ b/tools/perf/Documentation/perfconfig.example | |||
@@ -5,7 +5,7 @@ | |||
5 | medium = green, lightgray | 5 | medium = green, lightgray |
6 | normal = black, lightgray | 6 | normal = black, lightgray |
7 | selected = lightgray, magenta | 7 | selected = lightgray, magenta |
8 | code = blue, lightgray | 8 | jump_arrows = blue, lightgray |
9 | addr = magenta, lightgray | 9 | addr = magenta, lightgray |
10 | 10 | ||
11 | [tui] | 11 | [tui] |
diff --git a/tools/perf/ui/browser.c b/tools/perf/ui/browser.c index d37202121689..af68a9d488bf 100644 --- a/tools/perf/ui/browser.c +++ b/tools/perf/ui/browser.c | |||
@@ -531,8 +531,8 @@ static struct ui_browser_colorset { | |||
531 | .bg = "yellow", | 531 | .bg = "yellow", |
532 | }, | 532 | }, |
533 | { | 533 | { |
534 | .colorset = HE_COLORSET_CODE, | 534 | .colorset = HE_COLORSET_JUMP_ARROWS, |
535 | .name = "code", | 535 | .name = "jump_arrows", |
536 | .fg = "blue", | 536 | .fg = "blue", |
537 | .bg = "default", | 537 | .bg = "default", |
538 | }, | 538 | }, |
diff --git a/tools/perf/ui/browser.h b/tools/perf/ui/browser.h index 01781de59532..be3b70eb5fca 100644 --- a/tools/perf/ui/browser.h +++ b/tools/perf/ui/browser.h | |||
@@ -7,7 +7,7 @@ | |||
7 | #define HE_COLORSET_MEDIUM 51 | 7 | #define HE_COLORSET_MEDIUM 51 |
8 | #define HE_COLORSET_NORMAL 52 | 8 | #define HE_COLORSET_NORMAL 52 |
9 | #define HE_COLORSET_SELECTED 53 | 9 | #define HE_COLORSET_SELECTED 53 |
10 | #define HE_COLORSET_CODE 54 | 10 | #define HE_COLORSET_JUMP_ARROWS 54 |
11 | #define HE_COLORSET_ADDR 55 | 11 | #define HE_COLORSET_ADDR 55 |
12 | #define HE_COLORSET_ROOT 56 | 12 | #define HE_COLORSET_ROOT 56 |
13 | 13 | ||
diff --git a/tools/perf/ui/browsers/annotate.c b/tools/perf/ui/browsers/annotate.c index 718bd46d47fa..4fc208e82c6f 100644 --- a/tools/perf/ui/browsers/annotate.c +++ b/tools/perf/ui/browsers/annotate.c | |||
@@ -284,7 +284,7 @@ static void annotate_browser__draw_current_jump(struct ui_browser *browser) | |||
284 | to = (u64)btarget->idx; | 284 | to = (u64)btarget->idx; |
285 | } | 285 | } |
286 | 286 | ||
287 | ui_browser__set_color(browser, HE_COLORSET_CODE); | 287 | ui_browser__set_color(browser, HE_COLORSET_JUMP_ARROWS); |
288 | __ui_browser__line_arrow(browser, pcnt_width + 2 + ab->addr_width, | 288 | __ui_browser__line_arrow(browser, pcnt_width + 2 + ab->addr_width, |
289 | from, to); | 289 | from, to); |
290 | } | 290 | } |