Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2025-01-28 04:45:05 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge #2901

Browse source 
2901: Cancel requests during shutdown r=matklad a=matklad



Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
This commit is contained in:
bors[bot] 2020-01-24 15:37:11 +00:00 committed by GitHub
commit c6dbf406a9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
crates/ra_ide/src/change.rs
View file

@ -166,13 +166,15 @@ impl LibraryData {
const GC_COOLDOWN: time::Duration = time::Duration::from_millis(100); const GC_COOLDOWN: time::Duration = time::Duration::from_millis(100);
impl RootDatabase { impl RootDatabase {
pub(crate) fn request_cancellation(&mut self) {
let _p = profile("RootDatabase::request_cancellation");
self.salsa_runtime_mut().synthetic_write(Durability::LOW);
}
pub(crate) fn apply_change(&mut self, change: AnalysisChange) { pub(crate) fn apply_change(&mut self, change: AnalysisChange) {
let _p = profile("RootDatabase::apply_change"); let _p = profile("RootDatabase::apply_change");
self.request_cancellation();
log::info!("apply_change {:?}", change); log::info!("apply_change {:?}", change);
{
let _p = profile("RootDatabase::apply_change/cancellation");
self.salsa_runtime_mut().synthetic_write(Durability::LOW);
}
if !change.new_roots.is_empty() { if !change.new_roots.is_empty() {
let mut local_roots = Vec::clone(&self.local_roots()); let mut local_roots = Vec::clone(&self.local_roots());
for (root_id, is_local) in change.new_roots { for (root_id, is_local) in change.new_roots {

3
crates/ra_ide/src/lib.rs
View file

@ -202,6 +202,9 @@ impl AnalysisHost {
pub fn per_query_memory_usage(&mut self) -> Vec<(String, ra_prof::Bytes)> { pub fn per_query_memory_usage(&mut self) -> Vec<(String, ra_prof::Bytes)> {
self.db.per_query_memory_usage() self.db.per_query_memory_usage()
} }
pub fn request_cancellation(&mut self) {
self.db.request_cancellation();
}
pub fn raw_database( pub fn raw_database(
&self, &self,
) -> &(impl hir::db::HirDatabase + salsa::Database + ra_db::SourceDatabaseExt) { ) -> &(impl hir::db::HirDatabase + salsa::Database + ra_db::SourceDatabaseExt) {

2
crates/ra_lsp_server/src/main_loop.rs
View file

@ -210,7 +210,7 @@ pub fn main_loop(
)?; )?;
} }
} }
world_state.analysis_host.request_cancellation();
log::info!("waiting for tasks to finish..."); log::info!("waiting for tasks to finish...");
task_receiver.into_iter().for_each(|task| { task_receiver.into_iter().for_each(|task| {
on_task(task, &connection.sender, &mut loop_state.pending_requests, &mut world_state) on_task(task, &connection.sender, &mut loop_state.pending_requests, &mut world_state)