[PATCH V5 24/26] perf tools: adding perf_session to *info_prive_size()

[Arnaldo Carvalho de Melo]

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 at chello.nl>
> Cc: Ingo Molnar <mingo at redhat.com>
> Cc: Arnaldo Carvalho de Melo <acme at kernel.org>
> Signed-off-by: Mathieu Poirier <mathieu.poirier at 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