Skip to content

make rustdoc test follow the jobserver limit of threads #50134

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 25, 2018
Merged

make rustdoc test follow the jobserver limit of threads #50134

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 13 additions & 4 deletions src/librustc/session/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ pub struct Session {

/// Loaded up early on in the initialization of this `Session` to avoid
/// false positives about a job server in our environment.
pub jobserver_from_env: Option<Client>,
pub jobserver: Client,

/// Metadata about the allocators for the current crate being compiled
pub has_global_allocator: Once<bool>,
Expand Down Expand Up @@ -1128,14 +1128,23 @@ pub fn build_session_(
// positives, or in other words we try to execute this before we open
// any file descriptors ourselves.
//
// Pick a "reasonable maximum" if we don't otherwise have
// a jobserver in our environment, capping out at 32 so we
// don't take everything down by hogging the process run queue.
// The fixed number is used to have deterministic compilation
// across machines.
//
// Also note that we stick this in a global because there could be
// multiple `Session` instances in this process, and the jobserver is
// per-process.
jobserver_from_env: unsafe {
static mut GLOBAL_JOBSERVER: *mut Option<Client> = 0 as *mut _;
jobserver: unsafe {
static mut GLOBAL_JOBSERVER: *mut Client = 0 as *mut _;
static INIT: std::sync::Once = std::sync::ONCE_INIT;
INIT.call_once(|| {
GLOBAL_JOBSERVER = Box::into_raw(Box::new(Client::from_env()));
let client = Client::from_env().unwrap_or_else(|| {
Client::new(32).expect("failed to create jobserver")
});
GLOBAL_JOBSERVER = Box::into_raw(Box::new(client));
});
(*GLOBAL_JOBSERVER).clone()
},
Expand Down
9 changes: 1 addition & 8 deletions src/librustc_trans/back/write.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1007,13 +1007,6 @@ pub fn start_async_translation(tcx: TyCtxt,
metadata_config.time_passes = false;
allocator_config.time_passes = false;

let client = sess.jobserver_from_env.clone().unwrap_or_else(|| {
// Pick a "reasonable maximum" if we don't otherwise have a jobserver in
// our environment, capping out at 32 so we don't take everything down
// by hogging the process run queue.
Client::new(32).expect("failed to create jobserver")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@alexcrichton, do you remember why we picked 32 instead of num_cpus here?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah yes that has to do with deterministic compilation. With num_cpus then you can have different results across machines from the sheer fact that the number of cpus were different. With 32, however, it's deterministic across all machines.

});

let (shared_emitter, shared_emitter_main) = SharedEmitter::new();
let (trans_worker_send, trans_worker_receive) = channel();

Expand All @@ -1023,7 +1016,7 @@ pub fn start_async_translation(tcx: TyCtxt,
trans_worker_send,
coordinator_receive,
total_cgus,
client,
sess.jobserver.clone(),
time_graph.clone(),
Arc::new(modules_config),
Arc::new(metadata_config),
Expand Down