mirrors/salsa
1
0
Fork 0
mirror of https://github.com/salsa-rs/salsa.git synced 2025-01-23 13:10:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

rename fn: query may be in same thread

Browse source
This commit is contained in:
Niko Matsakis 2021-11-02 05:44:52 -04:00
parent 006848a8cc
commit 187de0f280
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/derived/slot.rs
View file

@ -337,7 +337,7 @@ where
// not to gate future atomic reads.
anyone_waiting.store(true, Ordering::Relaxed);
match self.block_on_in_progress_thread(db, runtime, other_id, state) {
match self.try_block_on_in_progress_query(db, runtime, other_id, state) {
Ok(WaitResult::Panicked) => Cancelled::PropagatedPanic.throw(),
Ok(WaitResult::Completed) => ProbeState::Retry,
Err(CycleDetected {
@ -568,7 +568,7 @@ where
/// that work completes. This helper does that. If a cycle is detected,
/// it returns immediately, but otherwise it blocks `self.database_key_index`
/// has completed and returns the corresponding result.
fn block_on_in_progress_thread<MutexGuard>(
fn try_block_on_in_progress_query<MutexGuard>(
&self,
db: &<Q as QueryDb<'_>>::DynDb,
runtime: &Runtime,