From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756479AbbEFC7J (ORCPT ); Tue, 5 May 2015 22:59:09 -0400 Received: from terminus.zytor.com ([198.137.202.10]:35597 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755568AbbEFC7H (ORCPT ); Tue, 5 May 2015 22:59:07 -0400 Date: Tue, 5 May 2015 19:58:25 -0700 From: tip-bot for Adrian Hunter Message-ID: Cc: hpa@zytor.com, jolsa@kernel.org, fweisbec@gmail.com, acme@redhat.com, tglx@linutronix.de, namhyung@gmail.com, linux-kernel@vger.kernel.org, dsahern@gmail.com, mingo@kernel.org, eranian@google.com, adrian.hunter@intel.com, peterz@infradead.org Reply-To: dsahern@gmail.com, linux-kernel@vger.kernel.org, tglx@linutronix.de, namhyung@gmail.com, acme@redhat.com, jolsa@kernel.org, fweisbec@gmail.com, hpa@zytor.com, peterz@infradead.org, adrian.hunter@intel.com, eranian@google.com, mingo@kernel.org In-Reply-To: <1428594864-29309-2-git-send-email-adrian.hunter@intel.com> References: <1428594864-29309-2-git-send-email-adrian.hunter@intel.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf header: Add AUX area tracing feature Git-Commit-ID: 4025ea4024c271cc0d993b8641249dce33a63fcc 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: 4025ea4024c271cc0d993b8641249dce33a63fcc Gitweb: http://git.kernel.org/tip/4025ea4024c271cc0d993b8641249dce33a63fcc Author: Adrian Hunter AuthorDate: Thu, 9 Apr 2015 18:53:41 +0300 Committer: Arnaldo Carvalho de Melo CommitDate: Wed, 29 Apr 2015 10:37:49 -0300 perf header: Add AUX area tracing feature Add a feature to indicate that a perf.data file contains AUX area data. Signed-off-by: Adrian Hunter Acked-by: Jiri Olsa Cc: David Ahern Cc: Frederic Weisbecker Cc: Namhyung Kim Cc: Peter Zijlstra Cc: Stephane Eranian Link: http://lkml.kernel.org/r/1428594864-29309-2-git-send-email-adrian.hunter@intel.com Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/header.c | 14 ++++++++++++++ tools/perf/util/header.h | 1 + 2 files changed, 15 insertions(+) diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c index 918fd8a..589c280 100644 --- a/tools/perf/util/header.c +++ b/tools/perf/util/header.c @@ -869,6 +869,13 @@ static int write_branch_stack(int fd __maybe_unused, return 0; } +static int write_auxtrace(int fd __maybe_unused, + struct perf_header *h __maybe_unused, + struct perf_evlist *evlist __maybe_unused) +{ + return 0; +} + static void print_hostname(struct perf_header *ph, int fd __maybe_unused, FILE *fp) { @@ -1151,6 +1158,12 @@ static void print_branch_stack(struct perf_header *ph __maybe_unused, fprintf(fp, "# contains samples with branch stack\n"); } +static void print_auxtrace(struct perf_header *ph __maybe_unused, + int fd __maybe_unused, FILE *fp) +{ + fprintf(fp, "# contains AUX area data (e.g. instruction trace)\n"); +} + static void print_pmu_mappings(struct perf_header *ph, int fd __maybe_unused, FILE *fp) { @@ -1861,6 +1874,7 @@ static const struct feature_ops feat_ops[HEADER_LAST_FEATURE] = { FEAT_OPA(HEADER_BRANCH_STACK, branch_stack), FEAT_OPP(HEADER_PMU_MAPPINGS, pmu_mappings), FEAT_OPP(HEADER_GROUP_DESC, group_desc), + FEAT_OPA(HEADER_AUXTRACE, auxtrace), }; struct header_print_data { diff --git a/tools/perf/util/header.h b/tools/perf/util/header.h index 3bb90ac..d4d5796 100644 --- a/tools/perf/util/header.h +++ b/tools/perf/util/header.h @@ -30,6 +30,7 @@ enum { HEADER_BRANCH_STACK, HEADER_PMU_MAPPINGS, HEADER_GROUP_DESC, + HEADER_AUXTRACE, HEADER_LAST_FEATURE, HEADER_FEAT_BITS = 256, };