Merge #1308

1308: add profile calls to parsing/expansion routines r=matklad a=matklad



Co-authored-by: Aleksey Kladov <[email protected]>

3 files changed, 7 insertions, 1 deletions

diff --git a/crates/ra_db/Cargo.toml b/crates/ra_db/Cargo.toml
index 08aef9bf5..5328303d2 100644
--- a/crates/ra_db/Cargo.toml
+++ b/crates/ra_db/Cargo.toml
@@ -12,4 +12,5 @@ parking_lot = "0.7.0"
 
 ra_arena = { path = "../ra_arena" }
 ra_syntax = { path = "../ra_syntax" }
+ra_prof = { path = "../ra_prof" }
 test_utils = { path = "../test_utils" }
diff --git a/crates/ra_db/src/lib.rs b/crates/ra_db/src/lib.rs
index bf567721a..68b9a7143 100644
--- a/crates/ra_db/src/lib.rs
+++ b/crates/ra_db/src/lib.rs
@@ -6,6 +6,7 @@ use std::{panic, sync::Arc};
 
 use ra_syntax::{TextUnit, TextRange, SourceFile, TreeArc};
 use relative_path::RelativePathBuf;
+use ra_prof::profile;
 
 pub use ::salsa as salsa;
 pub use crate::{
@@ -72,6 +73,7 @@ pub trait SourceDatabase: CheckCanceled + std::fmt::Debug {
     #[salsa::input]
     fn file_text(&self, file_id: FileId) -> Arc<String>;
     // Parses the file into the syntax tree.
+    #[salsa::invoke(parse_query)]
     fn parse(&self, file_id: FileId) -> TreeArc<SourceFile>;
     /// Path to a file, relative to the root of its source root.
     #[salsa::input]
@@ -96,7 +98,8 @@ fn source_root_crates(db: &impl SourceDatabase, id: SourceRootId) -> Arc<Vec<Cra
     Arc::new(res)
 }
 
-fn parse(db: &impl SourceDatabase, file_id: FileId) -> TreeArc<SourceFile> {
+fn parse_query(db: &impl SourceDatabase, file_id: FileId) -> TreeArc<SourceFile> {
+    let _p = profile("parse_query");
     let text = db.file_text(file_id);
     SourceFile::parse(&*text)
 }
diff --git a/crates/ra_hir/src/ids.rs b/crates/ra_hir/src/ids.rs
index f901a7432..2eb7f0da0 100644
--- a/crates/ra_hir/src/ids.rs
+++ b/crates/ra_hir/src/ids.rs
@@ -5,6 +5,7 @@ use std::{
 
 use ra_db::{FileId, salsa};
 use ra_syntax::{TreeArc, AstNode, ast, SyntaxNode};
+use ra_prof::profile;
 use mbe::MacroRules;
 
 use crate::{
@@ -60,6 +61,7 @@ impl HirFileId {
         db: &impl DefDatabase,
         file_id: HirFileId,
     ) -> Option<TreeArc<SyntaxNode>> {
+        let _p = profile("parse_or_expand_query");
         match file_id.0 {
             HirFileIdRepr::File(file_id) => Some(db.parse(file_id).syntax().to_owned()),
             HirFileIdRepr::Macro(macro_file) => {