Skip to content

avoid reentrant lock acquire when ThreadIds run out #87011

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 2 commits into from
Jul 10, 2021
Merged

avoid reentrant lock acquire when ThreadIds run out #87011

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2750d3a
avoid reentrant lock acquire when ThreadIds run out
RalfJung Jul 9, 2021
dbc2b55
rename variable
RalfJung Jul 10, 2021
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
3 changes: 2 additions & 1 deletion library/std/src/thread/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -999,11 +999,12 @@ impl ThreadId {
static mut COUNTER: u64 = 1;

unsafe {
let _guard = GUARD.lock();
let guard = GUARD.lock();

// If we somehow use up all our bits, panic so that we're not
// covering up subtle bugs of IDs being reused.
if COUNTER == u64::MAX {
drop(guard); // in case the panic handler ends up calling `ThreadId::new()`, avoid reentrant lock acquire.
panic!("failed to generate unique thread ID: bitspace exhausted");
}

Expand Down