mirrors/salsa
1
0
Fork 0
mirror of https://github.com/salsa-rs/salsa.git synced 2025-08-04 11:00:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Short-circuit block-on if same thread (#862)
Some checks failed
Test / Test (push) Has been cancelled
Details
Book / Book (push) Has been cancelled
Details
Release-plz / Release-plz release (push) Has been cancelled
Details
Release-plz / Release-plz PR (push) Has been cancelled
Details
Test / Miri (push) Has been cancelled
Details
Test / Benchmarks (push) Has been cancelled
Details
Book / Deploy (push) Has been cancelled
Details

Browse source 
* Short-circuit `block_on` if same thread

* Avoid acquiring the lock
This commit is contained in:
Micha Reiser 2025-05-22 11:26:17 +02:00 • committed by GitHub
parent 18dc594dea
commit 678f51a745
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/runtime.rs
View file

@ -172,8 +172,13 @@ impl Runtime {
other_id: ThreadId, other_id: ThreadId,
query_mutex_guard: QueryMutexGuard, query_mutex_guard: QueryMutexGuard,
) -> BlockResult { ) -> BlockResult {
let dg = self.dependency_graph.lock();
let thread_id = thread::current().id(); let thread_id = thread::current().id();
// Cycle in the same thread.
if thread_id == other_id {
return BlockResult::Cycle;
}
let dg = self.dependency_graph.lock();
if dg.depends_on(other_id, thread_id) { if dg.depends_on(other_id, thread_id) {
return BlockResult::Cycle; return BlockResult::Cycle;