--wip-- [skip ci]

Author: GuillaumeLagrange

crates/exec-harness/build.rs

@@ -62,6 +62,7 @@ fn main() {
         core_c: instrument_hooks_dir.join("dist/core.c"),
         includes_dir: instrument_hooks_dir.join("includes"),
     };
+    println!("cargo:rerun-if-changed={}", paths.core_c.display());
     paths.check_sources_exist();
     build_shared_library(&paths, &preload_constants);
 }
@@ -101,6 +102,7 @@ fn build_shared_library(paths: &PreloadBuildPaths, constants: &PreloadConstants)
         .flag("-Wno-uninitialized")
         .flag("-Wno-overflow")
         .flag("-Wno-unused-function")
+        // .flag("-Wno-unused-parameter")
         .flag("-Wno-unterminated-string-initialization");
 
     // Compile source files to object files

crates/instrument-hooks-bindings/instrument-hooks

@@ -18,8 +18,10 @@ if [ "${CODSPEED_RUNNER_MODE:-}" != "walltime" ]; then
     exit 1
 fi
 
-# Find the real go binary, so that we don't end up in infinite recursion
-REAL_GO=$(which -a go | grep -v "$(realpath "$0")" | head -1)
+# Find the real go binary by removing our directory from PATH (same approach as node.sh)
+ORIGINAL_PATH=$(echo "$PATH" | tr ":" "\n" | grep -v "codspeed_introspected_go" | tr "\n" ":")
+REAL_GO=$(env PATH="$ORIGINAL_PATH" which go 2>/dev/null || true)
+debug_log "Real go path: $REAL_GO"
 if [ -z "$REAL_GO" ]; then
     echo "ERROR: Could not find real go binary" >&2
     exit 1

src/executor/helpers/introspected_golang/go.sh

@@ -105,28 +105,28 @@ impl WallTimeExecutor {
         bench_cmd.arg(script_file.path());
         let (mut bench_cmd, env_file) = wrap_with_env(bench_cmd, &extra_env)?;
 
-        let mut cmd_builder = CommandBuilder::new("systemd-run");
-        if let Some(cwd) = &config.working_directory {
-            let abs_cwd = canonicalize(cwd)?;
-            cmd_builder.current_dir(abs_cwd);
-        }
-        if !is_codspeed_debug_enabled() {
-            cmd_builder.arg("--quiet");
-        }
-        // Remarks:
-        // - We're using --scope so that perf is able to capture the events of the benchmark process.
-        // - We can't user `--user` here because we need to run in `codspeed.slice`, otherwise we'd run in
-        //   user.slice` (which is isolated). We can use `--gid` and `--uid` to run the command as the current user.
-        // - We must use `bash` here instead of `sh` since `source` isn't available when symlinked to `dash`.
-        // - We have to pass the environment variables because `--scope` only inherits the system and not the user environment variables.
-        cmd_builder.arg("--slice=codspeed.slice");
-        cmd_builder.arg("--scope");
-        cmd_builder.arg("--same-dir");
-        cmd_builder.arg(format!("--uid={}", nix::unistd::Uid::current().as_raw()));
-        cmd_builder.arg(format!("--gid={}", nix::unistd::Gid::current().as_raw()));
-        cmd_builder.args(["--"]);
-
-        bench_cmd.wrap_with(cmd_builder);
+        // let mut cmd_builder = CommandBuilder::new("systemd-run");
+        // if let Some(cwd) = &config.working_directory {
+        //     let abs_cwd = canonicalize(cwd)?;
+        //     cmd_builder.current_dir(abs_cwd);
+        // }
+        // if !is_codspeed_debug_enabled() {
+        //     cmd_builder.arg("--quiet");
+        // }
+        // // Remarks:
+        // // - We're using --scope so that perf is able to capture the events of the benchmark process.
+        // // - We can't user `--user` here because we need to run in `codspeed.slice`, otherwise we'd run in
+        // //   user.slice` (which is isolated). We can use `--gid` and `--uid` to run the command as the current user.
+        // // - We must use `bash` here instead of `sh` since `source` isn't available when symlinked to `dash`.
+        // // - We have to pass the environment variables because `--scope` only inherits the system and not the user environment variables.
+        // cmd_builder.arg("--slice=codspeed.slice");
+        // cmd_builder.arg("--scope");
+        // cmd_builder.arg("--same-dir");
+        // cmd_builder.arg(format!("--uid={}", nix::unistd::Uid::current().as_raw()));
+        // cmd_builder.arg(format!("--gid={}", nix::unistd::Gid::current().as_raw()));
+        // cmd_builder.args(["--"]);
+
+        // bench_cmd.wrap_with(cmd_builder);
 
         Ok((env_file, script_file, bench_cmd))
     }

src/executor/wall_time/executor.rs

@@ -37,8 +37,10 @@ pub fn check_system(system_info: &SystemInfo) -> Result<()> {
         return Ok(());
     }
 
+    dbg!(system_info);
+
     match system_info.arch.as_str() {
-        "x86_64" | "aarch64" => {
+        "x86_64" | "aarch64" | "arm64" => {
             warn!(
                 "Unofficially supported system: {} {}. Continuing with best effort support.",
                 system_info.os, system_info.os_version