chore: manually call callgrind markers

not-matthias · not-matthias · commit 15ec58b630ac · 2025-07-02T15:55:52.000+02:00
diff --git a/MODULE.bazel b/MODULE.bazel
@@ -3,6 +3,6 @@ bazel_dep(name = "instrument_hooks", version = "1.0.0")
 
 git_override(
     module_name = "instrument_hooks",
-    commit = "8e872739f0d6866810edb9b4f1816a53bfdc11a7",
+    commit = "19ea784c0c1fcba0156c370307a896604166bf64",
     remote = "https://github.com/CodSpeedHQ/instrument-hooks",
 )
diff --git a/core/CMakeLists.txt b/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 19ea784c0c1fcba0156c370307a896604166bf64
 )
 FetchContent_MakeAvailable(instrument_hooks)
 
diff --git a/core/include/measurement.hpp b/core/include/measurement.hpp
@@ -19,6 +19,8 @@ extern "C" {
 inline InstrumentHooks* get_hooks() {
   static InstrumentHooks* g_hooks = nullptr;
   if (!g_hooks) {
+    instrument_hooks_set_feature(FEATURE_DISABLE_CALLGRIND_MARKERS, true);
+
     g_hooks = instrument_hooks_init();
   }
   return g_hooks;
@@ -45,6 +47,7 @@ inline void measurement_set_metadata() {
 
 __attribute__((always_inline)) inline void measurement_start() {
   instrument_hooks_start_benchmark(get_hooks());
+  CALLGRIND_START_INSTRUMENTATION;
 }
 
 __attribute__((always_inline)) inline void measurement_stop(

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,6 @@ bazel_dep(name = "instrument_hooks", version = "1.0.0")`
`3`	`3`
`4`	`4`	`git_override(`
`5`	`5`	`module_name = "instrument_hooks",`
`6`		`- commit = "8e872739f0d6866810edb9b4f1816a53bfdc11a7",`
	`6`	`+ commit = "19ea784c0c1fcba0156c370307a896604166bf64",`
`7`	`7`	`remote = "https://github.com/CodSpeedHQ/instrument-hooks",`
`8`	`8`	`)`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ include(FetchContent)`
`15`	`15`	`FetchContent_Declare(`
`16`	`16`	`instrument_hooks`
`17`	`17`	`GIT_REPOSITORY https://github.com/CodSpeedHQ/instrument-hooks/`
`18`		`- GIT_TAG 8e872739f0d6866810edb9b4f1816a53bfdc11a7`
	`18`	`+ GIT_TAG 19ea784c0c1fcba0156c370307a896604166bf64`
`19`	`19`	`)`
`20`	`20`	`FetchContent_MakeAvailable(instrument_hooks)`
`21`	`21`
Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,8 @@ extern "C" {`
`19`	`19`	`inline InstrumentHooks* get_hooks() {`
`20`	`20`	`static InstrumentHooks* g_hooks = nullptr;`
`21`	`21`	`if (!g_hooks) {`
	`22`	`+ instrument_hooks_set_feature(FEATURE_DISABLE_CALLGRIND_MARKERS, true);`
	`23`	`+`
`22`	`24`	`g_hooks = instrument_hooks_init();`
`23`	`25`	`}`
`24`	`26`	`return g_hooks;`
`@@ -45,6 +47,7 @@ inline void measurement_set_metadata() {`
`45`	`47`
`46`	`48`	`__attribute__((always_inline)) inline void measurement_start() {`
`47`	`49`	`instrument_hooks_start_benchmark(get_hooks());`
	`50`	`+ CALLGRIND_START_INSTRUMENTATION;`
`48`	`51`	`}`
`49`	`52`
`50`	`53`	`__attribute__((always_inline)) inline void measurement_stop(`