Merged main.

1 files changed, 28 insertions, 22 deletions

diff --git a/zenserver/cache/structuredcachestore.cpp b/zenserver/cache/structuredcachestore.cpp
index 44c7b728b..718a8db51 100644
--- a/zenserver/cache/structuredcachestore.cpp
+++ b/zenserver/cache/structuredcachestore.cpp
@@ -2,7 +2,7 @@
 
 #include "structuredcachestore.h"
 
-#include "cachetracking.h"
+#include <zencore/except.h>
 
 #include <zencore/compactbinarybuilder.h>
 #include <zencore/compactbinarypackage.h>
@@ -23,7 +23,10 @@
 #include <zenstore/caslog.h>
 #include <zenstore/cidstore.h>
 
-#include <chrono>
+#if ZEN_PLATFORM_WINDOWS
+#	include <zencore/windows.h>
+#endif
+
 #include <concepts>
 #include <memory_resource>
 #include <ranges>
@@ -38,8 +41,7 @@ ZEN_THIRD_PARTY_INCLUDES_END
 namespace zen {
 
 using namespace fmt::literals;
-using PathBuilder = WideStringBuilder<256>;
-namespace fs	  = std::filesystem;
+namespace fs = std::filesystem;
 
 static CbObject
 LoadCompactBinaryObject(const fs::path& Path)
@@ -487,7 +489,7 @@ private:
 	uint64_t			 m_SobsCursor = 0;
 	std::atomic_uint64_t m_TotalSize{};
 
-	void BuildPath(WideStringBuilderBase& Path, const IoHash& HashKey);
+	void BuildPath(PathBuilderBase& Path, const IoHash& HashKey);
 	void PutStandaloneCacheValue(const IoHash& HashKey, const ZenCacheValue& Value);
 	bool GetStandaloneCacheValue(const DiskLocation& Loc, const IoHash& HashKey, ZenCacheValue& OutValue);
 	void DeleteStandaloneCacheValue(const DiskLocation& Loc, const IoHash& HashKey, const fs::path& Path, std::error_code& Ec);
@@ -619,17 +621,17 @@ ZenCacheDiskLayer::CacheBucket::OpenLog(const fs::path& BucketDir, const bool Is
 }
 
 void
-ZenCacheDiskLayer::CacheBucket::BuildPath(WideStringBuilderBase& Path, const IoHash& HashKey)
+ZenCacheDiskLayer::CacheBucket::BuildPath(PathBuilderBase& Path, const IoHash& HashKey)
 {
 	char HexString[sizeof(HashKey.Hash) * 2];
 	ToHexBytes(HashKey.Hash, sizeof HashKey.Hash, HexString);
 
-	Path.Append(m_BucketDir.c_str());
+	Path.Append(m_BucketDir);
 	Path.Append(L"/blob/");
 	Path.AppendAsciiRange(HexString, HexString + 3);
-	Path.Append(L"/");
+	Path.AppendSeparator();
 	Path.AppendAsciiRange(HexString + 3, HexString + 5);
-	Path.Append(L"/");
+	Path.AppendSeparator();
 	Path.AppendAsciiRange(HexString + 5, HexString + sizeof(HexString));
 }
 
@@ -650,12 +652,12 @@ ZenCacheDiskLayer::CacheBucket::GetInlineCacheValue(const DiskLocation& Loc, Zen
 bool
 ZenCacheDiskLayer::CacheBucket::GetStandaloneCacheValue(const DiskLocation& Loc, const IoHash& HashKey, ZenCacheValue& OutValue)
 {
-	PathBuilder DataFilePath;
+	PathBuilder<256> DataFilePath;
 	BuildPath(DataFilePath, HashKey);
 
 	RwLock::SharedLockScope ValueLock(LockForHash(HashKey));
 
-	if (IoBuffer Data = IoBufferBuilder::MakeFromFile(DataFilePath.c_str()))
+	if (IoBuffer Data = IoBufferBuilder::MakeFromFile(DataFilePath.ToPath()))
 	{
 		OutValue.Value = Data;
 		OutValue.Value.SetContentType(Loc.GetContentType());
@@ -970,8 +972,8 @@ ZenCacheDiskLayer::CacheBucket::CollectGarbage(GcContext& GcCtx)
 	// Remove all standalone file(s)
 	// NOTE: This can probably be made asynchronously
 	{
-		std::error_code Ec;
-		PathBuilder		Path;
+		std::error_code	 Ec;
+		PathBuilder<256> Path;
 
 		for (const auto& Entry : ExpiredEntries)
 		{
@@ -988,7 +990,7 @@ ZenCacheDiskLayer::CacheBucket::CollectGarbage(GcContext& GcCtx)
 
 				if (Ec)
 				{
-					ZEN_WARN("delete expired z$ standalone file '{}' FAILED, reason '{}'", WideToUtf8(Path.ToString()), Ec.message());
+					ZEN_WARN("delete expired z$ standalone file '{}' FAILED, reason '{}'", Path.ToUtf8(), Ec.message());
 					Ec.clear();
 				}
 			}
@@ -1168,7 +1170,7 @@ ZenCacheDiskLayer::CacheBucket::PutStandaloneCacheValue(const IoHash& HashKey, c
 {
 	RwLock::ExclusiveLockScope ValueLock(LockForHash(HashKey));
 
-	PathBuilder DataFilePath;
+	PathBuilder<256> DataFilePath;
 	BuildPath(DataFilePath, HashKey);
 
 	TemporaryFile DataFile;
@@ -1190,7 +1192,7 @@ ZenCacheDiskLayer::CacheBucket::PutStandaloneCacheValue(const IoHash& HashKey, c
 
 	// Move file into place (atomically)
 
-	std::filesystem::path FsPath{DataFilePath.c_str()};
+	std::filesystem::path FsPath{DataFilePath.ToPath()};
 
 	DataFile.MoveTemporaryIntoPlace(FsPath, Ec);
 
@@ -1200,7 +1202,7 @@ ZenCacheDiskLayer::CacheBucket::PutStandaloneCacheValue(const IoHash& HashKey, c
 
 		do
 		{
-			std::filesystem::path ParentPath = std::filesystem::path(DataFilePath.c_str()).parent_path();
+			std::filesystem::path ParentPath = FsPath.parent_path();
 			CreateDirectories(ParentPath);
 
 			DataFile.MoveTemporaryIntoPlace(FsPath, Ec);
@@ -1225,7 +1227,7 @@ ZenCacheDiskLayer::CacheBucket::PutStandaloneCacheValue(const IoHash& HashKey, c
 
 		if (Ec)
 		{
-			throw std::system_error(Ec, "Failed to finalize file '{}'"_format(WideToUtf8(DataFilePath)));
+			throw std::system_error(Ec, "Failed to finalize file '{}'"_format(DataFilePath.ToUtf8()));
 		}
 	}
 
@@ -1371,11 +1373,11 @@ ZenCacheDiskLayer::DiscoverBuckets()
 
 		virtual bool VisitDirectory([[maybe_unused]] const std::filesystem::path& Parent, const path_view& DirectoryName) override
 		{
-			Dirs.push_back(std::wstring(DirectoryName));
+			Dirs.push_back((decltype(Dirs)::value_type)(DirectoryName));
 			return false;
 		}
 
-		std::vector<std::wstring> Dirs;
+		std::vector<std::filesystem::path::string_type> Dirs;
 	} Visit;
 
 	Traversal.TraverseFileSystem(m_RootDir, Visit);
@@ -1384,11 +1386,15 @@ ZenCacheDiskLayer::DiscoverBuckets()
 
 	RwLock::ExclusiveLockScope _(m_Lock);
 
-	for (const std::wstring& BucketName : Visit.Dirs)
+	for (const auto& BucketName : Visit.Dirs)
 	{
 		// New bucket needs to be created
 
-		const std::string BucketName8 = ToUtf8(BucketName);
+#if ZEN_PLATFORM_WINDOWS
+		std::string BucketName8 = WideToUtf8(BucketName);
+#else
+		const auto& BucketName8 = BucketName;
+#endif
 
 		if (auto It = m_Buckets.find(BucketName8); It != m_Buckets.end())
 		{