chore: bump instrument-hooks

not-matthias · not-matthias · commit f6a8a565d918 · 2025-10-06T16:33:11.000+02:00
diff --git a/src/pytest_codspeed/instruments/hooks/__init__.py b/src/pytest_codspeed/instruments/hooks/__init__.py
@@ -63,7 +63,7 @@ def set_executed_benchmark(self, uri: str, pid: int | None = None) -> None:
         if pid is None:
             pid = os.getpid()
 
-        ret = self.lib.instrument_hooks_executed_benchmark(
+        ret = self.lib.instrument_hooks_set_executed_benchmark(
             self.instance, pid, uri.encode("ascii")
         )
         if ret != 0:
diff --git a/src/pytest_codspeed/instruments/hooks/build.py b/src/pytest_codspeed/instruments/hooks/build.py
@@ -6,10 +6,35 @@
 
 includes_dir = Path(__file__).parent.joinpath("instrument-hooks/includes")
 header_text = (includes_dir / "core.h").read_text()
-filtered_header = "\n".join(
-    line for line in header_text.splitlines() if not line.strip().startswith("#")
-)
-ffibuilder.cdef(filtered_header)
+
+
+# Manually copied from `instrument-hooks/includes/core.h` to avoid parsing issues
+ffibuilder.cdef("""
+typedef uint64_t *InstrumentHooks;
+
+InstrumentHooks *instrument_hooks_init(void);
+void instrument_hooks_deinit(InstrumentHooks *);
+
+bool instrument_hooks_is_instrumented(InstrumentHooks *);
+uint8_t instrument_hooks_start_benchmark(InstrumentHooks *);
+uint8_t instrument_hooks_stop_benchmark(InstrumentHooks *);
+uint8_t instrument_hooks_set_executed_benchmark(InstrumentHooks *, int32_t pid,
+                                               const char *uri);
+uint8_t instrument_hooks_set_integration(InstrumentHooks *, const char *name,
+                                        const char *version);
+
+#define MARKER_TYPE_SAMPLE_START 0
+#define MARKER_TYPE_SAMPLE_END 1
+#define MARKER_TYPE_BENCHMARK_START 2
+#define MARKER_TYPE_BENCHMARK_END 3
+
+uint8_t instrument_hooks_add_marker(InstrumentHooks *, uint32_t pid,
+                                   uint8_t marker_type, uint64_t timestamp);
+uint64_t instrument_hooks_current_timestamp(void);
+
+void callgrind_start_instrumentation();
+void callgrind_stop_instrumentation();
+""")
 
 ffibuilder.set_source(
     "pytest_codspeed.instruments.hooks.dist_instrument_hooks",
diff --git a/src/pytest_codspeed/instruments/hooks/dist_instrument_hooks.pyi b/src/pytest_codspeed/instruments/hooks/dist_instrument_hooks.pyi
@@ -12,14 +12,20 @@ class lib:
     @staticmethod
     def instrument_hooks_stop_benchmark(hooks: InstrumentHooksPointer) -> int: ...
     @staticmethod
-    def instrument_hooks_executed_benchmark(
+    def instrument_hooks_set_executed_benchmark(
         hooks: InstrumentHooksPointer, pid: int, uri: bytes
     ) -> int: ...
     @staticmethod
     def instrument_hooks_set_integration(
         hooks: InstrumentHooksPointer, name: bytes, version: bytes
     ) -> int: ...
     @staticmethod
+    def instrument_hooks_add_marker(
+        hooks: InstrumentHooksPointer, pid: int, marker_type: int, timestamp: int
+    ) -> int: ...
+    @staticmethod
+    def instrument_hooks_current_timestamp() -> int: ...
+    @staticmethod
     def callgrind_start_instrumentation() -> int: ...
     @staticmethod
     def callgrind_stop_instrumentation() -> int: ...
diff --git a/src/pytest_codspeed/instruments/hooks/instrument-hooks b/src/pytest_codspeed/instruments/hooks/instrument-hooks
@@ -1 +1 @@
-Subproject commit b003e5024d61cfb784d6ac6f3ffd7d61bf7b9ec9
+Subproject commit b1e401a4d031ad308edb22ed59a52253a1ebe924

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ def set_executed_benchmark(self, uri: str, pid: int \| None = None) -> None:`
`63`	`63`	`if pid is None:`
`64`	`64`	`pid = os.getpid()`
`65`	`65`
`66`		`- ret = self.lib.instrument_hooks_executed_benchmark(`
	`66`	`+ ret = self.lib.instrument_hooks_set_executed_benchmark(`
`67`	`67`	`self.instance, pid, uri.encode("ascii")`
`68`	`68`	`)`
`69`	`69`	`if ret != 0:`