1 files changed, 31 insertions, 18 deletions

diff --git a/src/zenserver/admin/admin.cpp b/src/zenserver/admin/admin.cpp
index 847ed5a50..2888f5450 100644
--- a/src/zenserver/admin/admin.cpp
+++ b/src/zenserver/admin/admin.cpp
@@ -21,6 +21,7 @@
 #include <zenstore/gc.h>
 
 #include <zenstore/cache/structuredcachestore.h>
+#include <zenutil/workerpools.h>
 #include "config.h"
 #include "projectstore/projectstore.h"
 
@@ -41,31 +42,43 @@ GetStatsForDirectory(std::filesystem::path Dir)
 	if (!std::filesystem::exists(Dir))
 		return {};
 
-	FileSystemTraversal Traversal;
-
-	struct StatsTraversal : public FileSystemTraversal::TreeVisitor
+	struct StatsTraversal : public GetDirectoryContentVisitor
 	{
-		virtual void VisitFile(const std::filesystem::path& Parent, const path_view& File, uint64_t FileSize) override
+		virtual void AsyncVisitDirectory(const std::filesystem::path& RelativeRoot, DirectoryContent&& Content) override
 		{
-			ZEN_UNUSED(Parent, File);
-			++TotalFileCount;
-			TotalBytes += FileSize;
+			ZEN_UNUSED(RelativeRoot);
+
+			uint64_t FileCount = Content.FileNames.size();
+			uint64_t DirCount  = Content.DirectoryNames.size();
+			uint64_t FilesSize = 0;
+			for (uint64_t FileSize : Content.FileSizes)
+			{
+				FilesSize += FileSize;
+			}
+			TotalBytes += FilesSize;
+			TotalFileCount += FileCount;
+			TotalDirCount += DirCount;
 		}
-		virtual bool VisitDirectory(const std::filesystem::path&, const path_view&) override
+
+		std::atomic_uint64_t TotalBytes		= 0;
+		std::atomic_uint64_t TotalFileCount = 0;
+		std::atomic_uint64_t TotalDirCount	= 0;
+
+		DirStats GetStats()
 		{
-			++TotalDirCount;
-			return true;
+			return {.FileCount = TotalFileCount.load(), .DirCount = TotalDirCount.load(), .ByteCount = TotalBytes.load()};
 		}
+	} DirTraverser;
 
-		uint64_t TotalBytes		= 0;
-		uint64_t TotalFileCount = 0;
-		uint64_t TotalDirCount	= 0;
-
-		DirStats GetStats() { return {.FileCount = TotalFileCount, .DirCount = TotalDirCount, .ByteCount = TotalBytes}; }
-	};
+	Latch PendingWorkCount(1);
 
-	StatsTraversal DirTraverser;
-	Traversal.TraverseFileSystem(Dir, DirTraverser);
+	GetDirectoryContent(Dir,
+						DirectoryContentFlags::IncludeAllEntries | DirectoryContentFlags::IncludeFileSizes,
+						DirTraverser,
+						GetSmallWorkerPool(EWorkloadType::Burst),
+						PendingWorkCount);
+	PendingWorkCount.CountDown();
+	PendingWorkCount.Wait();
 
 	return DirTraverser.GetStats();
 }