Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S966062AbdCXStw (ORCPT ); Fri, 24 Mar 2017 14:49:52 -0400 Received: from terminus.zytor.com ([65.50.211.136]:50375 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965837AbdCXStn (ORCPT ); Fri, 24 Mar 2017 14:49:43 -0400 Date: Fri, 24 Mar 2017 11:45:54 -0700 From: tip-bot for Taeung Song Message-ID: Cc: hpa@zytor.com, peterz@infradead.org, mhiramat@kernel.org, namhyung@kernel.org, linux-kernel@vger.kernel.org, mingo@kernel.org, wangnan0@huawei.com, tglx@linutronix.de, acme@redhat.com, treeze.taeung@gmail.com, jolsa@kernel.org Reply-To: hpa@zytor.com, peterz@infradead.org, mhiramat@kernel.org, namhyung@kernel.org, mingo@kernel.org, linux-kernel@vger.kernel.org, wangnan0@huawei.com, tglx@linutronix.de, acme@redhat.com, treeze.taeung@gmail.com, jolsa@kernel.org In-Reply-To: <1489978617-31396-5-git-send-email-treeze.taeung@gmail.com> References: <1489978617-31396-5-git-send-email-treeze.taeung@gmail.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf annotate: More exactly grep -v of the objdump command Git-Commit-ID: e7cb9de211ebb2924d87fdeb77e50d74c2e673d1 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 Content-Length: 2889 Lines: 79 Commit-ID: e7cb9de211ebb2924d87fdeb77e50d74c2e673d1 Gitweb: http://git.kernel.org/tip/e7cb9de211ebb2924d87fdeb77e50d74c2e673d1 Author: Taeung Song AuthorDate: Mon, 20 Mar 2017 11:56:57 +0900 Committer: Arnaldo Carvalho de Melo CommitDate: Tue, 21 Mar 2017 15:42:25 -0300 perf annotate: More exactly grep -v of the objdump command The 'grep -v "filename"' applied to the objdump command output cause a side effect eliminating filename:linenr of output of 'objdump -l' if the object file name and source file name are the same, fix it. E.g. the output of the following objdump command in symbol__disassemble(): $ objdump -l -d -S -C /home/taeung/hello --start-address=... /home/taeung/hello: file format elf64-x86-64 Disassembly of section .text: 0000000000400526

: main(): /home/taeung/hello.c:4 void main() { 400526: 55 push %rbp 400527: 48 89 e5 mov %rsp,%rbp /home/taeung/hello.c:5 ... But it uses grep -v "filename" e.g. "/home/taeung/hello" in the objdump command to remove the first line containing file name and file format ("/home/taeung/hello: file format elf64-x86-64"): Before: $ objdump -l -d -S -C /home/taeung/hello | grep /home/taeung/hello But this causes a side effect, removing filename:linenr too, because the object file and source file have the same name e.g. "/home/taueng/hello", "/home/taeung/hello.c" So more do a better match by using grep -v as below to correctly remove that first line: "/home/taeung/hello: file format elf64-x86-64" After: $ objdump -l -d -S -C /home/taeung/hello | grep /home/taeung/hello: Signed-off-by: Taeung Song Tested-by: Arnaldo Carvalho de Melo Cc: Jiri Olsa Cc: Masami Hiramatsu Cc: Namhyung Kim Cc: Peter Zijlstra Cc: Wang Nan Link: http://lkml.kernel.org/r/1489978617-31396-5-git-send-email-treeze.taeung@gmail.com Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/annotate.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c index 273f21f..4d325cd 100644 --- a/tools/perf/util/annotate.c +++ b/tools/perf/util/annotate.c @@ -1435,7 +1435,7 @@ int symbol__disassemble(struct symbol *sym, struct map *map, const char *arch_na snprintf(command, sizeof(command), "%s %s%s --start-address=0x%016" PRIx64 " --stop-address=0x%016" PRIx64 - " -l -d %s %s -C %s 2>/dev/null|grep -v %s|expand", + " -l -d %s %s -C %s 2>/dev/null|grep -v %s:|expand", objdump_path ? objdump_path : "objdump", disassembler_style ? "-M " : "", disassembler_style ? disassembler_style : "",