Skip to content

fix(watcher): release DashMap guard before insert to stop file-event deadlock #83

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

Open
hindog wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(watcher): release DashMap guard before insert to stop file-event deadlock #83

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
38 changes: 25 additions & 13 deletions crates/codegraph-parser/src/watcher.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -383,21 +383,33 @@ impl FileSystemWatcher {
if let Ok(new_metadata) =
Self::create_file_metadata_static(&path, language_registry).await
{
if let Some(old_metadata) = file_registry.get(&file_id) {
let old_metadata = old_metadata.value().clone();
if old_metadata.content_hash != new_metadata.content_hash {
// Clone out of the registry in a single statement so the
// DashMap read guard is dropped before the insert below.
// Holding a `Ref` across `insert` deadlocks the task: the
// insert needs a write lock on the very shard the guard is
// read-locking, and nothing will ever release it.
let previous = file_registry
.get(&file_id)
.map(|entry| entry.value().clone());

match previous {
Some(old_metadata) => {
if old_metadata.content_hash != new_metadata.content_hash {
file_registry
.insert(file_id.clone(), new_metadata.clone());
let _ = event_sender.send(FileChangeEvent::Modified(
file_id,
new_metadata,
old_metadata,
));
}
}
None => {
// File wasn't tracked before, treat as creation
file_registry.insert(file_id.clone(), new_metadata.clone());
let _ = event_sender.send(FileChangeEvent::Modified(
file_id,
new_metadata,
old_metadata,
));
let _ = event_sender
.send(FileChangeEvent::Created(file_id, new_metadata));
}
} else {
// File wasn't tracked before, treat as creation
file_registry.insert(file_id.clone(), new_metadata.clone());
let _ = event_sender
.send(FileChangeEvent::Created(file_id, new_metadata));
}
}
}
Expand Down