Skip to content
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

Jump to bottom

Simplify AtomicCell LOCKS #722

Merged
merged 3 commits into from Jul 25, 2021
Merged

Simplify AtomicCell LOCKS #722

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b1a24d3
Use `array-macro` to simplify `AtomicCell` `LOCKS`
Daniel-Bloom-dfinity Jul 25, 2021
b552900
remove `array!`, use const to shorten array.
Daniel-Bloom-dfinity Jul 25, 2021
cb4db4c
clippy
Daniel-Bloom-dfinity Jul 25, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
104 changes: 6 additions & 98 deletions crossbeam-utils/src/atomic/atomic_cell.rs
View file
Open in desktop
Expand Up @@ -683,105 +683,13 @@ fn lock(addr: usize) -> &'static SeqLock {
// stored at addresses that are multiples of 3. It'd be too bad if `LEN` was divisible by 3.
// In order to protect from such cases, we simply choose a large prime number for `LEN`.
const LEN: usize = 97;

#[allow(clippy::declare_interior_mutable_const)]
const L: SeqLock = SeqLock::new();
static LOCKS: [SeqLock; LEN] = [
SeqLock::new(),
SeqLock::new(),
SeqLock::new(),
SeqLock::new(),
SeqLock::new(),
SeqLock::new(),
SeqLock::new(),
SeqLock::new(),
SeqLock::new(),
SeqLock::new(),
SeqLock::new(),
SeqLock::new(),
SeqLock::new(),
SeqLock::new(),
SeqLock::new(),
SeqLock::new(),
SeqLock::new(),
SeqLock::new(),
SeqLock::new(),
SeqLock::new(),
SeqLock::new(),
SeqLock::new(),
SeqLock::new(),
SeqLock::new(),
SeqLock::new(),
SeqLock::new(),
SeqLock::new(),
SeqLock::new(),
SeqLock::new(),
SeqLock::new(),
SeqLock::new(),
SeqLock::new(),
SeqLock::new(),
SeqLock::new(),
SeqLock::new(),
SeqLock::new(),
SeqLock::new(),
SeqLock::new(),
SeqLock::new(),
SeqLock::new(),
SeqLock::new(),
SeqLock::new(),
SeqLock::new(),
SeqLock::new(),
SeqLock::new(),
SeqLock::new(),
SeqLock::new(),
SeqLock::new(),
SeqLock::new(),
SeqLock::new(),
SeqLock::new(),
SeqLock::new(),
SeqLock::new(),
SeqLock::new(),
SeqLock::new(),
SeqLock::new(),
SeqLock::new(),
SeqLock::new(),
SeqLock::new(),
SeqLock::new(),
SeqLock::new(),
SeqLock::new(),
SeqLock::new(),
SeqLock::new(),
SeqLock::new(),
SeqLock::new(),
SeqLock::new(),
SeqLock::new(),
SeqLock::new(),
SeqLock::new(),
SeqLock::new(),
SeqLock::new(),
SeqLock::new(),
SeqLock::new(),
SeqLock::new(),
SeqLock::new(),
SeqLock::new(),
SeqLock::new(),
SeqLock::new(),
SeqLock::new(),
SeqLock::new(),
SeqLock::new(),
SeqLock::new(),
SeqLock::new(),
SeqLock::new(),
SeqLock::new(),
SeqLock::new(),
SeqLock::new(),
SeqLock::new(),
SeqLock::new(),
SeqLock::new(),
SeqLock::new(),
SeqLock::new(),
SeqLock::new(),
SeqLock::new(),
SeqLock::new(),
SeqLock::new(),
L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L,
L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L,
L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L,
L, L, L, L, L, L, L,
];

// If the modulus is a constant number, the compiler will use crazy math to transform this into
Expand Down