From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756847AbbEFDEa (ORCPT ); Tue, 5 May 2015 23:04:30 -0400 Received: from terminus.zytor.com ([198.137.202.10]:35852 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752955AbbEFDE1 (ORCPT ); Tue, 5 May 2015 23:04:27 -0400 Date: Tue, 5 May 2015 20:03:53 -0700 From: tip-bot for Adrian Hunter Message-ID: Cc: eranian@google.com, acme@redhat.com, peterz@infradead.org, namhyung@gmail.com, adrian.hunter@intel.com, mingo@kernel.org, hpa@zytor.com, tglx@linutronix.de, linux-kernel@vger.kernel.org, jolsa@redhat.com, fweisbec@gmail.com, dsahern@gmail.com Reply-To: hpa@zytor.com, linux-kernel@vger.kernel.org, tglx@linutronix.de, fweisbec@gmail.com, jolsa@redhat.com, dsahern@gmail.com, eranian@google.com, peterz@infradead.org, acme@redhat.com, namhyung@gmail.com, adrian.hunter@intel.com, mingo@kernel.org In-Reply-To: <1428594864-29309-27-git-send-email-adrian.hunter@intel.com> References: <1428594864-29309-27-git-send-email-adrian.hunter@intel.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf tools: Add aux_watermark member of struct perf_event_attr Git-Commit-ID: 70d73de4cd571df09670e2a7bf36a912e9ff5138 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: 70d73de4cd571df09670e2a7bf36a912e9ff5138 Gitweb: http://git.kernel.org/tip/70d73de4cd571df09670e2a7bf36a912e9ff5138 Author: Adrian Hunter AuthorDate: Thu, 9 Apr 2015 18:54:06 +0300 Committer: Arnaldo Carvalho de Melo CommitDate: Wed, 29 Apr 2015 10:37:58 -0300 perf tools: Add aux_watermark member of struct perf_event_attr Add new AUX area member (aux_watermark) of struct perf_event_attr to debug prints and byte swapping. Signed-off-by: Adrian Hunter Cc: David Ahern Cc: Frederic Weisbecker Cc: Jiri Olsa Cc: Namhyung Kim Cc: Peter Zijlstra Cc: Stephane Eranian Link: http://lkml.kernel.org/r/1428594864-29309-27-git-send-email-adrian.hunter@intel.com Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/evsel.c | 1 + tools/perf/util/session.c | 1 + 2 files changed, 2 insertions(+) diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c index 33e3fd8..c886b9f 100644 --- a/tools/perf/util/evsel.c +++ b/tools/perf/util/evsel.c @@ -1121,6 +1121,7 @@ int perf_event_attr__fprintf(FILE *fp, struct perf_event_attr *attr, PRINT_ATTRf(sample_stack_user, p_unsigned); PRINT_ATTRf(clockid, p_signed); PRINT_ATTRf(sample_regs_intr, p_hex); + PRINT_ATTRf(aux_watermark, p_unsigned); return ret; } diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c index 1db3ce1..90fa567 100644 --- a/tools/perf/util/session.c +++ b/tools/perf/util/session.c @@ -500,6 +500,7 @@ void perf_event__attr_swap(struct perf_event_attr *attr) attr->branch_sample_type = bswap_64(attr->branch_sample_type); attr->sample_regs_user = bswap_64(attr->sample_regs_user); attr->sample_stack_user = bswap_32(attr->sample_stack_user); + attr->aux_watermark = bswap_32(attr->aux_watermark); swap_bitfield((u8 *) (&attr->read_format + 1), sizeof(u64)); }