Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2025-01-16 07:03:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #15067 - Veykril:loop-turn-msgh, r=Veykril

Browse source 
internal: Add more context to overly long loop turn message
This commit is contained in:
bors 2023-06-16 17:31:37 +00:00
commit a5a71c75e6
2 changed files with 29 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
crates/rust-analyzer/src/dispatch.rs
View file

@ -307,7 +307,7 @@ pub(crate) struct NotificationDispatcher<'a> {
} }
impl<'a> NotificationDispatcher<'a> { impl<'a> NotificationDispatcher<'a> {
pub(crate) fn on<N>( pub(crate) fn on_sync_mut<N>(
&mut self, &mut self,
f: fn(&mut GlobalState, N::Params) -> Result<()>, f: fn(&mut GlobalState, N::Params) -> Result<()>,
) -> Result<&mut Self> ) -> Result<&mut Self>

44
crates/rust-analyzer/src/main_loop.rs
View file

@ -11,6 +11,7 @@ use flycheck::FlycheckHandle;
use ide_db::base_db::{SourceDatabaseExt, VfsPath}; use ide_db::base_db::{SourceDatabaseExt, VfsPath};
use lsp_server::{Connection, Notification, Request}; use lsp_server::{Connection, Notification, Request};
use lsp_types::notification::Notification as _; use lsp_types::notification::Notification as _;
use stdx::thread::ThreadIntent;
use triomphe::Arc; use triomphe::Arc;
use vfs::FileId; use vfs::FileId;
@ -282,6 +283,7 @@ impl GlobalState {
} }
} }
} }
let event_handling_duration = loop_start.elapsed();
let state_changed = self.process_changes(); let state_changed = self.process_changes();
let memdocs_added_or_removed = self.mem_docs.take_changes(); let memdocs_added_or_removed = self.mem_docs.take_changes();
@ -392,9 +394,9 @@ impl GlobalState {
let loop_duration = loop_start.elapsed(); let loop_duration = loop_start.elapsed();
if loop_duration > Duration::from_millis(100) && was_quiescent { if loop_duration > Duration::from_millis(100) && was_quiescent {
tracing::warn!("overly long loop turn took {loop_duration:?}: {event_dbg_msg}"); tracing::warn!("overly long loop turn took {loop_duration:?} (event handling took {event_handling_duration:?}): {event_dbg_msg}");
self.poke_rust_analyzer_developer(format!( self.poke_rust_analyzer_developer(format!(
"overly long loop turn took {loop_duration:?}: {event_dbg_msg}" "overly long loop turn took {loop_duration:?} (event handling took {event_handling_duration:?}): {event_dbg_msg}"
)); ));
} }
Ok(()) Ok(())
@ -404,7 +406,7 @@ impl GlobalState {
tracing::debug!(%cause, "will prime caches"); tracing::debug!(%cause, "will prime caches");
let num_worker_threads = self.config.prime_caches_num_threads(); let num_worker_threads = self.config.prime_caches_num_threads();
self.task_pool.handle.spawn_with_sender(stdx::thread::ThreadIntent::Worker, { self.task_pool.handle.spawn_with_sender(ThreadIntent::Worker, {
let analysis = self.snapshot().analysis; let analysis = self.snapshot().analysis;
move |sender| { move |sender| {
sender.send(Task::PrimeCaches(PrimeCachesProgress::Begin)).unwrap(); sender.send(Task::PrimeCaches(PrimeCachesProgress::Begin)).unwrap();
@ -761,18 +763,28 @@ impl GlobalState {
use lsp_types::notification as notifs; use lsp_types::notification as notifs;
NotificationDispatcher { not: Some(not), global_state: self } NotificationDispatcher { not: Some(not), global_state: self }
.on::<notifs::Cancel>(handlers::handle_cancel)? .on_sync_mut::<notifs::Cancel>(handlers::handle_cancel)?
.on::<notifs::WorkDoneProgressCancel>(handlers::handle_work_done_progress_cancel)? .on_sync_mut::<notifs::WorkDoneProgressCancel>(
.on::<notifs::DidOpenTextDocument>(handlers::handle_did_open_text_document)? handlers::handle_work_done_progress_cancel,
.on::<notifs::DidChangeTextDocument>(handlers::handle_did_change_text_document)? )?
.on::<notifs::DidCloseTextDocument>(handlers::handle_did_close_text_document)? .on_sync_mut::<notifs::DidOpenTextDocument>(handlers::handle_did_open_text_document)?
.on::<notifs::DidSaveTextDocument>(handlers::handle_did_save_text_document)? .on_sync_mut::<notifs::DidChangeTextDocument>(
.on::<notifs::DidChangeConfiguration>(handlers::handle_did_change_configuration)? handlers::handle_did_change_text_document,
.on::<notifs::DidChangeWorkspaceFolders>(handlers::handle_did_change_workspace_folders)? )?
.on::<notifs::DidChangeWatchedFiles>(handlers::handle_did_change_watched_files)? .on_sync_mut::<notifs::DidCloseTextDocument>(handlers::handle_did_close_text_document)?
.on::<lsp_ext::CancelFlycheck>(handlers::handle_cancel_flycheck)? .on_sync_mut::<notifs::DidSaveTextDocument>(handlers::handle_did_save_text_document)?
.on::<lsp_ext::ClearFlycheck>(handlers::handle_clear_flycheck)? .on_sync_mut::<notifs::DidChangeConfiguration>(
.on::<lsp_ext::RunFlycheck>(handlers::handle_run_flycheck)? handlers::handle_did_change_configuration,
)?
.on_sync_mut::<notifs::DidChangeWorkspaceFolders>(
handlers::handle_did_change_workspace_folders,
)?
.on_sync_mut::<notifs::DidChangeWatchedFiles>(
handlers::handle_did_change_watched_files,
)?
.on_sync_mut::<lsp_ext::CancelFlycheck>(handlers::handle_cancel_flycheck)?
.on_sync_mut::<lsp_ext::ClearFlycheck>(handlers::handle_clear_flycheck)?
.on_sync_mut::<lsp_ext::RunFlycheck>(handlers::handle_run_flycheck)?
.finish(); .finish();
Ok(()) Ok(())
} }
@ -800,7 +812,7 @@ impl GlobalState {
// Diagnostics are triggered by the user typing // Diagnostics are triggered by the user typing
// so we run them on a latency sensitive thread. // so we run them on a latency sensitive thread.
self.task_pool.handle.spawn(stdx::thread::ThreadIntent::LatencySensitive, move || { self.task_pool.handle.spawn(ThreadIntent::LatencySensitive, move || {
let _p = profile::span("publish_diagnostics"); let _p = profile::span("publish_diagnostics");
let _ctx = stdx::panic_context::enter("publish_diagnostics".to_owned()); let _ctx = stdx::panic_context::enter("publish_diagnostics".to_owned());
let diagnostics = subscriptions let diagnostics = subscriptions