remove WorkerThreadPool::Flush()

3 files changed, 16 insertions, 14 deletions

diff --git a/zencore/include/zencore/workthreadpool.h b/zencore/include/zencore/workthreadpool.h
index 85054fca7..0ddc65298 100644
--- a/zencore/include/zencore/workthreadpool.h
+++ b/zencore/include/zencore/workthreadpool.h
@@ -36,7 +36,6 @@ public:
 	void ScheduleWork(Ref<IWork> Work);
 	void ScheduleWork(std::function<void()>&& Work);
 
-	void Flush();
 	[[nodiscard]] size_t PendingWork() const;
 
 private:
diff --git a/zencore/workthreadpool.cpp b/zencore/workthreadpool.cpp
index a6c6bc0f7..4291d1581 100644
--- a/zencore/workthreadpool.cpp
+++ b/zencore/workthreadpool.cpp
@@ -55,15 +55,6 @@ WorkerThreadPool::PendingWork() const
 }
 
 void
-WorkerThreadPool::Flush()
-{
-	while (m_WorkQueue.Size() > 0)
-	{
-		Sleep(1);
-	}
-}
-
-void
 WorkerThreadPool::WorkerThreadFunction()
 {
 	do
diff --git a/zenstore/compactcas.cpp b/zenstore/compactcas.cpp
index 5f335816c..3cb7d8854 100644
--- a/zenstore/compactcas.cpp
+++ b/zenstore/compactcas.cpp
@@ -2372,7 +2372,10 @@ TEST_CASE("compactcas.threadedinsert")	// * doctest::skip(true))
 					ZEN_ASSERT(InsertResult.New);
 				});
 			}
-			ThreadPool.Flush();
+			while (ThreadPool.PendingWork() > 0)
+			{
+				Sleep(1);
+			}
 		}
 
 		const uint64_t TotalSize = Cas.StorageSize().DiskSize;
@@ -2389,7 +2392,10 @@ TEST_CASE("compactcas.threadedinsert")	// * doctest::skip(true))
 					CHECK(ChunkHash == Hash);
 				});
 			}
-			ThreadPool.Flush();
+			while (ThreadPool.PendingWork() > 0)
+			{
+				Sleep(1);
+			}
 		}
 
 		std::unordered_set<IoHash, IoHash::Hasher> GcChunkHashes(ChunkHashes.begin(), ChunkHashes.end());
@@ -2473,7 +2479,10 @@ TEST_CASE("compactcas.threadedinsert")	// * doctest::skip(true))
 				Deleted.IterateChunks([&GcChunkHashes](const IoHash& ChunkHash) { GcChunkHashes.erase(ChunkHash); });
 			}
 
-			ThreadPool.Flush();
+			while (ThreadPool.PendingWork() > 0)
+			{
+				Sleep(1);
+			}
 
 			{
 				std::vector<IoHash> AddedHashes;
@@ -2517,7 +2526,10 @@ TEST_CASE("compactcas.threadedinsert")	// * doctest::skip(true))
 					CHECK(ChunkHash == IoHash::HashBuffer(Cas.FindChunk(ChunkHash)));
 				});
 			}
-			ThreadPool.Flush();
+			while (ThreadPool.PendingWork() > 0)
+			{
+				Sleep(1);
+			}
 		}
 	}
 }