Merged main.

1 files changed, 35 insertions, 24 deletions

diff --git a/zenserver/projectstore.cpp b/zenserver/projectstore.cpp
index 8f8b6e163..7e0aed328 100644
--- a/zenserver/projectstore.cpp
+++ b/zenserver/projectstore.cpp
@@ -13,13 +13,16 @@
 #include <zencore/testing.h>
 #include <zencore/testutils.h>
 #include <zencore/timer.h>
-#include <zencore/windows.h>
 #include <zenstore/basicfile.h>
 #include <zenstore/cas.h>
 #include <zenstore/caslog.h>
 
 #include "config.h"
 
+#if ZEN_PLATFORM_WINDOWS
+#	include <zencore/windows.h>
+#endif
+
 #define USE_ROCKSDB 0
 
 ZEN_THIRD_PARTY_INCLUDES_START
@@ -122,7 +125,7 @@ struct ProjectStore::OplogStorage : public RefCounted
 
 #if USE_ROCKSDB
 		{
-			std::string RocksdbPath = WideToUtf8((m_OplogStoragePath / "ops.rdb").native().c_str());
+			std::string RocksdbPath = PathToUtf8(m_OplogStoragePath / "ops.rdb");
 
 			ZEN_DEBUG("opening rocksdb db at '{}'", RocksdbPath);
 
@@ -200,9 +203,8 @@ struct ProjectStore::OplogStorage : public RefCounted
 
 			CbObject Op(SharedBuffer::MakeView(OpBuffer.Data(), OpBuffer.Size()));
 
-			m_NextOpsOffset =
-				Max(m_NextOpsOffset.load(std::memory_order::memory_order_relaxed), RoundUp(OpFileOffset + LogEntry.OpCoreSize, m_OpsAlign));
-			m_MaxLsn = Max(m_MaxLsn.load(std::memory_order::memory_order_relaxed), LogEntry.OpLsn);
+			m_NextOpsOffset = Max(m_NextOpsOffset.load(std::memory_order_relaxed), RoundUp(OpFileOffset + LogEntry.OpCoreSize, m_OpsAlign));
+			m_MaxLsn		= Max(m_MaxLsn.load(std::memory_order_relaxed), LogEntry.OpLsn);
 
 			Handler(Op, LogEntry);
 		});
@@ -299,8 +301,8 @@ private:
 ProjectStore::Oplog::Oplog(std::string_view Id, Project* Project, CidStore& Store, std::filesystem::path BasePath)
 : m_OuterProject(Project)
 , m_CidStore(Store)
-, m_OplogId(Id)
 , m_BasePath(BasePath)
