Skip to content

Short-circuit block-on if same thread #862

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 22, 2025
Merged

Short-circuit block-on if same thread #862

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a317cdd
Short-circuit `block_on` if same thread
MichaReiser May 15, 2025
c749645
Avoid acquiring the lock
MichaReiser May 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion src/runtime.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,8 +172,13 @@ impl Runtime {
other_id: ThreadId,
query_mutex_guard: QueryMutexGuard,
) -> BlockResult {
let dg = self.dependency_graph.lock();
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) {
return BlockResult::Cycle;
Expand Down