Skip to content

Commit

Permalink
Created experimental build.print_step_rusage setting
Browse files Browse the repository at this point in the history
Intended to piggy-back on output from existing build.print_step_timings setting.
  • Loading branch information
pnkfelix committed Feb 25, 2021
1 parent b36f770 commit 0d8bf72
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 0 deletions.
6 changes: 6 additions & 0 deletions config.toml.example
Expand Up @@ -290,6 +290,12 @@ changelog-seen = 2
# tracking over time)
#print-step-timings = false

# Print out resource usage data for each rustbuild step, as defined by the Unix
# struct rusage. (Note that this setting is completely unstable: the data it
# captures, what platforms it supports, the format of its associated output, and
# this setting's very existence, are all subject to change.)
#print-step-rusage = false

# =============================================================================
# General install configuration options
# =============================================================================
Expand Down
4 changes: 4 additions & 0 deletions src/bootstrap/builder.rs
Expand Up @@ -1259,6 +1259,10 @@ impl<'a> Builder<'a> {
cargo.env("RUSTC_PRINT_STEP_TIMINGS", "1");
}

if self.config.print_step_rusage {
cargo.env("RUSTC_PRINT_STEP_RUSAGE", "1");
}

if self.config.backtrace_on_ice {
cargo.env("RUSTC_BACKTRACE_ON_ICE", "1");
}
Expand Down
3 changes: 3 additions & 0 deletions src/bootstrap/config.rs
Expand Up @@ -161,6 +161,7 @@ pub struct Config {
pub verbose_tests: bool,
pub save_toolstates: Option<PathBuf>,
pub print_step_timings: bool,
pub print_step_rusage: bool,
pub missing_tools: bool,

// Fallback musl-root for all targets
Expand Down Expand Up @@ -380,6 +381,7 @@ struct Build {
configure_args: Option<Vec<String>>,
local_rebuild: Option<bool>,
print_step_timings: Option<bool>,
print_step_rusage: Option<bool>,
check_stage: Option<u32>,
doc_stage: Option<u32>,
build_stage: Option<u32>,
Expand Down Expand Up @@ -679,6 +681,7 @@ impl Config {
set(&mut config.configure_args, build.configure_args);
set(&mut config.local_rebuild, build.local_rebuild);
set(&mut config.print_step_timings, build.print_step_timings);
set(&mut config.print_step_rusage, build.print_step_rusage);

// See https://github.com/rust-lang/compiler-team/issues/326
config.stage = match config.cmd {
Expand Down

0 comments on commit 0d8bf72

Please sign in to comment.