From e0bcecee6042b219c6626172851af5a25362b948 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bartek=20Iwa=C5=84czuk?= Date: Tue, 11 Feb 2020 17:23:40 +0100 Subject: refactor: Remove atomics from metrics (#3968) * replace "AtomicUsize" with "u64" for field type on "Metrics" * move "compiler_starts" field from "Metrics" to "GlobalState" --- cli/worker.rs | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) (limited to 'cli/worker.rs') diff --git a/cli/worker.rs b/cli/worker.rs index b804ff449..c975a588a 100644 --- a/cli/worker.rs +++ b/cli/worker.rs @@ -265,11 +265,10 @@ mod tests { panic!("Future got unexpected error: {:?}", e); } }); - let mut state = state_.borrow_mut(); - let metrics = &mut state.metrics; - assert_eq!(metrics.resolve_count.load(Ordering::SeqCst), 2); + let state = state_.borrow(); + assert_eq!(state.metrics.resolve_count, 2); // Check that we didn't start the compiler. - assert_eq!(metrics.compiler_starts.load(Ordering::SeqCst), 0); + assert_eq!(state.global_state.compiler_starts.load(Ordering::SeqCst), 0); } #[test] @@ -298,11 +297,10 @@ mod tests { } }); - let mut state = state_.borrow_mut(); - let metrics = &mut state.metrics; - // TODO assert_eq!(metrics.resolve_count.load(Ordering::SeqCst), 2); + let state = state_.borrow(); + assert_eq!(state.metrics.resolve_count, 1); // Check that we didn't start the compiler. - assert_eq!(metrics.compiler_starts.load(Ordering::SeqCst), 0); + assert_eq!(state.global_state.compiler_starts.load(Ordering::SeqCst), 0); } #[tokio::test] @@ -339,13 +337,10 @@ mod tests { if let Err(e) = (&mut *worker).await { panic!("Future got unexpected error: {:?}", e); } - let state = state.borrow_mut(); - assert_eq!(state.metrics.resolve_count.load(Ordering::SeqCst), 3); + let state = state.borrow(); + assert_eq!(state.metrics.resolve_count, 3); // Check that we've only invoked the compiler once. - assert_eq!( - global_state.metrics.compiler_starts.load(Ordering::SeqCst), - 1 - ); + assert_eq!(state.global_state.compiler_starts.load(Ordering::SeqCst), 1); drop(http_server_guard); } -- cgit v1.2.3