fix(google_benchmark): move valgrind trapdoor to a better place

Author: GuillaumeLagrange

google_benchmark/include/benchmark/benchmark.h

@@ -183,6 +183,12 @@ BENCHMARK(BM_test)->Unit(benchmark::kMillisecond);
 
 #include "benchmark/export.h"
 
+#ifdef CODSPEED_ENABLED
+#include <codspeed.h>
+
+#include <filesystem>
+#endif // CODSPEED_ENABLED
+
 #if defined(_MSC_VER)
 #include <intrin.h>  // for _ReadWriteBarrier
 #endif
@@ -1059,10 +1065,16 @@ struct State::StateIterator {
 };
 
 inline BENCHMARK_ALWAYS_INLINE State::StateIterator State::begin() {
+#ifdef CODSPEED_INSTRUMENTATION
+  codspeed::CodSpeed::getInstance()->start_benchmark(name());
+#endif
   return StateIterator(this);
 }
 inline BENCHMARK_ALWAYS_INLINE State::StateIterator State::end() {
   StartKeepRunning();
+#ifdef CODSPEED_INSTRUMENTATION
+  codspeed::CodSpeed::getInstance()->end_benchmark();
+#endif
   return StateIterator();
 }
 
@@ -1439,10 +1451,6 @@ class Fixture : public internal::Benchmark {
       n) [[maybe_unused]]
 
 #ifdef CODSPEED_ENABLED
-#include <codspeed.h>
-
-#include <filesystem>
-
 #define CUR_FILE \
   codspeed::get_path_relative_to_workspace(__FILE__) + "::"
 #define NAMESPACE \

google_benchmark/src/benchmark_api_internal.cc

@@ -97,18 +97,17 @@ State BenchmarkInstance::RunInstrumented(
     internal::ThreadManager* manager,
     internal::PerfCountersMeasurement* perf_counters_measurement,
     ProfilerManager* profiler_manager) const {
-  State st(name_.function_name, 1, args_, 0, 1, timer, manager,
-           perf_counters_measurement, profiler_manager);
   // Do one repetition to avoid flakiness due to inconcistencies in CPU cache
   // from execution order
 
   internal::ThreadTimer warmup_timer = internal::ThreadTimer::Create();
   State warmup_state(name_.function_name, 1, args_, 0, 1, &warmup_timer,
                      manager, perf_counters_measurement, profiler_manager);
   benchmark_.Run(warmup_state);
-  codspeed->start_benchmark(name().str());
+
+  State st(name().str(), 1, args_, 0, 1, timer, manager,
+           perf_counters_measurement, profiler_manager);
   benchmark_.Run(st);
-  codspeed->end_benchmark();
   return st;
 }
 #endif