aboutsummaryrefslogtreecommitdiff
path: root/crates
diff options
context:
space:
mode:
authorbors[bot] <26634292+bors[bot]@users.noreply.github.com>2019-07-12 16:05:28 +0100
committerbors[bot] <26634292+bors[bot]@users.noreply.github.com>2019-07-12 16:05:28 +0100
commit2e466bb365813620de15afd5e04736a92fffdca9 (patch)
treea2c5c2cdd589112e7c87c253a15ed6f32ab4be42 /crates
parent48f90a9e3faf90751ef6d1ba9ba8620a9d1797c2 (diff)
parente40494c6c1cc17eeb8bc43e1d3ad0ce82c39f6d1 (diff)
Merge #1523
1523: account for dependencies when showing memory usage r=matklad a=matklad Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates')
-rw-r--r--crates/ra_cli/src/analysis_stats.rs4
-rw-r--r--crates/ra_ide_api/src/change.rs7
2 files changed, 11 insertions, 0 deletions
diff --git a/crates/ra_cli/src/analysis_stats.rs b/crates/ra_cli/src/analysis_stats.rs
index b8ad6aebc..c2a2b66d5 100644
--- a/crates/ra_cli/src/analysis_stats.rs
+++ b/crates/ra_cli/src/analysis_stats.rs
@@ -115,9 +115,13 @@ pub fn run(verbose: bool, memory_usage: bool, path: &Path, only: Option<&str>) -
115 println!("Analysis: {:?}, {}", analysis_time.elapsed(), ra_prof::memory_usage()); 115 println!("Analysis: {:?}, {}", analysis_time.elapsed(), ra_prof::memory_usage());
116 116
117 if memory_usage { 117 if memory_usage {
118 drop(db);
118 for (name, bytes) in host.per_query_memory_usage() { 119 for (name, bytes) in host.per_query_memory_usage() {
119 println!("{:>8} {}", bytes, name) 120 println!("{:>8} {}", bytes, name)
120 } 121 }
122 let before = ra_prof::memory_usage();
123 drop(host);
124 println!("leftover: {}", before.allocated - ra_prof::memory_usage().allocated)
121 } 125 }
122 126
123 Ok(()) 127 Ok(())
diff --git a/crates/ra_ide_api/src/change.rs b/crates/ra_ide_api/src/change.rs
index efc9a92de..179f17ca4 100644
--- a/crates/ra_ide_api/src/change.rs
+++ b/crates/ra_ide_api/src/change.rs
@@ -252,6 +252,13 @@ impl RootDatabase {
252 let q: $q = Default::default(); 252 let q: $q = Default::default();
253 let name = format!("{:?}", q); 253 let name = format!("{:?}", q);
254 acc.push((name, before - after)); 254 acc.push((name, before - after));
255
256 let before = memory_usage().allocated;
257 self.query($q).sweep(sweep.discard_everything());
258 let after = memory_usage().allocated;
259 let q: $q = Default::default();
260 let name = format!("{:?} (deps)", q);
261 acc.push((name, before - after));
255 )*} 262 )*}
256 } 263 }
257 sweep_each_query![ 264 sweep_each_query![