Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752682AbbHaIas (ORCPT ); Mon, 31 Aug 2015 04:30:48 -0400 Received: from terminus.zytor.com ([198.137.202.10]:37812 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751820AbbHaIaq (ORCPT ); Mon, 31 Aug 2015 04:30:46 -0400 Date: Mon, 31 Aug 2015 01:30:34 -0700 From: tip-bot for Mark Drayton Message-ID: Cc: mbd@fb.com, ak@linux.intel.com, scientist@fb.com, linux-kernel@vger.kernel.org, jolsa@kernel.org, hpa@zytor.com, tglx@linutronix.de, acme@redhat.com, mingo@kernel.org Reply-To: tglx@linutronix.de, mingo@kernel.org, acme@redhat.com, jolsa@kernel.org, hpa@zytor.com, scientist@fb.com, linux-kernel@vger.kernel.org, mbd@fb.com, ak@linux.intel.com In-Reply-To: <1440616695-32340-1-git-send-email-scientist@fb.com> References: <1440616695-32340-1-git-send-email-scientist@fb.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf script: Add --[no-]-demangle/--[no-] -demangle-kernel Git-Commit-ID: 77e0070da41f76e1ebd15291fb0254b0c174adfa 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: 2589 Lines: 64 Commit-ID: 77e0070da41f76e1ebd15291fb0254b0c174adfa Gitweb: http://git.kernel.org/tip/77e0070da41f76e1ebd15291fb0254b0c174adfa Author: Mark Drayton AuthorDate: Wed, 26 Aug 2015 12:18:15 -0700 Committer: Arnaldo Carvalho de Melo CommitDate: Fri, 28 Aug 2015 11:47:40 -0300 perf script: Add --[no-]-demangle/--[no-]-demangle-kernel Sometimes when post-processing output from `perf script` one does not want to demangle C++ symbol names. Add an option to allow this. Also add --[no-]demangle-kernel to be consistent with top/report/probe. Signed-off-by: Mark Drayton Cc: Andi Kleen Cc: Jiri Olsa Link: http://lkml.kernel.org/r/1440616695-32340-1-git-send-email-scientist@fb.com Signed-off-by: Yannick Brosseau Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/Documentation/perf-script.txt | 7 +++++++ tools/perf/builtin-script.c | 5 +++++ 2 files changed, 12 insertions(+) diff --git a/tools/perf/Documentation/perf-script.txt b/tools/perf/Documentation/perf-script.txt index c0d2479..614b2c7 100644 --- a/tools/perf/Documentation/perf-script.txt +++ b/tools/perf/Documentation/perf-script.txt @@ -226,6 +226,13 @@ OPTIONS Display context switch events i.e. events of type PERF_RECORD_SWITCH or PERF_RECORD_SWITCH_CPU_WIDE. +--demangle:: + Demangle symbol names to human readable form. It's enabled by default, + disable with --no-demangle. + +--demangle-kernel:: + Demangle kernel symbol names to human readable form (for C++ kernels). + --header Show perf.data header. diff --git a/tools/perf/builtin-script.c b/tools/perf/builtin-script.c index 105332e..4430340 100644 --- a/tools/perf/builtin-script.c +++ b/tools/perf/builtin-script.c @@ -1671,6 +1671,11 @@ int cmd_script(int argc, const char **argv, const char *prefix __maybe_unused) itrace_parse_synth_opts), OPT_BOOLEAN(0, "full-source-path", &srcline_full_filename, "Show full source file name path for source lines"), + OPT_BOOLEAN(0, "demangle", &symbol_conf.demangle, + "Enable symbol demangling"), + OPT_BOOLEAN(0, "demangle-kernel", &symbol_conf.demangle_kernel, + "Enable kernel symbol demangling"), + OPT_END() }; const char * const script_subcommands[] = { "record", "report", NULL }; -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/