feat: use inline start/stop functions

Author: not-matthias

MODULE.bazel

@@ -3,6 +3,6 @@ bazel_dep(name = "instrument_hooks", version = "1.0.0")
 
 git_override(
     module_name = "instrument_hooks",
-    commit = "8e872739f0d6866810edb9b4f1816a53bfdc11a7",
+    commit = "3fdf53b869568fd2d20f11a72be574563846c356",
     remote = "https://github.com/CodSpeedHQ/instrument-hooks",
 )

core/CMakeLists.txt

@@ -15,7 +15,7 @@ include(FetchContent)
 FetchContent_Declare(
     instrument_hooks
     GIT_REPOSITORY https://github.com/CodSpeedHQ/instrument-hooks/
-    GIT_TAG 8e872739f0d6866810edb9b4f1816a53bfdc11a7
+    GIT_TAG 3fdf53b869568fd2d20f11a72be574563846c356
 )
 FetchContent_MakeAvailable(instrument_hooks)
 

core/include/measurement.hpp

@@ -16,12 +16,12 @@ extern "C" {
 #include "core.h"
 }
 
-inline InstrumentHooks* get_hooks() {
-  static InstrumentHooks* g_hooks = nullptr;
+static InstrumentHooks* g_hooks = nullptr;
+
+inline void measurement_init() {
   if (!g_hooks) {
     g_hooks = instrument_hooks_init();
   }
-  return g_hooks;
 }
 
 inline std::string get_version() {
@@ -34,36 +34,40 @@ inline std::string get_version() {
 
 #ifdef CODSPEED_INSTRUMENTATION
 inline bool measurement_is_instrumented() {
-  return instrument_hooks_is_instrumented(get_hooks());
+  return instrument_hooks_is_instrumented(g_hooks);
 }
 
 inline void measurement_set_metadata() {
   std::string version = get_version();
-  instrument_hooks_set_integration(get_hooks(), "codspeed-cpp",
-                                   version.c_str());
+  instrument_hooks_set_integration(g_hooks, "codspeed-cpp", version.c_str());
 }
 
 __attribute__((always_inline)) inline void measurement_start() {
-  instrument_hooks_start_benchmark(get_hooks());
+  instrument_hooks_start_benchmark_inline(g_hooks);
 }
 
-__attribute__((always_inline)) inline void measurement_stop(
-    const std::string& name) {
-  instrument_hooks_stop_benchmark(get_hooks());
+__attribute__((always_inline)) inline void measurement_stop() {
+  instrument_hooks_stop_benchmark_inline(g_hooks);
+}
 
+__attribute__((always_inline)) inline void measurement_executed_benchmark(
+    const std::string& name) {
 #ifdef _WIN32
   auto current_pid = _getpid();
 #else
   auto current_pid = getpid();
 #endif
-  instrument_hooks_executed_benchmark(get_hooks(), current_pid, name.c_str());
-};
+  instrument_hooks_executed_benchmark(g_hooks, current_pid, name.c_str());
+}
 #else
 // Stub implementations for non-instrumentation builds
 inline bool measurement_is_instrumented() { return false; }
 inline void measurement_set_metadata() {}
 inline void measurement_start() {}
-inline void measurement_stop(const std::string& name) { (void)name; }
+inline void measurement_stop() {}
+inline void measurement_executed_benchmark(const std::string& name) {
+  (void)name;
+}
 #endif
 
 #endif  // MEASUREMENT_H

core/src/codspeed.cpp

@@ -55,6 +55,7 @@ CodSpeed::CodSpeed() : is_instrumented(measurement_is_instrumented()) {
            "be made since it's running in an unknown environment."
         << std::endl;
   }
+  measurement_init();
   measurement_set_metadata();
 }
 
@@ -85,7 +86,8 @@ void CodSpeed::start_benchmark(const std::string &name) {
 }
 
 void CodSpeed::end_benchmark() {
-  measurement_stop(current_benchmark);
+  measurement_executed_benchmark(current_benchmark);
+
   benchmarked.push_back(current_benchmark);
   std::string action_str = is_instrumented ? "Measured" : "Checked";
   std::string group_str =

google_benchmark/include/benchmark/benchmark.h

@@ -1065,6 +1065,8 @@ struct State::StateIterator {
   bool operator!=(StateIterator const&) const {
     if (BENCHMARK_BUILTIN_EXPECT(cached_ != 0, true)) return true;
 #ifdef CODSPEED_INSTRUMENTATION
+    measurement_stop();
+
     if (parent_->codspeed_ != NULL) {
       parent_->codspeed_->end_benchmark();
     }
@@ -1086,8 +1088,9 @@ inline BENCHMARK_ALWAYS_INLINE State::StateIterator State::end() {
 #ifdef CODSPEED_INSTRUMENTATION
   if (this->codspeed_ != NULL) {
     this->codspeed_->start_benchmark(name_);
-    measurement_start();
   }
+
+  measurement_start();
 #endif
   return StateIterator();
 }