fix: separate instrumentation and walltime hooks

Author: not-matthias

google_benchmark/include/benchmark/benchmark.h

@@ -1066,10 +1066,9 @@ struct State::StateIterator {
     if (BENCHMARK_BUILTIN_EXPECT(cached_ != 0, true)) return true;
 
 
-#if defined(CODSPEED_INSTRUMENTATION) || defined(CODSPEED_WALLTIME)
+#if defined(CODSPEED_INSTRUMENTATION)
     measurement_stop();
-#endif
-#ifdef CODSPEED_INSTRUMENTATION
+
     if (parent_->codspeed_ != NULL) {
       parent_->codspeed_->end_benchmark();
     }
@@ -1094,8 +1093,7 @@ inline BENCHMARK_ALWAYS_INLINE State::StateIterator State::end() {
   if (this->codspeed_ != NULL) {
     this->codspeed_->start_benchmark(name_);
   }
-#endif
-#if defined(CODSPEED_INSTRUMENTATION) || defined(CODSPEED_WALLTIME)
+
   measurement_start();
 #endif
 

google_benchmark/src/benchmark.cc

@@ -548,6 +548,8 @@ void RunBenchmarks(const std::vector<BenchmarkInstance>& benchmarks,
       if (codspeed != nullptr) {
         codspeed->start_benchmark(runner.GetBenchmarkName());
       }
+
+      measurement_start();
 #endif
 
       runner.DoOneRepetition();
@@ -579,6 +581,8 @@ void RunBenchmarks(const std::vector<BenchmarkInstance>& benchmarks,
       }
 
 #ifdef CODSPEED_WALLTIME
+      measurement_stop();
+
       if (codspeed != nullptr) {
         codspeed->end_benchmark();
       }