global open process cache for projectstore (#257)

* move openprocess cache to central location
* enable openprocesscache in projectstore so "getchunks" can send filehandles when requested

6 files changed, 64 insertions, 31 deletions

diff --git a/src/zenserver/cache/httpstructuredcache.cpp b/src/zenserver/cache/httpstructuredcache.cpp
index a6606c7ad..fd116ba8e 100644
--- a/src/zenserver/cache/httpstructuredcache.cpp
+++ b/src/zenserver/cache/httpstructuredcache.cpp
@@ -86,7 +86,8 @@ HttpStructuredCacheService::HttpStructuredCacheService(ZenCacheStore&		   InCach
 													   HttpStatsService&	   StatsService,
 													   HttpStatusService&	   StatusService,
 													   UpstreamCache&		   UpstreamCache,
-													   const DiskWriteBlocker* InDiskWriteBlocker)
+													   const DiskWriteBlocker* InDiskWriteBlocker,
+													   OpenProcessCache&	   InOpenProcessCache)
 : m_Log(logging::Get("cache"))
 , m_CacheStore(InCacheStore)
 , m_StatsService(StatsService)
@@ -94,6 +95,7 @@ HttpStructuredCacheService::HttpStructuredCacheService(ZenCacheStore&		   InCach
 , m_CidStore(InCidStore)
 , m_UpstreamCache(UpstreamCache)
 , m_DiskWriteBlocker(InDiskWriteBlocker)
+, m_OpenProcessCache(InOpenProcessCache)
 , m_RpcHandler(m_Log, m_CacheStats, UpstreamCache, InCacheStore, InCidStore, InDiskWriteBlocker)
 {
 	m_StatsService.RegisterHandler("z$", *this);
diff --git a/src/zenserver/cache/httpstructuredcache.h b/src/zenserver/cache/httpstructuredcache.h
index 812162efa..13c1d6475 100644
--- a/src/zenserver/cache/httpstructuredcache.h
+++ b/src/zenserver/cache/httpstructuredcache.h
@@ -75,7 +75,8 @@ public:
 							   HttpStatsService&	   StatsService,
 							   HttpStatusService&	   StatusService,
 							   UpstreamCache&		   UpstreamCache,
-							   const DiskWriteBlocker* InDiskWriteBlocker);
+							   const DiskWriteBlocker* InDiskWriteBlocker,
+							   OpenProcessCache&	   InOpenProcessCache);
 	~HttpStructuredCacheService();
 
 	virtual const char* BaseUri() const override;
@@ -122,7 +123,7 @@ private:
 	metrics::OperationTiming m_UpstreamGetRequestTiming;
 	CacheStats				 m_CacheStats;
 	const DiskWriteBlocker*	 m_DiskWriteBlocker = nullptr;
-	OpenProcessCache		 m_OpenProcessCache;
+	OpenProcessCache&		 m_OpenProcessCache;
 	CacheRpcHandler			 m_RpcHandler;
 
 	void ReplayRequestRecorder(const CacheRequestContext& Context, cache::IRpcRequestReplayer& Replayer, uint32_t ThreadCount);
diff --git a/src/zenserver/projectstore/projectstore.cpp b/src/zenserver/projectstore/projectstore.cpp
index cd0b53394..70045c13c 100644
--- a/src/zenserver/projectstore/projectstore.cpp
+++ b/src/zenserver/projectstore/projectstore.cpp
@@ -19,6 +19,7 @@
 #include <zenstore/cidstore.h>
 #include <zenstore/scrubcontext.h>
 #include <zenutil/cache/rpcrecording.h>
+#include <zenutil/openprocesscache.h>
 #include <zenutil/packageformat.h>
 #include <zenutil/referencemetadata.h>
 #include <zenutil/workerpools.h>
@@ -3618,11 +3619,17 @@ ProjectStore::Project::LastOplogAccessTime(std::string_view Oplog) const
 
 //////////////////////////////////////////////////////////////////////////
 
-ProjectStore::ProjectStore(CidStore& Store, std::filesystem::path BasePath, GcManager& Gc, JobQueue& JobQueue, const Configuration& Config)
+ProjectStore::ProjectStore(CidStore&			 Store,
+						   std::filesystem::path BasePath,
+						   GcManager&			 Gc,
+						   JobQueue&			 JobQueue,
+						   OpenProcessCache&	 InOpenProcessCache,
+						   const Configuration&	 Config)
 : m_Log(logging::Get("project"))
 , m_Gc(Gc)
 , m_CidStore(Store)
 , m_JobQueue(JobQueue)
