Skip to content

internal: Do not drop ExpansionSpanMap and AstIdMap asynchronously #22258

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
ChayimFriedman2 wants to merge 1 commit into
base: master
Choose a base branch
from
+0 −75
Open

internal: Do not drop ExpansionSpanMap and AstIdMap asynchronously #22258

Show file tree
Hide file tree
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
42 changes: 0 additions & 42 deletions crates/span/src/ast_id.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -810,48 +810,6 @@ impl AstIdMap {
}
}

#[cfg(not(no_salsa_async_drops))]
impl Drop for AstIdMap {
fn drop(&mut self) {
let arena = std::mem::take(&mut self.arena);
let ptr_map = std::mem::take(&mut self.ptr_map);
let id_map = std::mem::take(&mut self.id_map);
static AST_ID_MAP_DROP_THREAD: std::sync::OnceLock<
std::sync::mpsc::Sender<(
Arena<(SyntaxNodePtr, ErasedFileAstId)>,
hashbrown::HashTable<ArenaId>,
hashbrown::HashTable<ArenaId>,
)>,
> = std::sync::OnceLock::new();
AST_ID_MAP_DROP_THREAD
.get_or_init(|| {
let (sender, receiver) = std::sync::mpsc::channel::<(
Arena<(SyntaxNodePtr, ErasedFileAstId)>,
hashbrown::HashTable<ArenaId>,
hashbrown::HashTable<ArenaId>,
)>();
std::thread::Builder::new()
.name("AstIdMapDropper".to_owned())
.spawn(move || {
loop {
// block on a receive
_ = receiver.recv();
// then drain the entire channel
while receiver.try_recv().is_ok() {}
// and sleep for a bit
std::thread::sleep(std::time::Duration::from_millis(100));
}
// why do this over just a `receiver.iter().for_each(drop)`? To reduce contention on the channel lock.
// otherwise this thread will constantly wake up and sleep again.
})
.unwrap();
sender
})
.send((arena, ptr_map, id_map))
.unwrap();
}
}

#[inline]
fn hash_ptr(ptr: &SyntaxNodePtr) -> u64 {
FxBuildHasher.hash_one(ptr)
Expand Down
33 changes: 0 additions & 33 deletions crates/span/src/map.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,39 +150,6 @@ impl SpanMap {
}
}

#[cfg(not(no_salsa_async_drops))]
impl Drop for SpanMap {
fn drop(&mut self) {
let spans = std::mem::take(&mut self.spans);
static SPAN_MAP_DROP_THREAD: std::sync::OnceLock<
std::sync::mpsc::Sender<Vec<(TextSize, Span)>>,
> = std::sync::OnceLock::new();

SPAN_MAP_DROP_THREAD
.get_or_init(|| {
let (sender, receiver) = std::sync::mpsc::channel::<Vec<(TextSize, Span)>>();
std::thread::Builder::new()
.name("SpanMapDropper".to_owned())
.spawn(move || {
loop {
// block on a receive
_ = receiver.recv();
// then drain the entire channel
while receiver.try_recv().is_ok() {}
// and sleep for a bit
std::thread::sleep(std::time::Duration::from_millis(100));
}
// why do this over just a `receiver.iter().for_each(drop)`? To reduce contention on the channel lock.
// otherwise this thread will constantly wake up and sleep again.
})
.unwrap();
sender
})
.send(spans)
.unwrap();
}
}

#[derive(PartialEq, Eq, Hash, Debug)]
pub struct RealSpanMap {
file_id: EditionedFileId,
Expand Down