[progress] fix reporting after change to working in chunks

Author: tstack

src/lib.rs

@@ -31,6 +31,7 @@ pub use progress::WorkInfo;
 use source_query::QueryResult;
 pub use source_query::SourceQuery;
 pub use source_ref::SourceRef;
+use crate::progress::WorkGuard;
 
 #[derive(Error, Debug, Diagnostic, Clone)]
 pub enum LogError {
@@ -161,6 +162,7 @@ impl LogMatcher {
     pub fn extract_log_statements(&mut self, tracker: &ProgressTracker) {
         tracker.begin_step("Extracting log statements".to_string());
         self.roots.iter_mut().for_each(|(_path, coll)| {
+            let guard = tracker.doing_work(coll.tree.stats().files as u64, "files".to_string());
             for event_chunk in &coll.tree.scan().chunks(10) {
                 let sources = event_chunk
                     .flat_map(|event| match event {
@@ -179,7 +181,7 @@ impl LogMatcher {
                         }
                     })
                     .collect::<Vec<CodeSource>>();
-                extract_logging(&sources, tracker)
+                extract_logging_guarded(&sources, &guard)
                     .into_iter()
                     .for_each(|sif| {
                         coll.files_with_statements.insert(sif.id, sif);
@@ -489,8 +491,7 @@ where
         .collect()
 }
 
-pub fn extract_logging(sources: &[CodeSource], tracker: &ProgressTracker) -> Vec<StatementsInFile> {
-    let guard = tracker.doing_work(sources.len() as u64, "files".to_string());
+pub fn extract_logging_guarded(sources: &[CodeSource], guard: &WorkGuard) -> Vec<StatementsInFile> {
     sources
         .par_iter()
         .flat_map(|code| {
@@ -548,6 +549,11 @@ pub fn extract_logging(sources: &[CodeSource], tracker: &ProgressTracker) -> Vec
         .collect()
 }
 
+pub fn extract_logging(sources: &[CodeSource], tracker: &ProgressTracker) -> Vec<StatementsInFile> {
+    let guard = tracker.doing_work(sources.len() as u64, "files".to_string());
+    extract_logging_guarded(sources, &guard)
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;

src/source_hier.rs

@@ -418,6 +418,7 @@ pub struct SourceHierTree {
     pub root_node: SourceHierNode,
     next_id: usize,
     deleted_events: Vec<ScanEvent>,
+    stats: SourceHierStats,
 }
 
 impl SourceHierTree {
@@ -427,6 +428,7 @@ impl SourceHierTree {
             root_node: SourceHierNode::stub(),
             next_id: 0,
             deleted_events: Vec::new(),
+            stats: SourceHierStats::default(),
         }
     }
 
@@ -441,6 +443,7 @@ impl SourceHierTree {
             &mut self.deleted_events,
         );
         self.next_id = SourceFileInfo::NEXT_ID.with(|id_opt| *id_opt.borrow());
+        self.stats = self.compute_stats();
     }
 
     /// Scan the tree for changes that have happened since the last scan.  Changes to the tree
@@ -482,7 +485,7 @@ impl SourceHierTree {
         walk(&self.root_node, &mut f);
     }
 
-    pub fn stats(&self) -> SourceHierStats {
+    fn compute_stats(&self) -> SourceHierStats {
         let mut retval = SourceHierStats::default();
 
         self.visit(|node| match node.content {
@@ -495,6 +498,10 @@ impl SourceHierTree {
 
         retval
     }
+
+    pub fn stats(&self) -> &SourceHierStats {
+        &self.stats
+    }
 }
 
 #[cfg(test)]