mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rollup merge of #114359 - ttsugriy:barrier-simpl, r=cuviper

Browse Source 
[library/std] Replace condv while loop with `cvar.wait_while`.

`wait_while` takes care of spurious wake-ups in centralized place, reducing chances for mistakes and potential future optimizations (who knows, maybe in future there will be no spurious wake-ups? :)
This commit is contained in:
Michael Goulet 2023-08-10 21:17:37 -07:00 committed by GitHub
commit 5da7f36485
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
library/std/src/sync/barrier.rs
View File

@ -130,11 +130,8 @@ pub fn wait(&self) -> BarrierWaitResult {
let local_gen = lock.generation_id; let local_gen = lock.generation_id;
lock.count += 1; lock.count += 1;
if lock.count < self.num_threads { if lock.count < self.num_threads {
// We need a while loop to guard against spurious wakeups. let _guard =
// https://en.wikipedia.org/wiki/Spurious_wakeup self.cvar.wait_while(lock, |state| local_gen == state.generation_id).unwrap();
while local_gen == lock.generation_id {
lock = self.cvar.wait(lock).unwrap();
}
BarrierWaitResult(false) BarrierWaitResult(false)
} else { } else {
lock.count = 0; lock.count = 0;