Re: [PATCH 07/37] perf tools: Do not use __perf_session__process_events() directly

[Jiri Olsa]

On Wed, Dec 24, 2014 at 04:15:03PM +0900, Namhyung Kim wrote:
> It's only used for perf record to process build-id because its file
> size it's not fixed at this time due to remaining header features.
> However data offset and size is available so that we can use the
> perf_session__process_events() once we set the file size as the
> current offset like for now.
> 
> It turns out that we can staticize the function again as it's the only
> user and add multi file support in a single place.
> 
> Signed-off-by: Namhyung Kim <namhyung@xxxxxxxxxx>

Acked-by: Jiri Olsa <jolsa@xxxxxxxxxx>

> ---
>  tools/perf/builtin-record.c | 7 +++----
>  tools/perf/util/session.c   | 6 +++---
>  tools/perf/util/session.h   | 3 ---
>  3 files changed, 6 insertions(+), 10 deletions(-)
> 
> diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c
> index 8c91f25b81f6..4f97657f14e7 100644
> --- a/tools/perf/builtin-record.c
> +++ b/tools/perf/builtin-record.c
> @@ -196,12 +196,13 @@ static int process_buildids(struct record *rec)
>  {
>  	struct perf_data_file *file  = &rec->file;
>  	struct perf_session *session = rec->session;
> -	u64 start = session->header.data_offset;
>  
>  	u64 size = lseek(perf_data_file__fd(file), 0, SEEK_CUR);
>  	if (size == 0)
>  		return 0;
>  
> +	file->size = size;
> +
>  	/*
>  	 * During this process, it'll load kernel map and replace the
>  	 * dso->long_name to a real pathname it found.  In this case
> @@ -213,9 +214,7 @@ static int process_buildids(struct record *rec)
>  	 */
>  	symbol_conf.ignore_vmlinux_buildid = true;
>  
> -	return __perf_session__process_events(session, start,
> -					      size - start,
> -					      size, &build_id__mark_dso_hit_ops);
> +	return perf_session__process_events(session, &build_id__mark_dso_hit_ops);
>  }
>  
>  static void perf_event__synthesize_guest_os(struct machine *machine, void *data)
> diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c
> index 6ac62ae6b8fa..88aa2f09df93 100644
> --- a/tools/perf/util/session.c
> +++ b/tools/perf/util/session.c
> @@ -1252,9 +1252,9 @@ fetch_mmaped_event(struct perf_session *session,
>  #define NUM_MMAPS 128
>  #endif
>  
> -int __perf_session__process_events(struct perf_session *session,
> -				   u64 data_offset, u64 data_size,
> -				   u64 file_size, struct perf_tool *tool)
> +static int __perf_session__process_events(struct perf_session *session,
> +					  u64 data_offset, u64 data_size,
> +					  u64 file_size, struct perf_tool *tool)
>  {
>  	int fd = perf_data_file__fd(session->file);
>  	u64 head, page_offset, file_offset, file_pos, size;
> diff --git a/tools/perf/util/session.h b/tools/perf/util/session.h
> index dc26ebf60fe4..6d663dc76404 100644
> --- a/tools/perf/util/session.h
> +++ b/tools/perf/util/session.h
> @@ -49,9 +49,6 @@ int perf_session__peek_event(struct perf_session *session, off_t file_offset,
>  			     union perf_event **event_ptr,
>  			     struct perf_sample *sample);
>  
> -int __perf_session__process_events(struct perf_session *session,
> -				   u64 data_offset, u64 data_size, u64 size,
> -				   struct perf_tool *tool);
>  int perf_session__process_events(struct perf_session *session,
>  				 struct perf_tool *tool);
>  
> -- 
> 2.1.3
> 
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/