hide implementation

1 files changed, 9 insertions, 13 deletions

diff --git a/vespalib/src/tests/cpu_usage/cpu_usage_test.cpp b/vespalib/src/tests/cpu_usage/cpu_usage_test.cpp
index d003689b864..98a7bd780a7 100644
--- a/vespalib/src/tests/cpu_usage/cpu_usage_test.cpp
+++ b/vespalib/src/tests/cpu_usage/cpu_usage_test.cpp
@@ -12,7 +12,6 @@ bool verbose = false;
 size_t loop_cnt = 10;
 double budget = 0.25;
 
-using DummySampler = vespalib::cpu_usage::DummyThreadSampler;
 using Sampler = vespalib::cpu_usage::ThreadSampler;
 
 //-----------------------------------------------------------------------------
@@ -30,8 +29,7 @@ void be_busy(duration d) {
     }
 }
 
-template <typename LIST>
-std::vector<duration> sample(const LIST &list) {
+std::vector<duration> sample(const std::vector<Sampler*> &list) {
     std::vector<duration> result;
     result.reserve(list.size());
     for (auto *sampler: list) {
@@ -42,8 +40,7 @@ std::vector<duration> sample(const LIST &list) {
 
 //-----------------------------------------------------------------------------
 
-template <typename SAMPLER>
-void verify_sampling(size_t thread_id, size_t num_threads, std::vector<SAMPLER*> &samplers) {
+void verify_sampling(size_t thread_id, size_t num_threads, std::vector<Sampler*> &samplers, bool force_mock) {
     if (thread_id == 0) {
         TEST_BARRIER(); // #1
         auto t0 = steady_clock::now();
@@ -61,11 +58,10 @@ void verify_sampling(size_t thread_id, size_t num_threads, std::vector<SAMPLER*>
         EXPECT_GREATER(load[3], load[0]);
         fprintf(stderr, "loads: { %.2f, %.2f, %.2f, %.2f }\n", load[0], load[1], load[2], load[3]);
     } else {
-        SAMPLER sampler;
         int idx = (thread_id - 1);
         double target_load = double(thread_id - 1) / (num_threads - 2);
-        sampler.expected_load(target_load);
-        samplers[idx] = &sampler;
+        auto sampler = cpu_usage::create_thread_sampler(force_mock, target_load);
+        samplers[idx] = sampler.get();
         TEST_BARRIER(); // #1
         TEST_BARRIER(); // #2
         for (size_t i = 0; i < loop_cnt; ++i) {
@@ -78,18 +74,18 @@ void verify_sampling(size_t thread_id, size_t num_threads, std::vector<SAMPLER*>
 
 //-----------------------------------------------------------------------------
 
-TEST_MT_F("require that dummy thread-based CPU usage sampling with known expected load works", 5, std::vector<DummySampler*>(4, nullptr)) {
-    TEST_DO(verify_sampling(thread_id, num_threads, f1));
+TEST_MT_F("require that dummy thread-based CPU usage sampling with known expected load works", 5, std::vector<Sampler*>(4, nullptr)) {
+    TEST_DO(verify_sampling(thread_id, num_threads, f1, true));
 }
 
 TEST_MT_F("require that external thread-based CPU usage sampling works", 5, std::vector<Sampler*>(4, nullptr)) {
-    TEST_DO(verify_sampling(thread_id, num_threads, f1));
+    TEST_DO(verify_sampling(thread_id, num_threads, f1, false));
 }
 
 TEST("measure thread CPU clock overhead") {
-    Sampler sampler;
+    auto sampler = cpu_usage::create_thread_sampler();
     duration d;
-    double min_time_us = BenchmarkTimer::benchmark([&d, &sampler]() noexcept { d = sampler.sample(); }, budget) * 1000000.0;
+    double min_time_us = BenchmarkTimer::benchmark([&d, &sampler]() noexcept { d = sampler->sample(); }, budget) * 1000000.0;
     fprintf(stderr, "approx overhead per sample (thread CPU clock): %f us\n", min_time_us);
 }