On Thu, Feb 14, 2013 at 01:57:27PM +0100, Stephane Eranian wrote: SNIP
> - if (aggr_socket) > + switch (aggr_mode) { > + case AGGR_SOCKET: > fprintf(output, "# time socket cpus > counts events\n"); > - else if (no_aggr) > + break; > + case AGGR_NONE: > fprintf(output, "# time CPU > counts events\n"); > - else > + break; > + case AGGR_GLOBAL: > + default: > fprintf(output, "# time counts > events\n"); > + } > } > > if (++num_print_interval == 25) > num_print_interval = 0; > > - if (aggr_socket) > - print_aggr_socket(prefix); > - else if (no_aggr) { this: --- > + switch (aggr_mode) { > + case AGGR_SOCKET: > + print_aggr(prefix); > + break; > + case AGGR_NONE: > list_for_each_entry(counter, &evsel_list->entries, node) > print_counter(counter, prefix); > - } else { > + break; > + case AGGR_GLOBAL: > + default: > list_for_each_entry(counter, &evsel_list->entries, node) > print_counter_aggr(counter, prefix); > } --- > @@ -356,12 +372,6 @@ static int __run_perf_stat(int argc __maybe_unused, > const char **argv) > ts.tv_nsec = 0; > } SNIP > - if (aggr_socket) > - print_aggr_socket(NULL); > - else if (no_aggr) { > - list_for_each_entry(counter, &evsel_list->entries, node) > - print_counter(counter, NULL); > - } else { and this: --- > + switch (aggr_mode) { > + case AGGR_SOCKET: > + print_aggr(NULL); > + break; > + case AGGR_GLOBAL: > list_for_each_entry(counter, &evsel_list->entries, node) > print_counter_aggr(counter, NULL); > + break; > + case AGGR_NONE: > + list_for_each_entry(counter, &evsel_list->entries, node) > + print_counter(counter, NULL); > + break; > + default: > + break; > } --- could be in a single function with 'prefix' arg Also in non interval mode no column headers are printed and the output is sort of not user friendly, I think we could print the header same as for the interval case. [jolsa@krava perf]$ sudo ./perf stat -a --per-socket -e cycles /bin/true Performance counter stats for '/bin/true': S0 4 1,472,345 cycles # 0.000 GHz ^^^^^^^^^^^, versus: [jolsa@krava perf]$ sudo ./perf stat -a --per-socket -I 100 -e cycles sleep 10 # time socket cpus counts events 0.100283713 S0 4 12,975,188 cycles 0.200881622 S0 4 15,982,354 cycles thanks, jirka -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/