From 4bf94458d5d7abafb154e914620dc758d26719c2 Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Fri, 14 Apr 2023 10:24:10 +0100
Subject: Global worker instance

---
 lib/worker.cpp | 12 ++++++------
 lib/worker.h   | 35 ++++++++++-------------------------
 2 files changed, 16 insertions(+), 31 deletions(-)

(limited to 'lib')

diff --git a/lib/worker.cpp b/lib/worker.cpp
index fd255c7..cf59f56 100644
--- a/lib/worker.cpp
+++ b/lib/worker.cpp
@@ -1,9 +1,10 @@
 #include "worker.h"
-#if __cpp_lib_semaphore
-#	include "work.h"
-#	include <algorithm>
-#	include <iterator>
-#	include <mutex>
+#include "work.h"
+#include <algorithm>
+#include <iterator>
+#include <mutex>
+
+Worker Worker::instance;
 
 Worker::Worker() : todoLen {0}
 {
@@ -45,4 +46,3 @@ Worker::worker()
 		j->doWork();
 	}
 }
-#endif
diff --git a/lib/worker.h b/lib/worker.h
index 7cd06f9..136c50e 100644
--- a/lib/worker.h
+++ b/lib/worker.h
@@ -1,19 +1,17 @@
 #pragma once
 
+#include <deque>
+#include <memory>
+#include <mutex>
+#include <semaphore>
+#include <special_members.hpp>
+#include <thread>
 #include <utility>
-class Work;
-
-#if __cpp_lib_semaphore
-#	include <deque>
-#	include <memory>
-#	include <mutex>
-#	include <semaphore>
-#	include <special_members.hpp>
-#	include <thread>
-#	include <vector>
+#include <vector>
 
+class Work;
 class Worker {
-public:
+private:
 	Worker();
 	~Worker();
 
@@ -42,19 +40,6 @@ private:
 	ToDo todo;
 	std::counting_semaphore<16> todoLen;
 	std::mutex todoMutex;
-};
-
-#else
 
-class Worker {
-public:
-	template<typename T, typename... Params>
-	void
-	addWork(Params &&... params)
-		requires std::is_base_of_v<Work, T>
-	{
-		T(std::forward<Params>(params)...).doWork();
-	}
+	static Worker instance;
 };
-
-#endif
-- 
cgit v1.2.3