Remove background thread from collector

It is currently unused and the replacement for tracking in-progress benchmarking
will probably use the database as the communication engine rather than passing
state to the server via HTTP.

Author: Mark-Simulacrum

Cargo.lock

@@ -20,7 +20,6 @@ semver = "0.9"
 reqwest = { version = "0.10", features = ["json"] }
 xz2 = "0.1.3"
 tar = "0.4"
-crossbeam-channel = "0.4.2"
 tokio = { version = "0.2", features = ["rt-core"] }
 rustc-artifacts = "0.2"
 database = { path = "../database" }

collector/Cargo.toml

@@ -1,28 +1,3 @@
-pub mod collected {
-    use crate::Commit;
-
-    #[derive(Debug, PartialEq, Clone, serde::Serialize, serde::Deserialize)]
-    pub enum Request {
-        // Will benchmark commit with these benchmarks
-        BenchmarkCommit {
-            commit: Commit,
-            // crate name
-            benchmarks: Vec<String>,
-        },
-        // benchmark finished for this benchmark/commit
-        BenchmarkDone {
-            // crate name
-            benchmark: String,
-            commit: Commit,
-        },
-    }
-
-    #[derive(Debug, PartialEq, Clone, serde::Serialize, serde::Deserialize)]
-    pub struct Response {
-        // nothing
-    }
-}
-
 pub mod next_commit {
     #[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
     pub struct Response {

collector/src/api.rs

@@ -4,7 +4,6 @@
 extern crate clap;
 
 use anyhow::{bail, Context};
-use collector::api::collected;
 use database::{pool::Connection, ArtifactId, Commit};
 use log::debug;
 use std::collections::HashSet;
@@ -16,11 +15,9 @@ use std::process::Command;
 use std::{str, time::Instant};
 use tokio::runtime::Runtime;
 
-mod background_worker;
 mod execute;
 mod sysroot;
 
-use background_worker::send_home;
 use execute::{Benchmark, Profiler};
 use sysroot::Sysroot;
 
@@ -195,21 +192,11 @@ fn bench(
     compiler: Compiler<'_>,
     benchmarks: &[Benchmark],
     iterations: usize,
-    call_home: bool,
     self_profile: bool,
 ) -> BenchmarkErrors {
     let mut errors = BenchmarkErrors::new();
     eprintln!("Benchmarking {} for triple {}", cid, compiler.triple);
 
-    if call_home {
-        if let ArtifactId::Commit(commit) = cid {
-            send_home(collected::Request::BenchmarkCommit {
-                commit: commit.clone(),
-                benchmarks: benchmarks.iter().map(|b| b.name.to_string()).collect(),
-            });
-        }
-    }
-
     let has_measureme = Command::new("summarize").output().is_ok();
     if self_profile {
         assert!(
@@ -267,15 +254,6 @@ fn bench(
                 &format!("{:?}", s),
             ));
         };
-
-        if call_home {
-            if let ArtifactId::Commit(commit) = cid {
-                send_home(collected::Request::BenchmarkDone {
-                    benchmark: benchmark.name.to_string(),
-                    commit: commit.clone(),
-                });
-            }
-        }
     }
     let end = start.elapsed();
 
@@ -559,7 +537,6 @@ fn main_result() -> anyhow::Result<i32> {
                 },
                 &benchmarks,
                 1,
-                /* call_home */ false,
                 self_profile,
             );
             res.fail_if_nonzero()?;
@@ -606,7 +583,6 @@ fn main_result() -> anyhow::Result<i32> {
                 Compiler::from_sysroot(&sysroot),
                 &benchmarks,
                 3,
-                /* call_home */ true,
                 self_profile,
             );
 
@@ -684,7 +660,6 @@ fn main_result() -> anyhow::Result<i32> {
                 },
                 &benchmarks,
                 3,
-                /* call_home */ false,
                 /* self_profile */ false,
             );
             res.fail_if_nonzero()?;
@@ -768,7 +743,6 @@ fn main_result() -> anyhow::Result<i32> {
             Ok(2)
         }
     };
-    background_worker::shut_down();
     ret
 }
 

collector/src/background_worker.rs

@@ -44,7 +44,6 @@ use crate::db::{self, Cache, Crate, Profile};
 use crate::interpolate::Interpolated;
 use crate::load::{Config, InputData};
 use crate::selector::{self, PathComponent, Tag};
-use collector::api::collected;
 use db::{ArtifactId, Lookup};
 use parking_lot::RwLock;
 
@@ -576,11 +575,8 @@ pub async fn handle_github(
     crate::github::handle_github(request, data).await
 }
 
-pub async fn handle_collected(
-    _body: collected::Request,
-    _data: &InputData,
-) -> ServerResult<collected::Response> {
-    Ok(collected::Response {})
+pub async fn handle_collected() -> ServerResult<()> {
+    Ok(())
 }
 
 fn get_self_profile_data(
@@ -1066,9 +1062,7 @@ async fn serve_req(ctx: Arc<Server>, req: Request) -> Result<Response, ServerErr
                 .body(hyper::Body::empty())
                 .unwrap());
         }
-        Ok(to_response(
-            handle_collected(body!(parse_body(&body)), &data).await,
-        ))
+        Ok(to_response(handle_collected().await))
     } else if p == "/perf/github-hook" {
         if !verify_gh(&data.config, &req, &body) {
             return Ok(http::Response::builder()