diff options
| author | Jin Yao <yao.jin@linux.intel.com> | 2017-06-08 14:01:44 +0800 |
|---|---|---|
| committer | Willy Tarreau <w@1wt.eu> | 2017-11-02 10:45:58 +0100 |
| commit | c1327b455fda6390d2b1b199ce35b20d2bd3dea8 (patch) | |
| tree | b4acc8c77a4ad91ed7ed71c53580e6030ed24bd4 | |
| parent | 3a7578afc3ad93519ac925f823b541b9490433f5 (diff) | |
| download | linux-c1327b455fda6390d2b1b199ce35b20d2bd3dea8.tar.gz linux-c1327b455fda6390d2b1b199ce35b20d2bd3dea8.zip | |
perf annotate: Fix broken arrow at row 0 connecting jmp instruction to its target
commit 80f62589fa52f530cffc50e78c0b5a2ae572d61e upstream.
When the jump instruction is displayed at the row 0 in annotate view,
the arrow is broken. An example:
16.86 │ ┌──je 82
0.01 │ movsd (%rsp),%xmm0
│ movsd 0x8(%rsp),%xmm4
│ movsd 0x8(%rsp),%xmm1
│ movsd (%rsp),%xmm3
│ divsd %xmm4,%xmm0
│ divsd %xmm3,%xmm1
│ movsd (%rsp),%xmm2
│ addsd %xmm1,%xmm0
│ addsd %xmm2,%xmm0
│ movsd %xmm0,(%rsp)
│82: sub $0x1,%ebx
83.03 │ ↑ jne 38
│ add $0x10,%rsp
│ xor %eax,%eax
│ pop %rbx
│ ← retq
The patch increments the row number before checking with 0.
Signed-off-by: Yao Jin <yao.jin@linux.intel.com>
Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Kan Liang <kan.liang@intel.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: stable@vger.kernel.org
Fixes: 944e1abed9e1 ("perf ui browser: Add method to draw up/down arrow line")
Link: http://lkml.kernel.org/r/1496901704-30275-1-git-send-email-yao.jin@linux.intel.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Willy Tarreau <w@1wt.eu>
| -rw-r--r-- | tools/perf/ui/browser.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/ui/browser.c b/tools/perf/ui/browser.c index bbc782e364b0..9118fb8cc100 100644 --- a/tools/perf/ui/browser.c +++ b/tools/perf/ui/browser.c @@ -672,7 +672,7 @@ static void __ui_browser__line_arrow_down(struct ui_browser *browser, ui_browser__gotorc(browser, row, column + 1); SLsmg_draw_hline(2); - if (row++ == 0) + if (++row == 0) goto out; } else row = 0; |