diff options
| author | bors <bors@rust-lang.org> | 2017-05-20 20:55:52 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-05-20 20:55:52 +0000 |
| commit | 01951a61a49dca35747dc9ba03e5536f337de239 (patch) | |
| tree | 6aafa8ab9a72283d05b5be67208d245e6f9c3139 /src/bootstrap | |
| parent | 1cda810970186cf01a8134db53b13f8177cc56ab (diff) | |
| parent | dd0855d44b61a979983ae329eb84d1928b5f7eb7 (diff) | |
| download | rust-01951a61a49dca35747dc9ba03e5536f337de239.tar.gz rust-01951a61a49dca35747dc9ba03e5536f337de239.zip | |
Auto merge of #42069 - QuietMisdreavus:low_pri, r=alexchrichton
Add an option to run rustbuild on low priority on Windows and Unix This is a resurrection of #40776, combining their Windows setup with an additional setup on Unix to set the program group's *nice*ness to +10 (low-but-not-lowest priority, mirroring the priority in the Windows setup) when the `low_priority` option is on.
Diffstat (limited to 'src/bootstrap')
| -rw-r--r-- | src/bootstrap/config.rs | 3 | ||||
| -rw-r--r-- | src/bootstrap/config.toml.example | 4 | ||||
| -rw-r--r-- | src/bootstrap/job.rs | 9 | ||||
| -rw-r--r-- | src/bootstrap/lib.rs | 21 |
4 files changed, 33 insertions, 4 deletions
diff --git a/src/bootstrap/config.rs b/src/bootstrap/config.rs index 0fb597564e3..abad216d89b 100644 --- a/src/bootstrap/config.rs +++ b/src/bootstrap/config.rs @@ -94,6 +94,7 @@ pub struct Config { pub backtrace: bool, // support for RUST_BACKTRACE // misc + pub low_priority: bool, pub channel: String, pub quiet_tests: bool, // Fallback musl-root for all targets @@ -148,6 +149,7 @@ struct Build { target: Vec<String>, cargo: Option<String>, rustc: Option<String>, + low_priority: Option<bool>, compiler_docs: Option<bool>, docs: Option<bool>, submodules: Option<bool>, @@ -306,6 +308,7 @@ impl Config { config.nodejs = build.nodejs.map(PathBuf::from); config.gdb = build.gdb.map(PathBuf::from); config.python = build.python.map(PathBuf::from); + set(&mut config.low_priority, build.low_priority); set(&mut config.compiler_docs, build.compiler_docs); set(&mut config.docs, build.docs); set(&mut config.submodules, build.submodules); diff --git a/src/bootstrap/config.toml.example b/src/bootstrap/config.toml.example index df180be4e27..95cca96f7fc 100644 --- a/src/bootstrap/config.toml.example +++ b/src/bootstrap/config.toml.example @@ -152,6 +152,10 @@ # known-good version of OpenSSL, compile it, and link it to Cargo. #openssl-static = false +# Run the build with low priority, by setting the process group's "nice" value +# to +10 on Unix platforms, and by using a "low priority" job object on Windows. +#low-priority = false + # ============================================================================= # General install configuration options # ============================================================================= diff --git a/src/bootstrap/job.rs b/src/bootstrap/job.rs index c3859275e6f..72a5d1338b8 100644 --- a/src/bootstrap/job.rs +++ b/src/bootstrap/job.rs @@ -42,6 +42,7 @@ use std::env; use std::io; use std::mem; +use Build; type HANDLE = *mut u8; type BOOL = i32; @@ -60,8 +61,10 @@ const DUPLICATE_SAME_ACCESS: DWORD = 0x2; const PROCESS_DUP_HANDLE: DWORD = 0x40; const JobObjectExtendedLimitInformation: JOBOBJECTINFOCLASS = 9; const JOB_OBJECT_LIMIT_KILL_ON_JOB_CLOSE: DWORD = 0x2000; +const JOB_OBJECT_LIMIT_PRIORITY_CLASS: DWORD = 0x00000020; const SEM_FAILCRITICALERRORS: UINT = 0x0001; const SEM_NOGPFAULTERRORBOX: UINT = 0x0002; +const BELOW_NORMAL_PRIORITY_CLASS: DWORD = 0x00004000; extern "system" { fn CreateJobObjectW(lpJobAttributes: *mut u8, lpName: *const u8) -> HANDLE; @@ -118,7 +121,7 @@ struct JOBOBJECT_BASIC_LIMIT_INFORMATION { SchedulingClass: DWORD, } -pub unsafe fn setup() { +pub unsafe fn setup(build: &mut Build) { // Tell Windows to not show any UI on errors (such as not finding a required dll // during startup or terminating abnormally). This is important for running tests, // since some of them use abnormal termination by design. @@ -136,6 +139,10 @@ pub unsafe fn setup() { // children will reside in the job by default. let mut info = mem::zeroed::<JOBOBJECT_EXTENDED_LIMIT_INFORMATION>(); info.BasicLimitInformation.LimitFlags = JOB_OBJECT_LIMIT_KILL_ON_JOB_CLOSE; + if build.config.low_priority { + info.BasicLimitInformation.LimitFlags |= JOB_OBJECT_LIMIT_PRIORITY_CLASS; + info.BasicLimitInformation.PriorityClass = BELOW_NORMAL_PRIORITY_CLASS; + } let r = SetInformationJobObject(job, JobObjectExtendedLimitInformation, &mut info as *mut _ as LPVOID, diff --git a/src/bootstrap/lib.rs b/src/bootstrap/lib.rs index ca9de43f542..7eccc2a49c0 100644 --- a/src/bootstrap/lib.rs +++ b/src/bootstrap/lib.rs @@ -76,6 +76,9 @@ extern crate num_cpus; extern crate rustc_serialize; extern crate toml; +#[cfg(unix)] +extern crate libc; + use std::cmp; use std::collections::HashMap; use std::env; @@ -108,9 +111,21 @@ pub mod util; #[cfg(windows)] mod job; -#[cfg(not(windows))] +#[cfg(unix)] +mod job { + use libc; + + pub unsafe fn setup(build: &mut ::Build) { + if build.config.low_priority { + libc::setpriority(libc::PRIO_PGRP as _, 0, 10); + } + } +} + +#[cfg(not(any(unix, windows)))] mod job { - pub unsafe fn setup() {} + pub unsafe fn setup(_build: &mut ::Build) { + } } pub use config::Config; @@ -263,7 +278,7 @@ impl Build { /// Executes the entire build, as configured by the flags and configuration. pub fn build(&mut self) { unsafe { - job::setup(); + job::setup(self); } if let Subcommand::Clean = self.flags.cmd { |
