aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Cargo.lock3
-rw-r--r--crates/ra_cli/Cargo.toml1
-rw-r--r--crates/ra_cli/src/main.rs7
-rw-r--r--crates/ra_hir/Cargo.toml1
-rw-r--r--crates/ra_hir/src/nameres.rs4
-rw-r--r--crates/ra_lsp_server/Cargo.toml1
-rw-r--r--crates/ra_lsp_server/src/main.rs10
-rw-r--r--crates/ra_lsp_server/src/main_loop.rs7
-rw-r--r--crates/ra_prof/src/lib.rs6
9 files changed, 30 insertions, 10 deletions
diff --git a/Cargo.lock b/Cargo.lock
index 5d68105f6..7c07bddf9 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -930,6 +930,7 @@ dependencies = [
930 "ra_hir 0.1.0", 930 "ra_hir 0.1.0",
931 "ra_ide_api 0.1.0", 931 "ra_ide_api 0.1.0",
932 "ra_ide_api_light 0.1.0", 932 "ra_ide_api_light 0.1.0",
933 "ra_prof 0.1.0",
933 "ra_syntax 0.1.0", 934 "ra_syntax 0.1.0",
934 "tools 0.1.0", 935 "tools 0.1.0",
935] 936]
@@ -969,6 +970,7 @@ dependencies = [
969 "ra_arena 0.1.0", 970 "ra_arena 0.1.0",
970 "ra_db 0.1.0", 971 "ra_db 0.1.0",
971 "ra_mbe 0.1.0", 972 "ra_mbe 0.1.0",
973 "ra_prof 0.1.0",
972 "ra_syntax 0.1.0", 974 "ra_syntax 0.1.0",
973 "ra_tt 0.1.0", 975 "ra_tt 0.1.0",
974 "relative-path 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", 976 "relative-path 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1034,6 +1036,7 @@ dependencies = [
1034 "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", 1036 "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
1035 "ra_arena 0.1.0", 1037 "ra_arena 0.1.0",
1036 "ra_ide_api 0.1.0", 1038 "ra_ide_api 0.1.0",
1039 "ra_prof 0.1.0",
1037 "ra_project_model 0.1.0", 1040 "ra_project_model 0.1.0",
1038 "ra_syntax 0.1.0", 1041 "ra_syntax 0.1.0",
1039 "ra_text_edit 0.1.0", 1042 "ra_text_edit 0.1.0",
diff --git a/crates/ra_cli/Cargo.toml b/crates/ra_cli/Cargo.toml
index 4c666f556..a92a63257 100644
--- a/crates/ra_cli/Cargo.toml
+++ b/crates/ra_cli/Cargo.toml
@@ -19,3 +19,4 @@ tools = { path = "../tools" }
19ra_batch = { path = "../ra_batch" } 19ra_batch = { path = "../ra_batch" }
20ra_hir = { path = "../ra_hir" } 20ra_hir = { path = "../ra_hir" }
21ra_db = { path = "../ra_db" } 21ra_db = { path = "../ra_db" }
22ra_prof = { path = "../ra_prof" }
diff --git a/crates/ra_cli/src/main.rs b/crates/ra_cli/src/main.rs
index 5285f1f28..c13c7910c 100644
--- a/crates/ra_cli/src/main.rs
+++ b/crates/ra_cli/src/main.rs
@@ -1,6 +1,6 @@
1mod analysis_stats; 1mod analysis_stats;
2 2
3use std::{fs, io::Read, path::Path, time::Instant}; 3use std::{fs, io::Read, path::Path};
4 4
5use clap::{App, Arg, SubCommand}; 5use clap::{App, Arg, SubCommand};
6use join_to_string::join; 6use join_to_string::join;
@@ -9,6 +9,7 @@ use ra_ide_api_light::file_structure;
9use ra_syntax::{SourceFile, TextRange, TreeArc, AstNode}; 9use ra_syntax::{SourceFile, TextRange, TreeArc, AstNode};
10use tools::collect_tests; 10use tools::collect_tests;
11use flexi_logger::Logger; 11use flexi_logger::Logger;
12use ra_prof::profile;
12 13
13type Result<T> = ::std::result::Result<T, failure::Error>; 14type Result<T> = ::std::result::Result<T, failure::Error>;
14 15
@@ -34,13 +35,11 @@ fn main() -> Result<()> {
34 .get_matches(); 35 .get_matches();
35 match matches.subcommand() { 36 match matches.subcommand() {
36 ("parse", Some(matches)) => { 37 ("parse", Some(matches)) => {
37 let start = Instant::now(); 38 let _p = profile("parsing");
38 let file = file()?; 39 let file = file()?;
39 let elapsed = start.elapsed();
40 if !matches.is_present("no-dump") { 40 if !matches.is_present("no-dump") {
41 println!("{}", file.syntax().debug_dump()); 41 println!("{}", file.syntax().debug_dump());
42 } 42 }
43 eprintln!("parsing: {:?}", elapsed);
44 ::std::mem::forget(file); 43 ::std::mem::forget(file);
45 } 44 }
46 ("symbols", _) => { 45 ("symbols", _) => {
diff --git a/crates/ra_hir/Cargo.toml b/crates/ra_hir/Cargo.toml
index 501308acc..a2858dad9 100644
--- a/crates/ra_hir/Cargo.toml
+++ b/crates/ra_hir/Cargo.toml
@@ -19,6 +19,7 @@ ra_db = { path = "../ra_db" }
19mbe = { path = "../ra_mbe", package = "ra_mbe" } 19mbe = { path = "../ra_mbe", package = "ra_mbe" }
20tt = { path = "../ra_tt", package = "ra_tt" } 20tt = { path = "../ra_tt", package = "ra_tt" }
21test_utils = { path = "../test_utils" } 21test_utils = { path = "../test_utils" }
22ra_prof = {path = "../ra_prof" }
22 23
23[dev-dependencies] 24[dev-dependencies]
24flexi_logger = "0.11.0" 25flexi_logger = "0.11.0"
diff --git a/crates/ra_hir/src/nameres.rs b/crates/ra_hir/src/nameres.rs
index d361cf9e6..5ac878c79 100644
--- a/crates/ra_hir/src/nameres.rs
+++ b/crates/ra_hir/src/nameres.rs
@@ -59,6 +59,7 @@ use rustc_hash::FxHashMap;
59use ra_arena::{Arena, RawId, impl_arena_id}; 59use ra_arena::{Arena, RawId, impl_arena_id};
60use ra_db::{FileId, Edition}; 60use ra_db::{FileId, Edition};
61use test_utils::tested_by; 61use test_utils::tested_by;
62use ra_prof::profile;
62 63
63use crate::{ 64use crate::{
64 ModuleDef, Name, Crate, Module, Problem, 65 ModuleDef, Name, Crate, Module, Problem,
@@ -197,7 +198,7 @@ enum ReachedFixedPoint {
197 198
198impl CrateDefMap { 199impl CrateDefMap {
199 pub(crate) fn crate_def_map_query(db: &impl DefDatabase, krate: Crate) -> Arc<CrateDefMap> { 200 pub(crate) fn crate_def_map_query(db: &impl DefDatabase, krate: Crate) -> Arc<CrateDefMap> {
200 let start = std::time::Instant::now(); 201 let _p = profile("crate_def_map_query");
201 let def_map = { 202 let def_map = {
202 let edition = krate.edition(db); 203 let edition = krate.edition(db);
203 let mut modules: Arena<CrateModuleId, ModuleData> = Arena::default(); 204 let mut modules: Arena<CrateModuleId, ModuleData> = Arena::default();
@@ -216,7 +217,6 @@ impl CrateDefMap {
216 } 217 }
217 }; 218 };
218 let def_map = collector::collect_defs(db, def_map); 219 let def_map = collector::collect_defs(db, def_map);
219 log::info!("crate_def_map_query: {:?}", start.elapsed());
220 Arc::new(def_map) 220 Arc::new(def_map)
221 } 221 }
222 222
diff --git a/crates/ra_lsp_server/Cargo.toml b/crates/ra_lsp_server/Cargo.toml
index d82410700..bc181e4eb 100644
--- a/crates/ra_lsp_server/Cargo.toml
+++ b/crates/ra_lsp_server/Cargo.toml
@@ -27,6 +27,7 @@ ra_ide_api = { path = "../ra_ide_api" }
27ra_arena = { path = "../ra_arena" } 27ra_arena = { path = "../ra_arena" }
28gen_lsp_server = { path = "../gen_lsp_server" } 28gen_lsp_server = { path = "../gen_lsp_server" }
29ra_project_model = { path = "../ra_project_model" } 29ra_project_model = { path = "../ra_project_model" }
30ra_prof = { path = "../ra_prof" }
30 31
31[dev-dependencies] 32[dev-dependencies]
32tempfile = "3" 33tempfile = "3"
diff --git a/crates/ra_lsp_server/src/main.rs b/crates/ra_lsp_server/src/main.rs
index 5a2905207..eb4091a3d 100644
--- a/crates/ra_lsp_server/src/main.rs
+++ b/crates/ra_lsp_server/src/main.rs
@@ -3,6 +3,7 @@ use flexi_logger::{Duplicate, Logger};
3use gen_lsp_server::{run_server, stdio_transport}; 3use gen_lsp_server::{run_server, stdio_transport};
4 4
5use ra_lsp_server::{Result, InitializationOptions}; 5use ra_lsp_server::{Result, InitializationOptions};
6use ra_prof;
6 7
7fn main() -> Result<()> { 8fn main() -> Result<()> {
8 ::std::env::set_var("RUST_BACKTRACE", "short"); 9 ::std::env::set_var("RUST_BACKTRACE", "short");
@@ -11,6 +12,15 @@ fn main() -> Result<()> {
11 Ok(ref v) if v == "1" => logger.log_to_file().directory("log").start()?, 12 Ok(ref v) if v == "1" => logger.log_to_file().directory("log").start()?,
12 _ => logger.start()?, 13 _ => logger.start()?,
13 }; 14 };
15 let prof_depth = match ::std::env::var("RA_PROFILE_DEPTH") {
16 Ok(ref d) => d.parse()?,
17 _ => 0,
18 };
19 let profile_allowed = match ::std::env::var("RA_PROFILE") {
20 Ok(ref p) => p.split(";").map(String::from).collect(),
21 _ => Vec::new(),
22 };
23 ra_prof::set_filter(ra_prof::Filter::new(prof_depth, profile_allowed));
14 log::info!("lifecycle: server started"); 24 log::info!("lifecycle: server started");
15 match ::std::panic::catch_unwind(main_inner) { 25 match ::std::panic::catch_unwind(main_inner) {
16 Ok(res) => { 26 Ok(res) => {
diff --git a/crates/ra_lsp_server/src/main_loop.rs b/crates/ra_lsp_server/src/main_loop.rs
index eecf278a8..82410bee3 100644
--- a/crates/ra_lsp_server/src/main_loop.rs
+++ b/crates/ra_lsp_server/src/main_loop.rs
@@ -24,6 +24,7 @@ use crate::{
24 Result, 24 Result,
25 InitializationOptions, 25 InitializationOptions,
26}; 26};
27use ra_prof::profile;
27 28
28#[derive(Debug, Fail)] 29#[derive(Debug, Fail)]
29#[fail(display = "Language Server request failed with {}. ({})", code, message)] 30#[fail(display = "Language Server request failed with {}. ({})", code, message)]
@@ -181,7 +182,7 @@ fn main_loop_inner(
181 recv(libdata_receiver) -> data => Event::Lib(data.unwrap()) 182 recv(libdata_receiver) -> data => Event::Lib(data.unwrap())
182 }; 183 };
183 log::info!("loop_turn = {:?}", event); 184 log::info!("loop_turn = {:?}", event);
184 let start = std::time::Instant::now(); 185 let _p = profile("loop_turn");
185 let mut state_changed = false; 186 let mut state_changed = false;
186 match event { 187 match event {
187 Event::Task(task) => on_task(task, msg_sender, pending_requests), 188 Event::Task(task) => on_task(task, msg_sender, pending_requests),
@@ -235,10 +236,9 @@ fn main_loop_inner(
235 in_flight_libraries += 1; 236 in_flight_libraries += 1;
236 let sender = libdata_sender.clone(); 237 let sender = libdata_sender.clone();
237 pool.execute(move || { 238 pool.execute(move || {
238 let start = ::std::time::Instant::now();
239 log::info!("indexing {:?} ... ", root); 239 log::info!("indexing {:?} ... ", root);
240 let _p = profile(&format!("indexed {:?}", root));
240 let data = LibraryData::prepare(root, files); 241 let data = LibraryData::prepare(root, files);
241 log::info!("indexed {:?} {:?}", start.elapsed(), root);
242 sender.send(data).unwrap(); 242 sender.send(data).unwrap();
243 }); 243 });
244 } 244 }
@@ -266,7 +266,6 @@ fn main_loop_inner(
266 subs.subscriptions(), 266 subs.subscriptions(),
267 ) 267 )
268 } 268 }
269 log::info!("loop_turn = {:?}", start.elapsed());
270 } 269 }
271} 270}
272 271
diff --git a/crates/ra_prof/src/lib.rs b/crates/ra_prof/src/lib.rs
index 0107f7de9..abddff960 100644
--- a/crates/ra_prof/src/lib.rs
+++ b/crates/ra_prof/src/lib.rs
@@ -52,6 +52,12 @@ pub struct Filter {
52 allowed: Vec<String>, 52 allowed: Vec<String>,
53} 53}
54 54
55impl Filter {
56 pub fn new(depth: usize, allowed: Vec<String>) -> Filter {
57 Filter { depth, allowed }
58 }
59}
60
55struct ProfileStack { 61struct ProfileStack {
56 starts: Vec<Instant>, 62 starts: Vec<Instant>,
57 messages: Vec<Message>, 63 messages: Vec<Message>,