From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755574AbdGKIy2 (ORCPT ); Tue, 11 Jul 2017 04:54:28 -0400 Received: from terminus.zytor.com ([65.50.211.136]:52333 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755245AbdGKIy0 (ORCPT ); Tue, 11 Jul 2017 04:54:26 -0400 Date: Tue, 11 Jul 2017 01:50:06 -0700 From: tip-bot for Jin Yao Message-ID: Cc: tglx@linutronix.de, acme@redhat.com, mingo@kernel.org, peterz@infradead.org, alexander.shishkin@linux.intel.com, linux-kernel@vger.kernel.org, yao.jin@linux.intel.com, ak@linux.intel.com, hpa@zytor.com, kan.liang@intel.com, jolsa@kernel.org Reply-To: kan.liang@intel.com, jolsa@kernel.org, peterz@infradead.org, linux-kernel@vger.kernel.org, alexander.shishkin@linux.intel.com, yao.jin@linux.intel.com, ak@linux.intel.com, hpa@zytor.com, mingo@kernel.org, tglx@linutronix.de, acme@redhat.com In-Reply-To: <1496901704-30275-1-git-send-email-yao.jin@linux.intel.com> References: <1496901704-30275-1-git-send-email-yao.jin@linux.intel.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/urgent] perf annotate: Fix broken arrow at row 0 connecting jmp instruction to its target Git-Commit-ID: 80f62589fa52f530cffc50e78c0b5a2ae572d61e X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 80f62589fa52f530cffc50e78c0b5a2ae572d61e Gitweb: http://git.kernel.org/tip/80f62589fa52f530cffc50e78c0b5a2ae572d61e Author: Jin Yao AuthorDate: Thu, 8 Jun 2017 14:01:44 +0800 Committer: Arnaldo Carvalho de Melo CommitDate: Mon, 10 Jul 2017 16:36:40 -0300 perf annotate: Fix broken arrow at row 0 connecting jmp instruction to its target 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 Tested-by: Arnaldo Carvalho de Melo Cc: Alexander Shishkin Cc: Andi Kleen Cc: Jiri Olsa Cc: Kan Liang Cc: Peter Zijlstra 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 --- tools/perf/ui/browser.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/perf/ui/browser.c b/tools/perf/ui/browser.c index a4d3762..83874b0 100644 --- a/tools/perf/ui/browser.c +++ b/tools/perf/ui/browser.c @@ -704,7 +704,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;