-
-
Notifications
You must be signed in to change notification settings - Fork 2.5k
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.
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
rt: use internal ThreadId implementation #5184
Closed
Closed
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
e92981f
rt: use internal ThreadId implementation
carllerche fbae620
cirrus rust backtrace
carllerche c3302ea
try to get more info
carllerche 5fc8ecc
try without threads
carllerche c43f0ea
add cfg back
carllerche 3241006
try to fix CI
carllerche File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,46 @@ | ||
use std::num::NonZeroU64; | ||
|
||
#[derive(Eq, PartialEq, Clone, Copy, Hash, Debug)] | ||
pub(crate) struct ThreadId(NonZeroU64); | ||
|
||
impl ThreadId { | ||
cfg_has_atomic_u64! { | ||
pub(crate) fn new() -> ThreadId { | ||
use std::sync::atomic::{AtomicU64, Ordering::Relaxed}; | ||
|
||
static COUNTER: AtomicU64 = AtomicU64::new(0); | ||
|
||
let mut last = COUNTER.load(Relaxed); | ||
loop { | ||
let id = match last.checked_add(1) { | ||
Some(id) => id, | ||
None => exhausted(), | ||
}; | ||
|
||
match COUNTER.compare_exchange_weak(last, id, Relaxed, Relaxed) { | ||
Ok(_) => return ThreadId(NonZeroU64::new(id).unwrap()), | ||
Err(id) => last = id, | ||
} | ||
} | ||
} | ||
} | ||
|
||
cfg_not_has_atomic_u64! { | ||
cfg_has_const_mutex_new! { | ||
pub(crate) fn new() -> ThreadId { | ||
todo!(); | ||
} | ||
} | ||
|
||
cfg_not_has_const_mutex_new! { | ||
pub(crate) fn new() -> ThreadId { | ||
todo!(); | ||
} | ||
} | ||
} | ||
} | ||
|
||
#[cold] | ||
fn exhausted() -> ! { | ||
panic!("failed to generate unique thread ID: bitspace exhausted") | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It seems to me that doing the same as in
list.rs
would be sufficient here.tokio/tokio/src/runtime/task/list.rs
Lines 17 to 54 in fbae620
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We do use the thread ID for correctness on top of the debug checks. It seems riskier, in that case, to fall back to u32.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
IIRC
std
's thread IDs use a mutex on 32-bit targets, but I'd have to double check to make sure...edit: oh, i see that that's not actually what this conversation was about, my bad.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Where do we use it for correctness?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
https://github.com/tokio-rs/tokio/blob/master/tokio/src/task/local.rs#L952