danvics/oxipng
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Try to fix deadlock in parallel mode

Browse source
This commit is contained in:
Andrew 2023-06-19 22:34:34 +12:00 committed by Josh Holmer
parent 798fdfe24c
commit 129f1e6f76
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/evaluate.rs
View file

@ -85,7 +85,10 @@ impl Evaluator {
#[cfg(feature = "parallel")] #[cfg(feature = "parallel")]
pub fn get_best_candidate(self) -> Option<Candidate> { pub fn get_best_candidate(self) -> Option<Candidate> {
let (eval_send, eval_recv) = self.eval_channel; let (eval_send, eval_recv) = self.eval_channel;
drop(eval_send); // disconnect the sender, breaking the loop in the thread // Disconnect the sender, breaking the loop in the thread
drop(eval_send);
// Yield to ensure evaluations are finished - this can prevent deadlocks when run within an existing thread pool
while let Some(rayon::Yield::Executed) = rayon::yield_local() {}
eval_recv.into_iter().min_by_key(Candidate::cmp_key) eval_recv.into_iter().min_by_key(Candidate::cmp_key)
} }