On Wed, Jul 29, 2015 at 05:21:40PM -0700, Andi Kleen wrote:
SNIP
> + }
> }
>
> static void print_aggr(char *prefix)
> @@ -818,11 +883,7 @@ static void print_aggr(char *prefix)
> continue;
> }
> uval = val * counter->scale;
> - printout(id, nr, counter, uval, prefix);
> - if (!csv_output)
> - print_noise(counter, 1.0);
> -
> - print_running(run, ena);
> + printout(id, nr, counter, uval, prefix, run, ena, 1.0);
> fputc('\n', output);
> }
> }
> @@ -848,12 +909,7 @@ static void print_aggr_thread(struct perf_evsel
> *counter, char *prefix)
> fprintf(output, "%s", prefix);
>
> uval = val * counter->scale;
> - printout(thread, 0, counter, uval, prefix);
> -
> - if (!csv_output)
> - print_noise(counter, 1.0);
> -
> - print_running(run, ena);
> + printout(thread, 0, counter, uval, prefix, run, ena, 1.0);
> fputc('\n', output);
> }
> }
> @@ -897,11 +953,7 @@ static void print_counter_aggr(struct perf_evsel
> *counter, char *prefix)
> }
>
> uval = avg * counter->scale;
> - printout(-1, 0, counter, uval, prefix);
> -
> - print_noise(counter, avg);
> -
> - print_running(avg_running, avg_enabled);
> + printout(-1, 0, counter, uval, prefix, avg_running, avg_enabled, avg);
> fprintf(output, "\n");
> }
>
> @@ -949,11 +1001,7 @@ static void print_counter(struct perf_evsel *counter,
> char *prefix)
> }
>
> uval = val * counter->scale;
> - printout(cpu, 0, counter, uval, prefix);
> -
> - if (!csv_output)
> - print_noise(counter, 1.0);
> - print_running(run, ena);
> + printout(cpu, 0, counter, uval, prefix, run, ena, 1.0);
print_running still stayed in print_aggr
how about moving the (run == 0 || ena == 0) leg from print_aggr
into printout
jirka
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