+, m_OplogId(Id)
 {
 	m_Storage			   = new OplogStorage(this, m_BasePath);
 	const bool StoreExists = m_Storage->Exists();
@@ -385,7 +387,7 @@ ProjectStore::Oplog::FindChunk(Oid ChunkId)
 
 		std::filesystem::path FilePath = m_OuterProject->RootDir / FileIt->second.ServerPath;
 
-		IoBuffer FileChunk = IoBufferBuilder::MakeFromFile(FilePath.native().c_str());
+		IoBuffer FileChunk = IoBufferBuilder::MakeFromFile(FilePath);
 		FileChunk.SetContentType(ZenContentType::kBinary);
 
 		return FileChunk;
@@ -465,16 +467,6 @@ ProjectStore::Oplog::AddFileMapping(Oid FileId, IoHash Hash, std::string_view Se
 		return false;
 	}
 
-	if (ServerPath[0] == '/' || ClientPath[0] != '/')
-	{
-		// This is a special case just to enable tests to use absolute paths. We might want
-		// to have configuration to control this
-		if (ServerPath[1] != ':')
-		{
-			return false;
-		}
-	}
-
 	FileMapEntry Entry;
 	Entry.ServerPath = ServerPath;
 	Entry.ClientPath = ClientPath;
@@ -680,7 +672,7 @@ ProjectStore::Project::Write()
 
 	CbObjectWriter Cfg;
 	Cfg << "id" << Identifier;
-	Cfg << "root" << WideToUtf8(RootDir.c_str());
+	Cfg << "root" << PathToUtf8(RootDir);
 	Cfg << "project" << ProjectRootDir;
 	Cfg << "engine" << EngineRootDir;
 
@@ -779,8 +771,6 @@ ProjectStore::Project::OpenOplog(std::string_view OplogId)
 void
 ProjectStore::Project::DeleteOplog(std::string_view OplogId)
 {
-	bool Exists = false;
-
 	{
 		RwLock::ExclusiveLockScope _(m_ProjectLock);
 
@@ -788,8 +778,6 @@ ProjectStore::Project::DeleteOplog(std::string_view OplogId)
 
 		if (OplogIt != m_Oplogs.end())
 		{
-			Exists = true;
-
 			m_Oplogs.erase(OplogIt);
 		}
 	}
@@ -1647,7 +1635,7 @@ HttpProjectService::HttpProjectService(CidStore& Store, ProjectStore* Projects)
 						ProjectStore::Oplog& Log = *OplogIt;
 
 						CbObjectWriter Cb;
-						Cb << "id"sv << Log.OplogId() << "project"sv << Prj.Identifier << "tempdir"sv << Log.TempDir();
+						Cb << "id"sv << Log.OplogId() << "project"sv << Prj.Identifier << "tempdir"sv << Log.TempPath().c_str();
 
 						Req.ServerRequest().WriteResponse(HttpResponseCode::OK, Cb.Save());
 					}
@@ -1686,6 +1674,9 @@ HttpProjectService::HttpProjectService(CidStore& Store, ProjectStore* Projects)
 						return Req.ServerRequest().WriteResponse(HttpResponseCode::OK);
 					}
 					break;
+
+				default:
+					break;
 			}
 		},
 		HttpVerb::kPost | HttpVerb::kGet | HttpVerb::kDelete);
@@ -1783,7 +1774,7 @@ HttpProjectService::HttpProjectService(CidStore& Store, ProjectStore* Projects)
 						const ProjectStore::Project& Prj = *ProjectIt;
 
 						CbObjectWriter Response;
-						Response << "id" << Prj.Identifier << "root" << WideToUtf8(Prj.RootDir.c_str());
+						Response << "id" << Prj.Identifier << "root" << PathToUtf8(Prj.RootDir);
 
 						Response.BeginArray("oplogs"sv);
 						Prj.IterateOplogs([&](const ProjectStore::Oplog& I) { Response << "id"sv << I.OplogId(); });
@@ -1809,6 +1800,9 @@ HttpProjectService::HttpProjectService(CidStore& Store, ProjectStore* Projects)
 						return Req.ServerRequest().WriteResponse(HttpResponseCode::NoContent);
 					}
 					break;
+
+				default:
+					break;
 			}
 		},
 		HttpVerb::kGet | HttpVerb::kPost | HttpVerb::kDelete);
@@ -1837,6 +1831,7 @@ HttpProjectService::HandleRequest(HttpServerRequest& Request)
 
 //////////////////////////////////////////////////////////////////////////
 
+#	if ZEN_PLATFORM_WINDOWS
 class SecurityAttributes
 {
 public:
@@ -1869,6 +1864,12 @@ public:
 		}
 	}
 };
+#	else
+struct AnyUserSecurityAttributes
+{
+	int Attributes() { return 0666; }
+};
+#	endif	// ZEN_PLATFORM_WINDOWS
 
 //////////////////////////////////////////////////////////////////////////
 
@@ -1939,6 +1940,7 @@ private:
 	asio::thread_pool m_WorkerThreadPool;
 	asio::io_context  m_IoContext;
 
+#	if ZEN_PLATFORM_WINDOWS
 	class PipeConnection
 	{
 		enum PipeState
@@ -2097,6 +2099,15 @@ private:
 
 		uint8_t m_MsgBuffer[16384];
 	};
+#	else
+	class PipeConnection
+	{
+	public:
+		PipeConnection(LocalProjectImpl*) {}
+		void Accept() {}
+		void Disconnect() {}
+	};
+#	endif
 
 	AnyUserSecurityAttributes	 m_AnyUserSecurityAttributes;
 	std::vector<PipeConnection*> m_ServicePipes;