Re: [PATCH v5 5/5] perf stat: Report summary for interval mode

[Jin, Yao]

Hi Jiri,

On 5/18/2020 8:47 PM, Jiri Olsa wrote:
> On Thu, May 14, 2020 at 01:36:38PM +0800, Jin Yao wrote:
>
> SNIP
>
> >   
> >   	evlist__for_each_entry(evsel_list, counter) {
> >   		if (counter->err)
> > @@ -394,6 +403,7 @@ static void runtime_stat_reset(struct perf_stat_config *config)
> >   static void process_interval(void)
> >   {
> >   	struct timespec ts, rs;
> > +	struct stats walltime_nsecs_stats_bak;
> >   
> >   	clock_gettime(CLOCK_MONOTONIC, &ts);
> >   	diff_timespec(&rs, &ts, &ref_time);
> > @@ -407,9 +417,11 @@ static void process_interval(void)
> >   			pr_err("failed to write stat round event\n");
> >   	}
> >   
> > +	walltime_nsecs_stats_bak = walltime_nsecs_stats;
> >   	init_stats(&walltime_nsecs_stats);
> >   	update_stats(&walltime_nsecs_stats, stat_config.interval * 1000000);
> >   	print_counters(&rs, 0, NULL);
> > +	walltime_nsecs_stats = walltime_nsecs_stats_bak;
>
> could we instead of above initialize walltime_nsecs_stats
> in the condition below, like:
>
> 	init_stats(&walltime_nsecs_stats);
> 	update_stats(&walltime_nsecs_stats, stat_config.interval * 1000000);
>
> jirka

Yes, I think that's OK and better. My fix is:

@@ -775,11 +772,11 @@ static int __run_perf_stat(int argc, const char **argv, int run_idx)
        if (stat_config.walltime_run_table)
                stat_config.walltime_run[run_idx] = t1 - t0;

-       update_stats(&walltime_nsecs_stats, t1 - t0);
-
        if (interval) {
                stat_config.interval = 0;
                stat_config.summary = true;
+               init_stats(&walltime_nsecs_stats);
+               update_stats(&walltime_nsecs_stats, t1 - t0);

                if (stat_config.aggr_mode == AGGR_GLOBAL)
                        perf_evlist__save_aggr_prev_raw_counts(evsel_list);
@@ -788,7 +785,8 @@ static int __run_perf_stat(int argc, const char **argv, int run_idx)
                perf_evlist__reset_prev_raw_counts(evsel_list);
                runtime_stat_reset(&stat_config);
                perf_stat__reset_shadow_per_stat(&rt_stat);
-       }
+       } else
+               update_stats(&walltime_nsecs_stats, t1 - t0);

        /*
         * Closing a group leader splits the group, and as we only disable

Thanks
Jin Yao

> >   }
> >   
> >   static void enable_counters(void)
> > @@ -765,6 +777,19 @@ static int __run_perf_stat(int argc, const char **argv, int run_idx)
> >   
> >   	update_stats(&walltime_nsecs_stats, t1 - t0);
> >   
> > +	if (interval) {
> > +		stat_config.interval = 0;
> > +		stat_config.summary = true;
> > +
> > +		if (stat_config.aggr_mode == AGGR_GLOBAL)
> > +			perf_evlist__save_aggr_prev_raw_counts(evsel_list);
> > +
> > +		perf_evlist__copy_prev_raw_counts(evsel_list);
> > +		perf_evlist__reset_prev_raw_counts(evsel_list);
> > +		runtime_stat_reset(&stat_config);
> > +		perf_stat__reset_shadow_per_stat(&rt_stat);
> > +	}
> > +
>
> SNIP