perf stat: Add AGGR_UNSET mode

Adding AGGR_UNSET mode, so we could distinguish unset aggr_mode in
following patches.

Signed-off-by: Jiri Olsa <[email protected]>
Tested-by: Kan Liang <[email protected]>
Cc: David Ahern <[email protected]>
Cc: Namhyung Kim <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Link: http://lkml.kernel.org/r/[email protected]
Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>

diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c
index 18405729597052141b99fee187f0810342515e11..abeb15aebd12af779af66246838d7aa55168f951 100644 (file)
--- a/tools/perf/builtin-stat.c
+++ b/tools/perf/builtin-stat.c
@@ -479,6 +479,7 @@ static void aggr_printout(struct perf_evsel *evsel, int id, int nr)
                        csv_sep);
                break;
        case AGGR_GLOBAL:
+       case AGGR_UNSET:
        default:
                break;
        }
@@ -799,6 +800,8 @@ static void print_interval(char *prefix, struct timespec *ts)
                case AGGR_GLOBAL:
                default:
                        fprintf(output, "#           time             counts %*s events\n", unit_width, "unit");
+               case AGGR_UNSET:
+                       break;
                }
        }
 
@@ -880,6 +883,7 @@ static void print_counters(struct timespec *ts, int argc, const char **argv)
                evlist__for_each(evsel_list, counter)
                        print_counter(counter, prefix);
                break;
+       case AGGR_UNSET:
        default:
                break;
        }
@@ -960,6 +964,7 @@ static int perf_stat_init_aggr_mode(void)
        case AGGR_NONE:
        case AGGR_GLOBAL:
        case AGGR_THREAD:
+       case AGGR_UNSET:
        default:
                break;
        }

diff --git a/tools/perf/util/stat.c b/tools/perf/util/stat.c
index 93e6d697e57472431ba7deb39cda57f2a49a0079..837374181ec719afc8adadf5a4fb9d476d735d6f 100644 (file)
--- a/tools/perf/util/stat.c
+++ b/tools/perf/util/stat.c
@@ -272,6 +272,7 @@ process_counter_values(struct perf_stat_config *config, struct perf_evsel *evsel
                        aggr->ena += count->ena;
                        aggr->run += count->run;
                }
+       case AGGR_UNSET:
        default:
                break;
        }

diff --git a/tools/perf/util/stat.h b/tools/perf/util/stat.h
index f8d9d5ce24a94aeb2805c5c3bff46aecb9db5522..da1d11c4f8c193cff476fec76868277b12f7c623 100644 (file)
--- a/tools/perf/util/stat.h
+++ b/tools/perf/util/stat.h
@@ -31,6 +31,7 @@ enum aggr_mode {
        AGGR_SOCKET,
        AGGR_CORE,
        AGGR_THREAD,
+       AGGR_UNSET,
 };
 
 struct perf_stat_config {