aboutsummaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorJiri Olsa <jolsa@kernel.org>2015-10-16 06:41:04 -0400
committerArnaldo Carvalho de Melo <acme@redhat.com>2015-10-19 17:02:07 -0400
commit208df99ed07ca5e86ee41617e0384930fc9ca819 (patch)
tree0d8284333e5a4363f39b4b90cbc10abd199140c9 /tools
parent581cc8a2a2a00afc864840720186b0f6a38079d9 (diff)
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 <jolsa@kernel.org> Tested-by: Kan Liang <kan.liang@intel.com> Cc: David Ahern <dsahern@gmail.com> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> Link: http://lkml.kernel.org/r/1444992092-17897-30-git-send-email-jolsa@kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools')
-rw-r--r--tools/perf/builtin-stat.c5
-rw-r--r--tools/perf/util/stat.c1
-rw-r--r--tools/perf/util/stat.h1
3 files changed, 7 insertions, 0 deletions
diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c
index 184057295970..abeb15aebd12 100644
--- 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)
479 csv_sep); 479 csv_sep);
480 break; 480 break;
481 case AGGR_GLOBAL: 481 case AGGR_GLOBAL:
482 case AGGR_UNSET:
482 default: 483 default:
483 break; 484 break;
484 } 485 }
@@ -799,6 +800,8 @@ static void print_interval(char *prefix, struct timespec *ts)
799 case AGGR_GLOBAL: 800 case AGGR_GLOBAL:
800 default: 801 default:
801 fprintf(output, "# time counts %*s events\n", unit_width, "unit"); 802 fprintf(output, "# time counts %*s events\n", unit_width, "unit");
803 case AGGR_UNSET:
804 break;
802 } 805 }
803 } 806 }
804 807
@@ -880,6 +883,7 @@ static void print_counters(struct timespec *ts, int argc, const char **argv)
880 evlist__for_each(evsel_list, counter) 883 evlist__for_each(evsel_list, counter)
881 print_counter(counter, prefix); 884 print_counter(counter, prefix);
882 break; 885 break;
886 case AGGR_UNSET:
883 default: 887 default:
884 break; 888 break;
885 } 889 }
@@ -960,6 +964,7 @@ static int perf_stat_init_aggr_mode(void)
960 case AGGR_NONE: 964 case AGGR_NONE:
961 case AGGR_GLOBAL: 965 case AGGR_GLOBAL:
962 case AGGR_THREAD: 966 case AGGR_THREAD:
967 case AGGR_UNSET:
963 default: 968 default:
964 break; 969 break;
965 } 970 }
diff --git a/tools/perf/util/stat.c b/tools/perf/util/stat.c
index 93e6d697e574..837374181ec7 100644
--- 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
272 aggr->ena += count->ena; 272 aggr->ena += count->ena;
273 aggr->run += count->run; 273 aggr->run += count->run;
274 } 274 }
275 case AGGR_UNSET:
275 default: 276 default:
276 break; 277 break;
277 } 278 }
diff --git a/tools/perf/util/stat.h b/tools/perf/util/stat.h
index f8d9d5ce24a9..da1d11c4f8c1 100644
--- a/tools/perf/util/stat.h
+++ b/tools/perf/util/stat.h
@@ -31,6 +31,7 @@ enum aggr_mode {
31 AGGR_SOCKET, 31 AGGR_SOCKET,
32 AGGR_CORE, 32 AGGR_CORE,
33 AGGR_THREAD, 33 AGGR_THREAD,
34 AGGR_UNSET,
34}; 35};
35 36
36struct perf_stat_config { 37struct perf_stat_config {