Use async command spawning so that timeouts can happen mid-compilation

Author: Kobzol

Cargo.lock

@@ -21,7 +21,7 @@ semver = "1.0"
 reqwest = { version = "0.11", features = ["json"] }
 xz2 = "0.1.3"
 tar = "0.4"
-tokio = { version = "1.6", features = ["rt"] }
+tokio = { version = "1.6", features = ["rt", "process"] }
 database = { path = "../database" }
 intern = { path = "../intern" }
 futures = "0.3.5"

collector/Cargo.toml

@@ -5,7 +5,7 @@ use crate::compile::benchmark::profile::Profile;
 use crate::compile::benchmark::scenario::Scenario;
 use crate::compile::benchmark::BenchmarkName;
 use crate::toolchain::Toolchain;
-use crate::{command_output, utils};
+use crate::{async_command_output, command_output, utils};
 use anyhow::Context;
 use bencher::Bencher;
 use database::QueryLabel;
@@ -309,7 +309,8 @@ impl<'a> CargoProcess<'a> {
 
             log::debug!("{:?}", cmd);
 
-            let output = command_output(&mut cmd)?;
+            let cmd = tokio::process::Command::from(cmd);
+            let output = async_command_output(cmd).await?;
             if let Some((ref mut processor, scenario, scenario_str, patch)) = self.processor_etc {
                 let data = ProcessOutputData {
                     name: self.processor_name.clone(),

collector/src/compile/execute/mod.rs

@@ -221,6 +221,30 @@ pub fn command_output(cmd: &mut Command) -> anyhow::Result<process::Output> {
     Ok(output)
 }
 
+pub async fn async_command_output(
+    mut cmd: tokio::process::Command,
+) -> anyhow::Result<process::Output> {
+    use anyhow::Context;
+
+    let child = cmd
+        .stdout(Stdio::piped())
+        .stderr(Stdio::piped())
+        .spawn()
+        .with_context(|| format!("failed to spawn process for cmd: {:?}", cmd))?;
+    let output = child.wait_with_output().await?;
+
+    if !output.status.success() {
+        return Err(anyhow::anyhow!(
+            "expected success, got {}\n\nstderr={}\n\n stdout={}\n",
+            output.status,
+            String::from_utf8_lossy(&output.stderr),
+            String::from_utf8_lossy(&output.stdout)
+        ));
+    }
+
+    Ok(output)
+}
+
 #[derive(Debug, Clone, Deserialize)]
 pub struct MasterCommit {
     pub sha: String,