fix: call macros directly

Author: not-matthias

core/include/measurement.hpp

@@ -46,12 +46,12 @@ inline void measurement_set_metadata() {
 }
 
 __attribute__((always_inline)) inline void measurement_start() {
-  CALLGRIND_ZERO_STATS;
-  CALLGRIND_START_INSTRUMENTATION;
+  // CALLGRIND_ZERO_STATS;
+  // CALLGRIND_START_INSTRUMENTATION;
 }
 
 __attribute__((always_inline)) inline void measurement_stop() {
-  CALLGRIND_STOP_INSTRUMENTATION;
+  // CALLGRIND_STOP_INSTRUMENTATION;
 };
 
 inline void measurement_set_executed(const std::string& name) {

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
+    CALLGRIND_STOP_INSTRUMENTATION;
+
     if (parent_->codspeed_ != NULL) {
       measurement_stop();
       parent_->codspeed_->end_benchmark();
@@ -1089,6 +1091,9 @@ inline BENCHMARK_ALWAYS_INLINE State::StateIterator State::end() {
     this->codspeed_->start_benchmark(name_);
     measurement_start();
   }
+
+  CALLGRIND_ZERO_STATS;
+  CALLGRIND_START_INSTRUMENTATION;
 #endif
   return StateIterator();
 }