bin: remove use of atomic counters

Author: BrettMayson

bin/src/modules/binarize/mod.rs

@@ -1,13 +1,4 @@
-use std::{
-    ffi::OsStr,
-    fs::create_dir_all,
-    path::PathBuf,
-    process::Command,
-    sync::{
-        RwLock,
-        atomic::{AtomicU16, Ordering},
-    },
-};
+use std::{ffi::OsStr, fs::create_dir_all, path::PathBuf, process::Command, sync::RwLock};
 
 use hemtt_common::config::PDriveOption;
 use hemtt_p3d::SearchCache;
@@ -289,7 +280,6 @@ impl Module for Binarize {
             return Ok(Report::new());
         }
         let mut report = Report::new();
-        let counter = AtomicU16::new(0);
         self.prechecked
             .read()
             .expect("can read in pre_build")
@@ -359,7 +349,6 @@ impl Module for Binarize {
                     output.status.code().unwrap_or(-1)
                 );
                 if PathBuf::from(&target.output).join(&target.entry).exists() {
-                    counter.fetch_add(1, Ordering::Relaxed);
                     None
                 } else {
                     Some(BinarizeFailed::code(target.entry.clone()))
@@ -372,7 +361,13 @@ impl Module for Binarize {
                 report.push(error);
             });
 
-        info!("Binarized {} files", counter.load(Ordering::Relaxed));
+        info!(
+            "Binarized {} files",
+            self.prechecked
+                .read()
+                .expect("prechecked should not be poisoned")
+                .len()
+        );
         Ok(report)
     }
 }

bin/src/modules/pbo.rs

@@ -1,7 +1,4 @@
-use std::{
-    fs::{File, create_dir_all},
-    sync::atomic::{AtomicU16, Ordering},
-};
+use std::fs::{File, create_dir_all};
 
 use git2::Repository;
 use hemtt_common::{
@@ -41,20 +38,18 @@ pub fn build(ctx: &Context, collapse: Collapse) -> Result<Report, Error> {
             })
         })
     };
-    let counter = AtomicU16::new(0);
-    let progress = progress_bar(ctx.addons().to_vec().len() as u64).with_message("Building PBOs");
-    ctx.addons()
-        .to_vec()
+    let addons = ctx.addons().to_vec();
+    let progress = progress_bar(addons.len() as u64).with_message("Building PBOs");
+    addons
         .iter()
         .map(|addon| {
             internal_build(ctx, addon, collapse, &version, git_hash.as_deref())?;
             progress.inc(1);
-            counter.fetch_add(1, Ordering::Relaxed);
             Ok(())
         })
         .collect::<Result<Vec<_>, Error>>()?;
     progress.finish_and_clear();
-    info!("Built {} PBOs", counter.load(Ordering::Relaxed));
+    info!("Built {} PBOs", addons.len());
     Ok(Report::new())
 }
 

bin/src/modules/rapifier.rs

@@ -1,11 +1,4 @@
-use std::{
-    collections::HashMap,
-    path::PathBuf,
-    sync::{
-        RwLock,
-        atomic::{AtomicU16, Ordering},
-    },
-};
+use std::{collections::HashMap, path::PathBuf, sync::RwLock};
 
 use hemtt_config::{
     Config,
@@ -61,7 +54,6 @@ impl Module for Rapifier {
     fn pre_build(&self, ctx: &Context) -> Result<Report, Error> {
         ctx.state().set(AddonConfigs::default());
         let mut report = Report::new();
-        let counter = AtomicU16::new(0);
         let glob_options = glob::MatchOptions {
             require_literal_separator: true,
             ..Default::default()
@@ -101,7 +93,6 @@ impl Module for Rapifier {
             .par_iter()
             .map(|(addon, entry)| {
                 let report = rapify(addon, entry, ctx)?;
-                counter.fetch_add(1, Ordering::Relaxed);
                 progress.inc(1);
                 Ok(report)
             })
@@ -112,7 +103,7 @@ impl Module for Rapifier {
         }
 
         progress.finish_and_clear();
-        info!("Rapified {} addon configs", counter.load(Ordering::Relaxed));
+        info!("Rapified {} addon configs", entries.len());
         report.extend(lint_all(Some(ctx.config()), &ctx.addons().to_vec()));
         Ok(report)
     }

bin/src/modules/sqf.rs

@@ -1,7 +1,4 @@
-use std::sync::{
-    Arc,
-    atomic::{AtomicU16, Ordering},
-};
+use std::sync::Arc;
 
 use hemtt_common::version::Version;
 use hemtt_preprocessor::Processor;
@@ -57,7 +54,6 @@ impl Module for SQFCompiler {
     fn pre_build(&self, ctx: &Context) -> Result<Report, Error> {
         let mut report = Report::new();
         let sqf_ext = Some(String::from("sqf"));
-        let counter = AtomicU16::new(0);
         let mut entries = Vec::new();
         for addon in ctx.addons() {
             let addon = Arc::new(addon.clone());
@@ -109,7 +105,6 @@ impl Module for SQFCompiler {
                         if !codes.failed() {
                             let mut out = entry.with_extension("sqfc")?.create_file()?;
                             sqf.optimize().compile_to_writer(&processed, &mut out)?;
-                            counter.fetch_add(1, Ordering::Relaxed);
                             progress.inc(1);
                         }
                         for code in codes {
@@ -142,7 +137,7 @@ impl Module for SQFCompiler {
             report.merge(new_report);
         }
         progress.finish_and_clear();
-        info!("Compiled {} sqf files", counter.load(Ordering::Relaxed));
+        info!("Compiled {} sqf files", entries.len());
 
         report.extend(lint_all(
             Some(ctx.config()),

bin/src/modules/stringtables.rs

@@ -1,7 +1,4 @@
-use std::sync::{
-    Arc, Mutex,
-    atomic::{AtomicU16, Ordering},
-};
+use std::sync::{Arc, Mutex};
 
 use hemtt_stringtable::{
     Project,
@@ -67,8 +64,8 @@ impl Module for Stringtables {
                     }),
             );
         }
-        let counter = AtomicU16::new(0);
-        let progress = progress_bar(paths.len() as u64).with_message("Processing Stringtables");
+        let length = paths.len();
+        let progress = progress_bar(length as u64).with_message("Processing Stringtables");
         let results = paths
             .into_par_iter()
             .map(|path| match Project::read(path.clone()) {
@@ -77,7 +74,6 @@ impl Module for Stringtables {
                     if !codes.iter().any(|c| c.severity() == Severity::Error) {
                         convert_stringtable(&project);
                     }
-                    counter.fetch_add(1, Ordering::Relaxed);
                     progress.inc(1);
                     Some((project, codes))
                 }
@@ -109,7 +105,7 @@ impl Module for Stringtables {
             ctx.addons().to_vec(),
         ));
         progress.finish_and_clear();
-        info!("Checked {} stringtables", counter.load(Ordering::Relaxed));
+        info!("Checked {} stringtables", length);
         Ok(report)
     }
 }