Perform startup/init code eagerly in entry::install_crates (#880)

The startup/init code in `entry::install_crates` performs a lot of blocking operations, from testing if dir exists to reading from files and there is no `.await` in there until after the startup.

There are also a few cases where `block_in_place` should be called (e.g. loading manifests, loading TLS certificates) but is missing.

Most of the `Args` passed to `entry::install_crates` are actually consumed before the first `.await` point, so performing startup/init code eagerly would make the generated future much smaller, reduce codegen and also makes it easier to optimize.

Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>

crates/bin/src/bin_util.rs

@@ -35,29 +35,33 @@ impl Termination for MainExit {
 }
 
 impl MainExit {
-    pub fn new(result: Result<Result<()>, BinstallError>, done: Duration) -> Self {
+    pub fn new(res: Result<()>, done: Duration) -> Self {
-        result.map_or_else(MainExit::Error, |res| {
         res.map(|()| MainExit::Success(Some(done)))
             .unwrap_or_else(|err| {
                 err.downcast::<BinstallError>()
                     .map(MainExit::Error)
                     .unwrap_or_else(MainExit::Report)
             })
-        })
     }
 }
 
 /// This function would start a tokio multithreading runtime,
-/// spawn a new task on it that runs `f`, then `block_on` it.
+/// spawn a new task on it that runs `f()`, then `block_on` it.
 ///
 /// It will cancel the future if user requested cancellation
 /// via signal.
-pub fn run_tokio_main<F, T>(f: F) -> Result<T, BinstallError>
+pub fn run_tokio_main<Func, Fut>(f: Func) -> Result<()>
 where
-    F: Future<Output = T> + Send + 'static,
+    Func: FnOnce() -> Result<Option<Fut>>,
-    T: Send + 'static,
+    Fut: Future<Output = Result<()>> + Send + 'static,
 {
-    let rt = Runtime::new()?;
+    let rt = Runtime::new().map_err(BinstallError::from)?;
-    let handle = AutoAbortJoinHandle::new(rt.spawn(f));
+    let _guard = rt.enter();
-    rt.block_on(cancel_on_user_sig_term(handle))
+
+    if let Some(fut) = f()? {
+        let handle = AutoAbortJoinHandle::new(rt.spawn(fut));
+        rt.block_on(cancel_on_user_sig_term(handle))?
+    } else {
+        Ok(())
+    }
 }

crates/bin/src/entry.rs

@@ -1,5 +1,6 @@
 use std::{
     env, fs,
+    future::Future,
     path::{Path, PathBuf},
     sync::Arc,
     time::Duration,
@@ -35,7 +36,10 @@ use crate::{
     ui::confirm,
 };
 
-pub async fn install_crates(args: Args, jobserver_client: LazyJobserverClient) -> Result<()> {
+pub fn install_crates(
+    args: Args,
+    jobserver_client: LazyJobserverClient,
+) -> Result<Option<impl Future<Output = Result<()>>>> {
     // Compute Resolvers
     let mut cargo_install_fallback = false;
 
@@ -63,7 +67,7 @@ pub async fn install_crates(args: Args, jobserver_client: LazyJobserverClient) -
 
     if crate_names.peek().is_none() {
         debug!("Nothing to do");
-        return Ok(());
+        return Ok(None);
     }
 
     // Launch target detection
@@ -131,6 +135,7 @@ pub async fn install_crates(args: Args, jobserver_client: LazyJobserverClient) -
         })
         .collect();
 
+    Ok(Some(async move {
         // Collect results
         let mut resolution_fetchs = Vec::new();
         let mut resolution_sources = Vec::new();
@@ -178,6 +183,7 @@ pub async fn install_crates(args: Args, jobserver_client: LazyJobserverClient) -
         }
 
         Ok(())
+    }))
 }
 
 fn do_read_root_cert(path: &Path) -> Result<Option<Certificate>, BinstallError> {
@@ -228,7 +234,6 @@ fn compute_paths_and_load_manifests(
     roots: Option<PathBuf>,
     install_path: Option<PathBuf>,
 ) -> Result<(PathBuf, Option<Manifests>, tempfile::TempDir)> {
-    block_in_place(|| {
     // Compute cargo_roots
     let cargo_roots = install_path::get_cargo_roots_path(roots).ok_or_else(|| {
         error!("No viable cargo roots path found of specified, try `--roots`");
@@ -264,7 +269,6 @@ fn compute_paths_and_load_manifests(
         .wrap_err("Creating a temporary directory failed.")?;
 
     Ok((install_path, manifests, temp_dir))
-    })
 }
 
 /// Return vec of (crate_name, current_version)

crates/bin/src/main.rs

@@ -32,7 +32,7 @@ fn main() -> MainExit {
 
         let start = Instant::now();
 
-        let result = run_tokio_main(entry::install_crates(args, jobserver_client));
+        let result = run_tokio_main(|| entry::install_crates(args, jobserver_client));
 
         let done = start.elapsed();
         debug!("run time: {done:?}");