+, m_OpenProcessCache(InOpenProcessCache)
 , m_ProjectBasePath(BasePath)
 , m_Config(Config)
 , m_DiskWriteBlocker(Gc.GetDiskWriteBlocker())
@@ -5248,9 +5255,8 @@ ProjectStore::Rpc(HttpServerRequest&	 HttpReq,
 	{
 		ZEN_TRACE_CPU("Store::Rpc::getchunks");
 
-		RpcAcceptOptions AcceptFlags = static_cast<RpcAcceptOptions>(Cb["AcceptFlags"sv].AsUInt16(0u));
-		// TODO: Move OpenProccessCache to a more general place
-		//		int32_t TargetProcessId = Cb["Pid"sv].AsInt32(0);
+		RpcAcceptOptions AcceptFlags	 = static_cast<RpcAcceptOptions>(Cb["AcceptFlags"sv].AsUInt16(0u));
+		int32_t			 TargetProcessId = Cb["Pid"sv].AsInt32(0);
 
 		CbPackage								 ResponsePackage;
 		std::pair<HttpResponseCode, std::string> Result = GetChunks(ProjectId, OplogId, Cb, ResponsePackage);
@@ -5265,7 +5271,7 @@ ProjectStore::Rpc(HttpServerRequest&	 HttpReq,
 				{
 					Flags |= FormatFlags::kDenyPartialLocalReferences;
 				}
-				// TargetProcessHandle = m_OpenProcessCache.GetProcessHandle(Context.SessionId, TargetPid);
+				TargetProcessHandle = m_OpenProcessCache.GetProcessHandle(HttpReq.SessionId(), TargetProcessId);
 			}
 
 			CompositeBuffer RpcResponseBuffer = FormatPackageMessageBuffer(ResponsePackage, Flags, TargetProcessHandle);
@@ -6642,6 +6648,7 @@ TEST_CASE("project.store.create")
 	ScopedTemporaryDirectory TempDir;
 
 	auto				  JobQueue = MakeJobQueue(1, ""sv);
+	OpenProcessCache	  ProcessCache;
 	GcManager			  Gc;
 	CidStore			  CidStore(Gc);
 	CidStoreConfiguration CidConfig = {.RootDirectory = TempDir.Path() / "cas", .TinyValueThreshold = 1024, .HugeValueThreshold = 4096};
@@ -6649,7 +6656,7 @@ TEST_CASE("project.store.create")
 
 	std::string_view	  ProjectName("proj1"sv);
 	std::filesystem::path BasePath = TempDir.Path() / "projectstore";
-	ProjectStore		  ProjectStore(CidStore, BasePath, Gc, *JobQueue, ProjectStore::Configuration{});
+	ProjectStore		  ProjectStore(CidStore, BasePath, Gc, *JobQueue, ProcessCache, ProjectStore::Configuration{});
 	std::filesystem::path RootDir		  = TempDir.Path() / "root";
 	std::filesystem::path EngineRootDir	  = TempDir.Path() / "engine";
 	std::filesystem::path ProjectRootDir  = TempDir.Path() / "game";
@@ -6672,13 +6679,14 @@ TEST_CASE("project.store.lifetimes")
 	ScopedTemporaryDirectory TempDir;
 
 	auto				  JobQueue = MakeJobQueue(1, ""sv);
+	OpenProcessCache	  ProcessCache;
 	GcManager			  Gc;
 	CidStore			  CidStore(Gc);
 	CidStoreConfiguration CidConfig = {.RootDirectory = TempDir.Path() / "cas", .TinyValueThreshold = 1024, .HugeValueThreshold = 4096};
 	CidStore.Initialize(CidConfig);
 
 	std::filesystem::path BasePath = TempDir.Path() / "projectstore";
-	ProjectStore		  ProjectStore(CidStore, BasePath, Gc, *JobQueue, ProjectStore::Configuration{});
+	ProjectStore		  ProjectStore(CidStore, BasePath, Gc, *JobQueue, ProcessCache, ProjectStore::Configuration{});
 	std::filesystem::path RootDir		  = TempDir.Path() / "root";
 	std::filesystem::path EngineRootDir	  = TempDir.Path() / "engine";
 	std::filesystem::path ProjectRootDir  = TempDir.Path() / "game";
@@ -6734,13 +6742,14 @@ TEST_CASE_TEMPLATE("project.store.export",
 	ScopedTemporaryDirectory ExportDir;
 
 	auto				  JobQueue = MakeJobQueue(1, ""sv);
+	OpenProcessCache	  ProcessCache;
 	GcManager			  Gc;
 	CidStore			  CidStore(Gc);
 	CidStoreConfiguration CidConfig = {.RootDirectory = TempDir.Path() / "cas", .TinyValueThreshold = 1024, .HugeValueThreshold = 4096};
 	CidStore.Initialize(CidConfig);
 
 	std::filesystem::path BasePath = TempDir.Path() / "projectstore";
-	ProjectStore		  ProjectStore(CidStore, BasePath, Gc, *JobQueue, ProjectStore::Configuration{});
+	ProjectStore		  ProjectStore(CidStore, BasePath, Gc, *JobQueue, ProcessCache, ProjectStore::Configuration{});
 	std::filesystem::path RootDir		  = TempDir.Path() / "root";
 	std::filesystem::path EngineRootDir	  = TempDir.Path() / "engine";
 	std::filesystem::path ProjectRootDir  = TempDir.Path() / "game";
@@ -6836,13 +6845,14 @@ TEST_CASE("project.store.gc")
 	ScopedTemporaryDirectory TempDir;
 
 	auto				  JobQueue = MakeJobQueue(1, ""sv);
+	OpenProcessCache	  ProcessCache;
 	GcManager			  Gc;
 	CidStore			  CidStore(Gc);
 	CidStoreConfiguration CidConfig = {.RootDirectory = TempDir.Path() / "cas", .TinyValueThreshold = 1024, .HugeValueThreshold = 4096};
 	CidStore.Initialize(CidConfig);
 
 	std::filesystem::path BasePath = TempDir.Path() / "projectstore";
-	ProjectStore		  ProjectStore(CidStore, BasePath, Gc, *JobQueue, ProjectStore::Configuration{});
+	ProjectStore		  ProjectStore(CidStore, BasePath, Gc, *JobQueue, ProcessCache, ProjectStore::Configuration{});
 	std::filesystem::path RootDir		= TempDir.Path() / "root";
 	std::filesystem::path EngineRootDir = TempDir.Path() / "engine";
 
@@ -7036,13 +7046,14 @@ TEST_CASE("project.store.gc.prep")
 	ScopedTemporaryDirectory TempDir;
 
 	auto				  JobQueue = MakeJobQueue(1, ""sv);
+	OpenProcessCache	  ProcessCache;
 	GcManager			  Gc;
 	CidStore			  CidStore(Gc);
 	CidStoreConfiguration CidConfig = {.RootDirectory = TempDir.Path() / "cas", .TinyValueThreshold = 1024, .HugeValueThreshold = 4096};
 	CidStore.Initialize(CidConfig);
 
 	std::filesystem::path BasePath = TempDir.Path() / "projectstore";
-	ProjectStore		  ProjectStore(CidStore, BasePath, Gc, *JobQueue, ProjectStore::Configuration{});
+	ProjectStore		  ProjectStore(CidStore, BasePath, Gc, *JobQueue, ProcessCache, ProjectStore::Configuration{});
 	std::filesystem::path RootDir		= TempDir.Path() / "root";
 	std::filesystem::path EngineRootDir = TempDir.Path() / "engine";
 
@@ -7250,13 +7261,14 @@ TEST_CASE("project.store.rpc.getchunks")
 	ScopedTemporaryDirectory TempDir;
 
 	auto				  JobQueue = MakeJobQueue(1, ""sv);
+	OpenProcessCache	  ProcessCache;
 	GcManager			  Gc;
 	CidStore			  CidStore(Gc);
 	CidStoreConfiguration CidConfig = {.RootDirectory = TempDir.Path() / "cas"sv, .TinyValueThreshold = 1024, .HugeValueThreshold = 4096};
 	CidStore.Initialize(CidConfig);
 
 	std::filesystem::path BasePath = TempDir.Path() / "projectstore"sv;
-	ProjectStore		  ProjectStore(CidStore, BasePath, Gc, *JobQueue, ProjectStore::Configuration{});
+	ProjectStore		  ProjectStore(CidStore, BasePath, Gc, *JobQueue, ProcessCache, ProjectStore::Configuration{});
 	std::filesystem::path RootDir		= TempDir.Path() / "root"sv;
 	std::filesystem::path EngineRootDir = TempDir.Path() / "engine"sv;
 
@@ -8171,13 +8183,14 @@ TEST_CASE("project.store.partial.read")
 	ScopedTemporaryDirectory TempDir;
 
 	auto				  JobQueue = MakeJobQueue(1, ""sv);
+	OpenProcessCache	  ProcessCache;
 	GcManager			  Gc;
 	CidStore			  CidStore(Gc);
 	CidStoreConfiguration CidConfig = {.RootDirectory = TempDir.Path() / "cas"sv, .TinyValueThreshold = 1024, .HugeValueThreshold = 4096};
 	CidStore.Initialize(CidConfig);
 
 	std::filesystem::path BasePath = TempDir.Path() / "projectstore"sv;
-	ProjectStore		  ProjectStore(CidStore, BasePath, Gc, *JobQueue, ProjectStore::Configuration{});
+	ProjectStore		  ProjectStore(CidStore, BasePath, Gc, *JobQueue, ProcessCache, ProjectStore::Configuration{});
 	std::filesystem::path RootDir		= TempDir.Path() / "root"sv;
 	std::filesystem::path EngineRootDir = TempDir.Path() / "engine"sv;
 
@@ -8353,13 +8366,14 @@ TEST_CASE("project.store.iterateoplog")
 	ScopedTemporaryDirectory TempDir;
 
 	auto				  JobQueue = MakeJobQueue(1, ""sv);
+	OpenProcessCache	  ProcessCache;
 	GcManager			  Gc;
 	CidStore			  CidStore(Gc);
 	CidStoreConfiguration CidConfig = {.RootDirectory = TempDir.Path() / "cas"sv, .TinyValueThreshold = 1024, .HugeValueThreshold = 4096};
 	CidStore.Initialize(CidConfig);
 
 	std::filesystem::path BasePath = TempDir.Path() / "projectstore"sv;
-	ProjectStore		  ProjectStore(CidStore, BasePath, Gc, *JobQueue, ProjectStore::Configuration{});
+	ProjectStore		  ProjectStore(CidStore, BasePath, Gc, *JobQueue, ProcessCache, ProjectStore::Configuration{});
 	std::filesystem::path RootDir		= TempDir.Path() / "root"sv;
 	std::filesystem::path EngineRootDir = TempDir.Path() / "enginesv";
 
diff --git a/src/zenserver/projectstore/projectstore.h b/src/zenserver/projectstore/projectstore.h
index 4a33a367c..8f2d3ce0d 100644
--- a/src/zenserver/projectstore/projectstore.h
+++ b/src/zenserver/projectstore/projectstore.h
@@ -22,6 +22,7 @@ class CidStore;
 class AuthMgr;
 class ScrubContext;
 class JobQueue;
+class OpenProcessCache;
 
 enum class HttpResponseCode;
 
@@ -67,7 +68,12 @@ public:
 	{
 	};
 
-	ProjectStore(CidStore& Store, std::filesystem::path BasePath, GcManager& Gc, JobQueue& JobQueue, const Configuration& Config);
+	ProjectStore(CidStore&			   Store,
+				 std::filesystem::path BasePath,
+				 GcManager&			   Gc,
+				 JobQueue&			   JobQueue,
+				 OpenProcessCache&	   InOpenProcessCache,
+				 const Configuration&  Config);
 	~ProjectStore();
 
 	struct Project;
@@ -495,6 +501,7 @@ private:
 	GcManager&								  m_Gc;
 	CidStore&								  m_CidStore;
 	JobQueue&								  m_JobQueue;
+	OpenProcessCache&						  m_OpenProcessCache;
 	std::filesystem::path					  m_ProjectBasePath;
 	const Configuration						  m_Config;
 	mutable RwLock							  m_ProjectsLock;
diff --git a/src/zenserver/zenserver.cpp b/src/zenserver/zenserver.cpp
index 3714dfaeb..66b6cb858 100644
--- a/src/zenserver/zenserver.cpp
+++ b/src/zenserver/zenserver.cpp
@@ -243,7 +243,12 @@ ZenServer::Initialize(const ZenServerOptions& ServerOptions, ZenServerState::Zen
 
 	ZEN_INFO("instantiating project service");
 
-	m_ProjectStore = new ProjectStore(*m_CidStore, m_DataRoot / "projects", m_GcManager, *m_JobQueue, ProjectStore::Configuration{});
+	m_ProjectStore = new ProjectStore(*m_CidStore,
+									  m_DataRoot / "projects",
+									  m_GcManager,
+									  *m_JobQueue,
+									  *m_OpenProcessCache,
+									  ProjectStore::Configuration{});
 	m_HttpProjectService.reset(new HttpProjectService{*m_CidStore, m_ProjectStore, m_StatsService, *m_AuthMgr});
 
 	if (ServerOptions.WorksSpacesConfig.Enabled)
@@ -534,7 +539,8 @@ ZenServer::InitializeStructuredCache(const ZenServerOptions& ServerOptions)
 		Config.NamespaceConfig.DiskLayerConfig.BucketConfig.LargeObjectThreshold = 128 * 1024 * 1024;
 	}
 
-	m_CacheStore = new ZenCacheStore(m_GcManager, *m_JobQueue, m_DataRoot / "cache", Config, m_GcManager.GetDiskWriteBlocker());
+	m_CacheStore	   = new ZenCacheStore(m_GcManager, *m_JobQueue, m_DataRoot / "cache", Config, m_GcManager.GetDiskWriteBlocker());
+	m_OpenProcessCache = std::make_unique<OpenProcessCache>();
 
 	const ZenUpstreamCacheConfig& UpstreamConfig = ServerOptions.UpstreamCacheConfig;
 
@@ -616,7 +622,8 @@ ZenServer::InitializeStructuredCache(const ZenServerOptions& ServerOptions)
 																			m_StatsService,
 																			m_StatusService,
 																			*m_UpstreamCache,
-																			m_GcManager.GetDiskWriteBlocker());
+																			m_GcManager.GetDiskWriteBlocker(),
+																			*m_OpenProcessCache);
 
 	m_Http->RegisterService(*m_StructuredCacheService);
 	m_Http->RegisterService(*m_UpstreamService);
@@ -797,6 +804,7 @@ ZenServer::Cleanup()
 		m_UpstreamService.reset();
 		m_UpstreamCache.reset();
 		m_CacheStore = {};
+		m_OpenProcessCache.reset();
 
 		m_HttpWorkspacesService.reset();
 		m_Workspaces.reset();
diff --git a/src/zenserver/zenserver.h b/src/zenserver/zenserver.h
index b9d12689d..80054dc35 100644
--- a/src/zenserver/zenserver.h
+++ b/src/zenserver/zenserver.h
@@ -115,17 +115,18 @@ private:
 	inline void				SetNewState(ServerState NewState) { m_CurrentState = NewState; }
 	static std::string_view ToString(ServerState Value);
 
-	StatsReporter					 m_StatsReporter;
-	Ref<HttpServer>					 m_Http;
-	std::unique_ptr<AuthMgr>		 m_AuthMgr;
-	std::unique_ptr<HttpAuthService> m_AuthService;
-	HttpStatusService				 m_StatusService;
-	HttpStatsService				 m_StatsService;
-	GcManager						 m_GcManager;
-	GcScheduler						 m_GcScheduler{m_GcManager};
-	std::unique_ptr<CidStore>		 m_CidStore;
-	Ref<ZenCacheStore>				 m_CacheStore;
-	HttpTestService					 m_TestService;
+	StatsReporter					  m_StatsReporter;
+	Ref<HttpServer>					  m_Http;
+	std::unique_ptr<AuthMgr>		  m_AuthMgr;
+	std::unique_ptr<HttpAuthService>  m_AuthService;
+	HttpStatusService				  m_StatusService;
+	HttpStatsService				  m_StatsService;
+	GcManager						  m_GcManager;
+	GcScheduler						  m_GcScheduler{m_GcManager};
+	std::unique_ptr<CidStore>		  m_CidStore;
+	Ref<ZenCacheStore>				  m_CacheStore;
+	std::unique_ptr<OpenProcessCache> m_OpenProcessCache;
+	HttpTestService					  m_TestService;
 #if ZEN_WITH_TESTS
 	HttpTestingService m_TestingService;
 #endif