From 3ae3b3eb0682a4550578b4c35dc6e099d8a04e66 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Mon, 10 Sep 2018 20:48:32 +0300 Subject: [PATCH] initial query tracing --- crates/libanalysis/src/db.rs | 28 +++++++++++++++-- crates/libanalysis/src/module_map_db.rs | 40 ++++++++++++++++++------- 2 files changed, 55 insertions(+), 13 deletions(-) diff --git a/crates/libanalysis/src/db.rs b/crates/libanalysis/src/db.rs index 335c79e76da..5e3c8fb7ac2 100644 --- a/crates/libanalysis/src/db.rs +++ b/crates/libanalysis/src/db.rs @@ -1,6 +1,7 @@ use std::{ hash::Hash, sync::Arc, + cell::RefCell, }; use libsyntax2::{File}; use im; @@ -36,17 +37,38 @@ pub(crate) fn set_file_resolver(&mut self, file_resolver: FileResolverImp) { self.file_resolver = file_resolver } pub(crate) fn query_ctx(&self) -> QueryCtx { - QueryCtx { db: self.clone() } + QueryCtx { + db: self.clone(), + trace: RefCell::new(Vec::new()), + } } } pub(crate) struct QueryCtx { - db: Db + db: Db, + pub(crate) trace: RefCell>, +} + +#[derive(Clone, Copy, Debug)] +pub(crate) struct TraceEvent { + pub(crate) query_id: u32, + pub(crate) kind: TraceEventKind +} + +#[derive(Clone, Copy, Debug, PartialEq, Eq)] +pub(crate) enum TraceEventKind { + Start, Finish } impl QueryCtx { pub(crate) fn get(&self, params: &Q::Params) -> Q::Output { - Q::get(self, params) + self.trace(TraceEvent { query_id: Q::ID, kind: TraceEventKind::Start }); + let res = Q::get(self, params); + self.trace(TraceEvent { query_id: Q::ID, kind: TraceEventKind::Finish }); + res + } + fn trace(&self, event: TraceEvent) { + self.trace.borrow_mut().push(event) } } diff --git a/crates/libanalysis/src/module_map_db.rs b/crates/libanalysis/src/module_map_db.rs index 1ef87ab3f2f..25dbe8dd427 100644 --- a/crates/libanalysis/src/module_map_db.rs +++ b/crates/libanalysis/src/module_map_db.rs @@ -94,14 +94,15 @@ pub struct Submodule { #[cfg(test)] mod tests { - use super::*; + use std::collections::HashMap; use im; use relative_path::{RelativePath, RelativePathBuf}; use { - db::Db, + db::{Query, Db, TraceEventKind}, imp::FileResolverImp, FileId, FileResolver, }; + use super::*; #[derive(Debug)] struct FileMap(im::HashMap); @@ -154,10 +155,29 @@ fn remove_file(&mut self, file_id: FileId) { fn change_file(&mut self, file_id: FileId, new_text: &str) { self.db.change_file(file_id, Some(new_text.to_string())); } - fn check_parent_modules(&self, file_id: FileId, expected: &[FileId]) { + fn check_parent_modules( + &self, + file_id: FileId, + expected: &[FileId], + queries: &[(u32, u64)] + ) { let ctx = self.db.query_ctx(); let actual = ctx.get::(&file_id); assert_eq!(actual.as_slice(), expected); + let mut counts = HashMap::new(); + ctx.trace.borrow().iter() + .filter(|event| event.kind == TraceEventKind::Start) + .for_each(|event| *counts.entry(event.query_id).or_insert(0) += 1); + for &(query_id, expected_count) in queries.iter() { + let actual_count = *counts.get(&query_id).unwrap_or(&0); + assert_eq!( + actual_count, + expected_count, + "counts for {} differ", + query_id, + ) + } + } } @@ -165,25 +185,25 @@ fn check_parent_modules(&self, file_id: FileId, expected: &[FileId]) { fn test_parent_module() { let mut f = Fixture::new(); let foo = f.add_file("/foo.rs", ""); - f.check_parent_modules(foo, &[]); + f.check_parent_modules(foo, &[], &[(FileSyntax::ID, 1)]); let lib = f.add_file("/lib.rs", "mod foo;"); - f.check_parent_modules(foo, &[lib]); + f.check_parent_modules(foo, &[lib], &[(FileSyntax::ID, 2)]); f.change_file(lib, ""); - f.check_parent_modules(foo, &[]); + f.check_parent_modules(foo, &[], &[(ModuleDescr::ID, 2)]); f.change_file(lib, "mod foo;"); - f.check_parent_modules(foo, &[lib]); + f.check_parent_modules(foo, &[lib], &[(ModuleDescr::ID, 2)]); f.change_file(lib, "mod bar;"); - f.check_parent_modules(foo, &[]); + f.check_parent_modules(foo, &[], &[(ModuleDescr::ID, 2)]); f.change_file(lib, "mod foo;"); - f.check_parent_modules(foo, &[lib]); + f.check_parent_modules(foo, &[lib], &[(ModuleDescr::ID, 2)]); f.remove_file(lib); - f.check_parent_modules(foo, &[]); + f.check_parent_modules(foo, &[], &[(ModuleDescr::ID, 1)]); } }