mirrors/salsa
1
0
Fork 0
mirror of https://github.com/salsa-rs/salsa.git synced 2025-02-08 21:35:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update components/salsa-2022/src/storage.rs

Browse source
This commit is contained in:
Niko Matsakis 2024-04-02 06:15:43 -04:00 committed by GitHub
parent 998bcf606a
commit 9deaf3e149
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
components/salsa-2022/src/storage.rs
View file

@ -139,7 +139,14 @@ where
loop { loop {
self.runtime.set_cancellation_flag(); self.runtime.set_cancellation_flag();
// jars need to be protected by a lock to avoid deadlocks. // Acquire lock before we check if we have unique access to the jars.
// If we do not yet have unique access, we will go to sleep and wait for
// the snapshots to be dropped, which will signal the cond var associated
// with this lock.
//
// NB: We have to acquire the lock first to ensure that we can check for
// unique access and go to sleep waiting on the condvar atomically,
// as described in PR #474.
let mut guard = self.shared.noti_lock.lock(); let mut guard = self.shared.noti_lock.lock();
// If we have unique access to the jars, we are done. // If we have unique access to the jars, we are done.
if Arc::get_mut(self.shared.jars.as_mut().unwrap()).is_some() { if Arc::get_mut(self.shared.jars.as_mut().unwrap()).is_some() {