diff options
| author | Haibo Huang <hhb@google.com> | 2020-08-11 03:45:21 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-08-11 03:45:21 +0000 |
| commit | 4240a052d0e53149f3d94070940ff5bbaf482b1a (patch) | |
| tree | 712ac715f87c97473756a3c52e7491e9567469c6 /include/benchmark/benchmark.h | |
| parent | f6d69ef8c85a81c0d494fafa63ed9162f52d37ce (diff) | |
| parent | 4e25a86e8b0872adff02d78af3d8cc1bbceaab32 (diff) | |
| download | google-benchmark-4240a052d0e53149f3d94070940ff5bbaf482b1a.tar.gz | |
Upgrade google-benchmark to 1302d2ce094a9753b0f81a81ea74c0fa71fae582 am: ee5323428d am: 4e25a86e8b
Original change: https://android-review.googlesource.com/c/platform/external/google-benchmark/+/1395728
Change-Id: I9eabcbab20ddb4012cd48978f0fd3fcba568e85a
Diffstat (limited to 'include/benchmark/benchmark.h')
| -rw-r--r-- | include/benchmark/benchmark.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/include/benchmark/benchmark.h b/include/benchmark/benchmark.h index e5f6778..da638f9 100644 --- a/include/benchmark/benchmark.h +++ b/include/benchmark/benchmark.h @@ -176,6 +176,7 @@ BENCHMARK(BM_test)->Unit(benchmark::kMillisecond); #include <map> #include <set> #include <string> +#include <utility> #include <vector> #if defined(BENCHMARK_HAS_CXX11) @@ -1294,10 +1295,16 @@ struct CPUInfo { int num_sharing; }; + enum Scaling { + UNKNOWN, + ENABLED, + DISABLED + }; + int num_cpus; double cycles_per_second; std::vector<CacheInfo> caches; - bool scaling_enabled; + Scaling scaling; std::vector<double> load_avg; static const CPUInfo& Get(); |