Skip to content

Commit ce8400b

Browse files
committed
internal: drop latest requests tracking
From the dawn of time, when dinosaurs roamed the and we didn't have hierarchical profiling, there was the `latest_requests` infra we used to track the time of ten last requests. Today, no one is actually using it and, what's more, it itself became pretty useless -- LSP grew way more chatty, and 10 requests don't really paint any kind of picture. Personally, it's been years since I last looked at latest requests in the status output. So, let's remove a tiny bit of state from the big ball of complexity that is `GlobalState` and `main_loop`!
1 parent d064849 commit ce8400b

File tree

4 files changed

+1
-53
lines changed

4 files changed

+1
-53
lines changed

crates/rust-analyzer/src/global_state.rs

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ use crate::{
2727
mem_docs::MemDocs,
2828
op_queue::OpQueue,
2929
reload::SourceRootConfig,
30-
request_metrics::{LatestRequests, RequestMetrics},
3130
thread_pool::TaskPool,
3231
to_proto::url_from_abs_path,
3332
Result,
@@ -105,16 +104,13 @@ pub(crate) struct GlobalState {
105104
OpQueue<(Arc<Vec<ProjectWorkspace>>, Vec<anyhow::Result<WorkspaceBuildScripts>>)>,
106105

107106
pub(crate) prime_caches_queue: OpQueue<()>,
108-
109-
latest_requests: Arc<RwLock<LatestRequests>>,
110107
}
111108

112109
/// An immutable snapshot of the world's state at a point in time.
113110
pub(crate) struct GlobalStateSnapshot {
114111
pub(crate) config: Arc<Config>,
115112
pub(crate) analysis: Analysis,
116113
pub(crate) check_fixes: CheckFixes,
117-
pub(crate) latest_requests: Arc<RwLock<LatestRequests>>,
118114
mem_docs: MemDocs,
119115
pub(crate) semantic_tokens_cache: Arc<Mutex<FxHashMap<Url, SemanticTokens>>>,
120116
vfs: Arc<RwLock<(vfs::Vfs, FxHashMap<FileId, LineEndings>)>>,
@@ -169,7 +165,6 @@ impl GlobalState {
169165
prime_caches_queue: OpQueue::default(),
170166

171167
fetch_build_data_queue: OpQueue::default(),
172-
latest_requests: Default::default(),
173168
};
174169
// Apply any required database inputs from the config.
175170
this.update_configuration(config);
@@ -230,7 +225,6 @@ impl GlobalState {
230225
workspaces: Arc::clone(&self.workspaces),
231226
analysis: self.analysis_host.analysis(),
232227
vfs: Arc::clone(&self.vfs),
233-
latest_requests: Arc::clone(&self.latest_requests),
234228
check_fixes: Arc::clone(&self.diagnostics.check_fixes),
235229
mem_docs: self.mem_docs.clone(),
236230
semantic_tokens_cache: Arc::clone(&self.semantic_tokens_cache),
@@ -270,9 +264,7 @@ impl GlobalState {
270264
pub(crate) fn respond(&mut self, response: lsp_server::Response) {
271265
if let Some((method, start)) = self.req_queue.incoming.complete(response.id.clone()) {
272266
let duration = start.elapsed();
273-
log::info!("handled req#{} in {:?}", response.id, duration);
274-
let metrics = RequestMetrics { id: response.id.clone(), method, duration };
275-
self.latest_requests.write().record(metrics);
267+
log::info!("handled {} - ({}) in {:0.2?}", method, response.id, duration);
276268
self.send(response.into());
277269
}
278270
}

crates/rust-analyzer/src/handlers.rs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -79,12 +79,6 @@ pub(crate) fn handle_analyzer_status(
7979
.status(file_id)
8080
.unwrap_or_else(|_| "Analysis retrieval was cancelled".to_owned()),
8181
);
82-
format_to!(buf, "\n\nRequests:\n");
83-
let requests = snap.latest_requests.read();
84-
for (is_last, r) in requests.iter() {
85-
let mark = if is_last { "*" } else { " " };
86-
format_to!(buf, "{}{:4} {:<36}{}ms\n", mark, r.id, r.method, r.duration.as_millis());
87-
}
8882
Ok(buf)
8983
}
9084

crates/rust-analyzer/src/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ mod semantic_tokens;
3030
mod markdown;
3131
mod diagnostics;
3232
mod line_index;
33-
mod request_metrics;
3433
mod lsp_utils;
3534
mod thread_pool;
3635
mod mem_docs;

crates/rust-analyzer/src/request_metrics.rs

Lines changed: 0 additions & 37 deletions
This file was deleted.

0 commit comments

Comments
 (0)