Re: [PATCH 2/8] perf ui/progress: Add new helper functions for progress bar

[Arnaldo Carvalho de Melo <acme@ghostprotocols.net>]

Em Fri, Oct 11, 2013 at 02:15:37PM +0900, Namhyung Kim escreveu:
> From: Namhyung Kim <namhyung.kim@lge.com>
> 
> Introduce ui_progress_setup() and ui_progress__advance() to separate
> out from the session logic.  It'll be used by other places in the
> upcoming patch.

Renaming this from 'perf_progress' to 'ui_progress', as the existing
method names implies, and also because this is not perf specific at all
:-)

- Arnaldo
 
> Cc: Jiri Olsa <jolsa@redhat.com>
> Cc: Frederic Weisbecker <fweisbec@gmail.com>
> Signed-off-by: Namhyung Kim <namhyung@kernel.org>
> ---
>  tools/perf/ui/progress.c  | 18 ++++++++++++++++++
>  tools/perf/ui/progress.h  | 10 ++++++++++
>  tools/perf/util/session.c | 24 ++++++++++++------------
>  3 files changed, 40 insertions(+), 12 deletions(-)
> 
> diff --git a/tools/perf/ui/progress.c b/tools/perf/ui/progress.c
> index 3ec695607a4d..b5c22c6b1d93 100644
> --- a/tools/perf/ui/progress.c
> +++ b/tools/perf/ui/progress.c
> @@ -19,6 +19,24 @@ void ui_progress__update(u64 curr, u64 total, const char *title)
>  	return progress_fns->update(curr, total, title);
>  }
>  
> +void ui_progress__setup(struct perf_progress *p, u64 total)
> +{
> +	p->curr = 0;
> +	p->next = p->unit = total / 16;
> +	p->total = total;
> +
> +}
> +
> +void ui_progress__advance(struct perf_progress *p, u64 adv, const char *title)
> +{
> +	p->curr += adv;
> +
> +	if (p->curr >= p->next) {
> +		p->next += p->unit;
> +		ui_progress__update(p->curr, p->total, title);
> +	}
> +}
> +
>  void ui_progress__finish(void)
>  {
>  	if (progress_fns->finish)
> diff --git a/tools/perf/ui/progress.h b/tools/perf/ui/progress.h
> index 257cc224f9cf..3bd23e825953 100644
> --- a/tools/perf/ui/progress.h
> +++ b/tools/perf/ui/progress.h
> @@ -8,10 +8,20 @@ struct ui_progress {
>  	void (*finish)(void);
>  };
>  
> +struct perf_progress {
> +	u64 curr;
> +	u64 next;
> +	u64 unit;
> +	u64 total;
> +};
> +
>  extern struct ui_progress *progress_fns;
>  
>  void ui_progress__init(void);
>  
> +void ui_progress__setup(struct perf_progress *p, u64 total);
> +void ui_progress__advance(struct perf_progress *p, u64 adv, const char *title);
> +
>  void ui_progress__update(u64 curr, u64 total, const char *title);
>  void ui_progress__finish(void);
>  
> diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c
> index 6c1d4447c5b4..9f62be8bc167 100644
> --- a/tools/perf/util/session.c
> +++ b/tools/perf/util/session.c
> @@ -538,13 +538,16 @@ static int flush_sample_queue(struct perf_session *s,
>  	struct perf_sample sample;
>  	u64 limit = os->next_flush;
>  	u64 last_ts = os->last_sample ? os->last_sample->timestamp : 0ULL;
> -	unsigned idx = 0, progress_next = os->nr_samples / 16;
>  	bool show_progress = limit == ULLONG_MAX;
> +	struct perf_progress prog;
>  	int ret;
>  
>  	if (!tool->ordered_samples || !limit)
>  		return 0;
>  
> +	if (show_progress)
> +		ui_progress__setup(&prog, os->nr_samples);
> +
>  	list_for_each_entry_safe(iter, tmp, head, list) {
>  		if (iter->timestamp > limit)
>  			break;
> @@ -562,10 +565,10 @@ static int flush_sample_queue(struct perf_session *s,
>  		os->last_flush = iter->timestamp;
>  		list_del(&iter->list);
>  		list_add(&iter->list, &os->sample_cache);
> -		if (show_progress && (++idx >= progress_next)) {
> -			progress_next += os->nr_samples / 16;
> -			ui_progress__update(idx, os->nr_samples,
> -					    "Processing time ordered events...");
> +
> +		if (show_progress) {
> +			ui_progress__advance(&prog, 1,
> +					     "Processing time ordered events...");
>  		}
>  	}
>  
> @@ -1310,12 +1313,13 @@ int __perf_session__process_events(struct perf_session *session,
>  				   u64 data_offset, u64 data_size,
>  				   u64 file_size, struct perf_tool *tool)
>  {
> -	u64 head, page_offset, file_offset, file_pos, progress_next;
> +	u64 head, page_offset, file_offset, file_pos;
>  	int err, mmap_prot, mmap_flags, map_idx = 0;
>  	size_t	mmap_size;
>  	char *buf, *mmaps[NUM_MMAPS];
>  	union perf_event *event;
>  	uint32_t size;
> +	struct perf_progress prog;
>  
>  	perf_tool__fill_defaults(tool);
>  
> @@ -1326,7 +1330,7 @@ int __perf_session__process_events(struct perf_session *session,
>  	if (data_offset + data_size < file_size)
>  		file_size = data_offset + data_size;
>  
> -	progress_next = file_size / 16;
> +	ui_progress__setup(&prog, file_size);
>  
>  	mmap_size = MMAP_SIZE;
>  	if (mmap_size > file_size)
> @@ -1381,11 +1385,7 @@ more:
>  	head += size;
>  	file_pos += size;
>  
> -	if (file_pos >= progress_next) {
> -		progress_next += file_size / 16;
> -		ui_progress__update(file_pos, file_size,
> -				    "Processing events...");
> -	}
> +	ui_progress__advance(&prog, size, "Processing events...");
>  
>  	if (file_pos < file_size)
>  		goto more;
> -- 
> 1.7.11.7