From ff65b49da49820974ea1031db8257a3111f7111c Mon Sep 17 00:00:00 2001
From: eriedaberrie <eriedaberrie@gmail.com>
Date: Mon, 8 Jan 2024 21:56:16 -0800
Subject: [PATCH] Only lock once per iteration

---
 src/main.cpp | 23 +++++++++--------------
 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index dba5f23..519ebd7 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -182,16 +182,10 @@ int main(int argc, char *argv[]) {
 	std::cout << "Starting " << wc << " worker threads..." << std::endl;
 	for (unsigned int w = 1; w <= wc; w++) {
 		workers.push_back(std::thread([&it, &n_done, &it_lock, &all_fires,
-				&residentials, &out_dir, w, distance]() {
-			for (;;) {
-				it_lock.lock();
-				if (it == all_fires.end()) {
-					std::cout << "Worker " << w << " done! (finished " << n_done
-							<< "/" << all_fires.size() << ")" << std::endl;
-					it_lock.unlock();
-					return;
-				}
+									   &residentials, &out_dir, w, distance]() {
+			it_lock.lock();
 
+			while (it != all_fires.end()) {
 				const auto& month_data = *(it++);
 				auto& month = month_data.name;
 				auto& month_fires = month_data.days;
@@ -225,12 +219,13 @@ int main(int argc, char *argv[]) {
 					outf << '\n';
 				}
 
-				{
-					std::lock_guard<std::mutex> lk(it_lock);
-
-					n_done++;
-				}
+				it_lock.lock();
+				n_done++;
 			}
+
+			std::cout << "Worker " << w << " done! (finished " << n_done
+					<< "/" << all_fires.size() << ")" << std::endl;
+			it_lock.unlock();
 		}));
 	}