Commit a269e4d

committed

run git commands in bootstrap in parallel

this saves about 150ms on many ./x invocations

1 parent da93539 commit a269e4dCopy full SHA for a269e4d

File tree

+46

-14

lines changed

+46

-14

lines changed

Lines changed: 12 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -545,23 +545,28 @@ impl Build {`
`545`	`545`	`.args(["--get-regexp", "path"])`
`546`	`546`	`.run_capture(self)`
`547`	`547`	`.stdout();`
`548`		`- for line in output.lines() {`
	`548`	`+ std::thread::scope(\|s\| {`
`549`	`549`	// Look for `submodule.$name.path = $path`
`550`	`550`	// Sample output: `submodule.src/rust-installer.path src/tools/rust-installer`
`551`		`- let submodule = line.split_once(' ').unwrap().1;`
`552`		`- self.update_existing_submodule(submodule);`
`553`		`- }`
	`551`	`+ for line in output.lines() {`
	`552`	`+ let submodule = line.split_once(' ').unwrap().1;`
	`553`	`+ let config = self.config.clone();`
	`554`	`+ s.spawn(move \|\| {`
	`555`	`+ Self::update_existing_submodule(&config, submodule);`
	`556`	`+ });`
	`557`	`+ }`
	`558`	`+ });`
`554`	`559`	`}`
`555`	`560`
`556`	`561`	`/// Updates the given submodule only if it's initialized already; nothing happens otherwise.`
`557`		`- pub fn update_existing_submodule(&self, submodule: &str) {`
	`562`	`+ pub fn update_existing_submodule(config:&Config, submodule: &str) {`
`558`	`563`	`// Avoid running git when there isn't a git checkout.`
`559`		`- if !self.config.submodules() {`
	`564`	`+ if !config.submodules() {`
`560`	`565`	`return;`
`561`	`566`	`}`
`562`	`567`
`563`	`568`	`if GitInfo::new(false, Path::new(submodule)).is_managed_git_subrepository() {`
`564`		`- self.config.update_submodule(submodule);`
	`569`	`+ config.update_submodule(submodule);`
`565`	`570`	`}`
`566`	`571`	`}`
`567`	`572`

Lines changed: 7 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ use std::path::Path;`
`10`	`10`
`11`	`11`	`use super::helpers;`
`12`	`12`	`use crate::Build;`
`13`		`-use crate::utils::helpers::{output, t};`
	`13`	`+use crate::utils::helpers::{start_process, t};`
`14`	`14`
`15`	`15`	`#[derive(Clone, Default)]`
`16`	`16`	`pub enum GitInfo {`
`@@ -56,7 +56,7 @@ impl GitInfo {`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`// Ok, let's scrape some info`
`59`		`- let ver_date = output(`
	`59`	`+ let ver_date = start_process(`
`60`	`60`	`helpers::git(Some(dir))`
`61`	`61`	`.arg("log")`
`62`	`62`	`.arg("-1")`
`@@ -65,14 +65,14 @@ impl GitInfo {`
`65`	`65`	`.as_command_mut(),`
`66`	`66`	`);`
`67`	`67`	`let ver_hash =`
`68`		`- output(helpers::git(Some(dir)).arg("rev-parse").arg("HEAD").as_command_mut());`
`69`		`- let short_ver_hash = output(`
	`68`	`+ start_process(helpers::git(Some(dir)).arg("rev-parse").arg("HEAD").as_command_mut());`
	`69`	`+ let short_ver_hash = start_process(`
`70`	`70`	`helpers::git(Some(dir)).arg("rev-parse").arg("--short=9").arg("HEAD").as_command_mut(),`
`71`	`71`	`);`
`72`	`72`	`GitInfo::Present(Some(Info {`
`73`		`- commit_date: ver_date.trim().to_string(),`
`74`		`- sha: ver_hash.trim().to_string(),`
`75`		`- short_sha: short_ver_hash.trim().to_string(),`
	`73`	`+ commit_date: ver_date().trim().to_string(),`
	`74`	`+ sha: ver_hash().trim().to_string(),`
	`75`	`+ short_sha: short_ver_hash().trim().to_string(),`
`76`	`76`	`}))`
`77`	`77`	`}`
`78`	`78`

Lines changed: 27 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -288,6 +288,33 @@ pub fn output(cmd: &mut Command) -> String {`
`288`	`288`	`String::from_utf8(output.stdout).unwrap()`
`289`	`289`	`}`
`290`	`290`
	`291`	`+/// Spawn a process and return a closure that will wait for the process`
	`292`	`+/// to finish and then return its output. This allows the spawned process`
	`293`	`+/// to do work without immediately blocking bootstrap.`
	`294`	`+#[track_caller]`
	`295`	`+pub fn start_process(cmd: &mut Command) -> impl FnOnce() -> String {`
	`296`	`+ let child = match cmd.stderr(Stdio::inherit()).stdout(Stdio::piped()).spawn() {`
	`297`	`+ Ok(child) => child,`
	`298`	`+ Err(e) => fail(&format!("failed to execute command: {cmd:?}\nERROR: {e}")),`
	`299`	`+ };`
	`300`	`+`
	`301`	`+ let command = format!("{:?}", cmd);`
	`302`	`+`
	`303`	`+ move \|\| {`
	`304`	`+ let output = child.wait_with_output().unwrap();`
	`305`	`+`
	`306`	`+ if !output.status.success() {`
	`307`	`+ panic!(`
	`308`	`+ "command did not execute successfully: {}\n\`
	`309`	`+ expected success, got: {}",`
	`310`	`+ command, output.status`
	`311`	`+ );`
	`312`	`+ }`
	`313`	`+`
	`314`	`+ String::from_utf8(output.stdout).unwrap()`
	`315`	`+ }`
	`316`	`+}`
	`317`	`+`
`291`	`318`	/// Returns the last-modified time for `path`, or zero if it doesn't exist.
`292`	`319`	`pub fn mtime(path: &Path) -> SystemTime {`
`293`	`320`	`fs::metadata(path).and_then(\|f\| f.modified()).unwrap_or(UNIX_EPOCH)`

Comments

(0)