From: acme@kernel.org (Arnaldo Carvalho de Melo)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH V5 24/26] perf tools: adding perf_session to *info_prive_size()
Date: Mon, 30 Nov 2015 13:15:06 -0300 [thread overview]
Message-ID: <20151130161505.GQ5934@kernel.org> (raw)
In-Reply-To: <1448849687-5724-25-git-send-email-mathieu.poirier@linaro.org>
Em Sun, Nov 29, 2015 at 07:14:45PM -0700, Mathieu Poirier escreveu:
> On some architecture the size of the private header may
> be dependent on the number of tracers used in the session. As
> such adding a "struct perf_session" parameter, which should
So you don't need struct perf_session, from what I saw in your patches,
please pass struct perf_evlist instead, i.e. session->evlist.
struct perf_session may not be used by some tools, so far it is just
when you have a perf.data file that it is used.
- Arnaldo
> contain all the required information.
>
> Also adjusting the existing client of the interface to take
> the new parameter into account.
>
> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
> Cc: Ingo Molnar <mingo@redhat.com>
> Cc: Arnaldo Carvalho de Melo <acme@kernel.org>
> Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
> ---
> tools/perf/arch/x86/util/intel-bts.c | 4 +++-
> tools/perf/arch/x86/util/intel-pt.c | 4 +++-
> tools/perf/util/auxtrace.c | 7 ++++---
> tools/perf/util/auxtrace.h | 6 ++++--
> 4 files changed, 14 insertions(+), 7 deletions(-)
>
> diff --git a/tools/perf/arch/x86/util/intel-bts.c b/tools/perf/arch/x86/util/intel-bts.c
> index 9b94ce520917..6efdc5e86d97 100644
> --- a/tools/perf/arch/x86/util/intel-bts.c
> +++ b/tools/perf/arch/x86/util/intel-bts.c
> @@ -60,7 +60,9 @@ struct branch {
> u64 misc;
> };
>
> -static size_t intel_bts_info_priv_size(struct auxtrace_record *itr __maybe_unused)
> +static size_t
> +intel_bts_info_priv_size(struct auxtrace_record *itr __maybe_unused,
> + struct perf_session *session __maybe_unused)
> {
> return INTEL_BTS_AUXTRACE_PRIV_SIZE;
> }
> diff --git a/tools/perf/arch/x86/util/intel-pt.c b/tools/perf/arch/x86/util/intel-pt.c
> index b02af064f0f9..ad4e45c6eb9d 100644
> --- a/tools/perf/arch/x86/util/intel-pt.c
> +++ b/tools/perf/arch/x86/util/intel-pt.c
> @@ -273,7 +273,9 @@ intel_pt_pmu_default_config(struct perf_pmu *intel_pt_pmu)
> return attr;
> }
>
> -static size_t intel_pt_info_priv_size(struct auxtrace_record *itr __maybe_unused)
> +static size_t
> +intel_pt_info_priv_size(struct auxtrace_record *itr __maybe_unused,
> + struct perf_session *session __maybe_unused)
> {
> return INTEL_PT_AUXTRACE_PRIV_SIZE;
> }
> diff --git a/tools/perf/util/auxtrace.c b/tools/perf/util/auxtrace.c
> index 7f10430af39c..90dc11ccf929 100644
> --- a/tools/perf/util/auxtrace.c
> +++ b/tools/perf/util/auxtrace.c
> @@ -478,10 +478,11 @@ void auxtrace_heap__pop(struct auxtrace_heap *heap)
> heap_array[last].ordinal);
> }
>
> -size_t auxtrace_record__info_priv_size(struct auxtrace_record *itr)
> +size_t auxtrace_record__info_priv_size(struct auxtrace_record *itr,
> + struct perf_session *session)
> {
> if (itr)
> - return itr->info_priv_size(itr);
> + return itr->info_priv_size(itr, session);
> return 0;
> }
>
> @@ -852,7 +853,7 @@ int perf_event__synthesize_auxtrace_info(struct auxtrace_record *itr,
> int err;
>
> pr_debug2("Synthesizing auxtrace information\n");
> - priv_size = auxtrace_record__info_priv_size(itr);
> + priv_size = auxtrace_record__info_priv_size(itr, session);
> ev = zalloc(sizeof(struct auxtrace_info_event) + priv_size);
> if (!ev)
> return -ENOMEM;
> diff --git a/tools/perf/util/auxtrace.h b/tools/perf/util/auxtrace.h
> index b86f90db1352..4bace9a396a6 100644
> --- a/tools/perf/util/auxtrace.h
> +++ b/tools/perf/util/auxtrace.h
> @@ -293,7 +293,8 @@ struct auxtrace_record {
> int (*recording_options)(struct auxtrace_record *itr,
> struct perf_evlist *evlist,
> struct record_opts *opts);
> - size_t (*info_priv_size)(struct auxtrace_record *itr);
> + size_t (*info_priv_size)(struct auxtrace_record *itr,
> + struct perf_session *session);
> int (*info_fill)(struct auxtrace_record *itr,
> struct perf_session *session,
> struct auxtrace_info_event *auxtrace_info,
> @@ -429,7 +430,8 @@ int auxtrace_parse_snapshot_options(struct auxtrace_record *itr,
> int auxtrace_record__options(struct auxtrace_record *itr,
> struct perf_evlist *evlist,
> struct record_opts *opts);
> -size_t auxtrace_record__info_priv_size(struct auxtrace_record *itr);
> +size_t auxtrace_record__info_priv_size(struct auxtrace_record *itr,
> + struct perf_session *session);
> int auxtrace_record__info_fill(struct auxtrace_record *itr,
> struct perf_session *session,
> struct auxtrace_info_event *auxtrace_info,
> --
> 2.1.4
next prev parent reply other threads:[~2015-11-30 16:15 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-11-30 2:14 [PATCH V5 00/26] Coresight integration with perf Mathieu Poirier
2015-11-30 2:14 ` [PATCH V5 01/26] coresight: etm3x: moving etm_readl/writel to header file Mathieu Poirier
2015-11-30 2:14 ` [PATCH V5 02/26] coresight: etm3x: moving sysFS entries to dedicated file Mathieu Poirier
2015-11-30 2:14 ` [PATCH V5 03/26] coresight: etm3x: unlocking tracers in default arch init Mathieu Poirier
2015-11-30 2:14 ` [PATCH V5 04/26] coresight: etm3x: splitting struct etm_drvdata Mathieu Poirier
2015-11-30 6:54 ` kbuild test robot
2015-11-30 2:14 ` [PATCH V5 05/26] coresight: etm3x: implementing 'cpu_id()' API Mathieu Poirier
2015-11-30 2:14 ` [PATCH V5 06/26] coresight: associating path with session rather than tracer Mathieu Poirier
2015-11-30 2:14 ` [PATCH V5 07/26] coresight: moving PM runtime operations to core framework Mathieu Poirier
2015-11-30 2:14 ` [PATCH V5 08/26] coresight: etm3x: adding operation mode for etm_enable() Mathieu Poirier
2015-11-30 2:14 ` [PATCH V5 09/26] coresight: add API to get sink from path Mathieu Poirier
2015-11-30 2:14 ` [PATCH V5 10/26] coresight: etm3x: set progbit to stop trace collection Mathieu Poirier
2015-11-30 2:14 ` [PATCH V5 11/26] coresight: etm3x: changing default trace configuration Mathieu Poirier
2015-11-30 2:14 ` [PATCH V5 12/26] coresight: etm3x: consolidating initial config Mathieu Poirier
2015-11-30 2:14 ` [PATCH V5 13/26] coresight: etm3x: implementing user/kernel mode tracing Mathieu Poirier
2015-11-30 2:14 ` [PATCH V5 14/26] coresight: etm3x: adding perf_get/set_config() API Mathieu Poirier
2015-11-30 2:14 ` [PATCH V5 15/26] coresight: etm3x: implementing perf_enable/disable() API Mathieu Poirier
2015-11-30 2:14 ` [PATCH V5 16/26] coresight: etb10: moving to local atomic operations Mathieu Poirier
2015-11-30 2:14 ` [PATCH V5 17/26] coresight: adding operation mode for sink->enable() Mathieu Poirier
2015-11-30 2:14 ` [PATCH V5 18/26] coresight: etb10: implementing AUX space API Mathieu Poirier
2015-11-30 2:14 ` [PATCH V5 19/26] coresight: updating documentation to reflect integration with perf Mathieu Poirier
2015-11-30 2:14 ` [PATCH V5 20/26] perf: changing pmu::setup_aux() parameter to include event Mathieu Poirier
2015-11-30 2:14 ` [PATCH V5 21/26] coresight: etm-perf: new PMU driver for ETM tracers Mathieu Poirier
2015-11-30 23:23 ` Alexander Shishkin
2015-12-01 17:25 ` Mathieu Poirier
2015-11-30 2:14 ` [PATCH V5 22/26] coresight: introducing a global trace ID function Mathieu Poirier
2015-11-30 2:14 ` [PATCH V5 23/26] perf tools: making function set_max_cpu_num() non static Mathieu Poirier
2015-11-30 2:14 ` [PATCH V5 24/26] perf tools: adding perf_session to *info_prive_size() Mathieu Poirier
2015-11-30 16:15 ` Arnaldo Carvalho de Melo [this message]
2015-11-30 2:14 ` [PATCH V5 25/26] perf tools: making coresight PMU listable Mathieu Poirier
2015-11-30 2:14 ` [PATCH V5 26/26] perf tools: adding coresight etm PMU record capabilities Mathieu Poirier
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20151130161505.GQ5934@kernel.org \
--to=acme@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).