Merge branch 'main' into sb/zen-helpsb/zen-help

- Combine HelpCommand (this branch) with HistoryCommand (main) in zen CLI dispatcher
- Keep filter-aware TuiPickOne rewrite; adopt main's ASCII arrow glyphs in doc comment

1 files changed, 108 insertions, 38 deletions

diff --git a/src/zenserver/hub/storageserverinstance.cpp b/src/zenserver/hub/storageserverinstance.cpp
index 0c9354990..9d477fb10 100644
--- a/src/zenserver/hub/storageserverinstance.cpp
+++ b/src/zenserver/hub/storageserverinstance.cpp
@@ -8,16 +8,20 @@
 #include <zencore/filesystem.h>
 #include <zencore/fmtutils.h>
 #include <zencore/logging.h>
+#include <zencore/string.h>
+#include <zencore/timer.h>
 
 namespace zen {
 
-StorageServerInstance::StorageServerInstance(ZenServerEnvironment& RunEnvironment, const Configuration& Config, std::string_view ModuleId)
-: m_Config(Config)
+StorageServerInstance::StorageServerInstance(ZenServerEnvironment& RunEnvironment,
+											 HydrationBase&		   Hydration,
+											 const Configuration&  Config,
+											 std::string_view	   ModuleId)
+: m_Hydration(Hydration)
+, m_Config(Config)
 , m_ModuleId(ModuleId)
 , m_ServerInstance(RunEnvironment, ZenServerInstance::ServerMode::kStorageServer)
 {
-	m_BaseDir = RunEnvironment.CreateChildDir(ModuleId);
-	m_TempDir = Config.HydrationTempPath / ModuleId;
 }
 
 StorageServerInstance::~StorageServerInstance()
@@ -27,11 +31,13 @@ StorageServerInstance::~StorageServerInstance()
 void
 StorageServerInstance::SpawnServerProcess()
 {
+	Stopwatch SpawnTimer;
+
 	ZEN_ASSERT_FORMAT(!m_ServerInstance.IsRunning(), "Storage server instance for module '{}' is already running", m_ModuleId);
 	m_ServerInstance.ResetDeadProcess();
 
 	m_ServerInstance.SetServerExecutablePath(GetRunningExecutablePath());
-	m_ServerInstance.SetDataDir(m_BaseDir);
+	m_ServerInstance.SetDataDir(m_Config.StateDir);
 #if ZEN_PLATFORM_WINDOWS
 	m_ServerInstance.SetJobObject(m_JobObject);
 #endif
@@ -50,13 +56,61 @@ StorageServerInstance::SpawnServerProcess()
 	{
 		AdditionalOptions << " --config=\"" << MakeSafeAbsolutePath(m_Config.ConfigPath).string() << "\"";
 	}
+	if (!m_Config.Malloc.empty())
+	{
+		AdditionalOptions << " --malloc=" << m_Config.Malloc;
+	}
+	if (!m_Config.Trace.empty())
+	{
+		AdditionalOptions << " --trace=" << m_Config.Trace;
+	}
+	if (!m_Config.TraceHost.empty())
+	{
+		AdditionalOptions << " --tracehost=" << m_Config.TraceHost;
+	}
+	if (!m_Config.TraceFile.empty())
+	{
+		constexpr std::string_view ModuleIdPattern = "{moduleid}";
+		constexpr std::string_view PortPattern	   = "{port}";
+
+		std::string ResolvedTraceFile = m_Config.TraceFile;
+		for (size_t Pos = ResolvedTraceFile.find(ModuleIdPattern); Pos != std::string::npos;
+			 Pos		= ResolvedTraceFile.find(ModuleIdPattern, Pos))
+		{
+			ResolvedTraceFile.replace(Pos, ModuleIdPattern.length(), m_ModuleId);
+		}
+		std::string PortStr = fmt::format("{}", m_Config.BasePort);
+		for (size_t Pos = ResolvedTraceFile.find(PortPattern); Pos != std::string::npos; Pos = ResolvedTraceFile.find(PortPattern, Pos))
+		{
+			ResolvedTraceFile.replace(Pos, PortPattern.length(), PortStr);
+		}
+		AdditionalOptions << " --tracefile=\"" << ResolvedTraceFile << "\"";
+	}
 
 	m_ServerInstance.SpawnServerAndWaitUntilReady(m_Config.BasePort, AdditionalOptions.ToView());
-	ZEN_DEBUG("Storage server instance for module '{}' started, listening on port {}", m_ModuleId, m_Config.BasePort);
+	ZEN_INFO("Storage server instance for module '{}' started, listening on port {}, spawn took {}",
+			 m_ModuleId,
+			 m_Config.BasePort,
+			 NiceLatencyNs(SpawnTimer.GetElapsedTimeUs() * 1000));
 
 	m_ServerInstance.EnableShutdownOnDestroy();
 }
 
+void
+StorageServerInstance::ShutdownServerProcess()
+{
+	if (!m_ServerInstance.IsRunning())
+	{
+		return;
+	}
+	Stopwatch ShutdownTimer;
+	// m_ServerInstance.Shutdown() never throws.
+	m_ServerInstance.Shutdown();
+	ZEN_INFO("Storage server instance for module '{}' shut down, took {}",
+			 m_ModuleId,
+			 NiceLatencyNs(ShutdownTimer.GetElapsedTimeUs() * 1000));
+}
+
 ProcessMetrics
 StorageServerInstance::GetProcessMetrics() const
 {
@@ -77,7 +131,7 @@ StorageServerInstance::ProvisionLocked()
 		return;
 	}
 
-	ZEN_INFO("Provisioning storage server instance for module '{}', at '{}'", m_ModuleId, m_BaseDir);
+	ZEN_INFO("Provisioning storage server instance for module '{}', at '{}'", m_ModuleId, m_Config.StateDir);
 	try
 	{
 		Hydrate();
@@ -87,7 +141,7 @@ StorageServerInstance::ProvisionLocked()
 	{
 		ZEN_WARN("Failed spawning server instance for module '{}', at '{}' during provisioning. Reason: {}",
 				 m_ModuleId,
-				 m_BaseDir,
+				 m_Config.StateDir,
 				 Ex.what());
 		throw;
 	}
@@ -96,11 +150,7 @@ StorageServerInstance::ProvisionLocked()
 void
 StorageServerInstance::DeprovisionLocked()
 {
-	if (m_ServerInstance.IsRunning())
-	{
-		// m_ServerInstance.Shutdown() never throws.
-		m_ServerInstance.Shutdown();
-	}
+	ShutdownServerProcess();
 
 	// Crashed or Hibernated: process already dead; skip Shutdown.
 	// Dehydrate preserves instance state for future re-provisioning. Failure means saved state
@@ -117,17 +167,22 @@ StorageServerInstance::DeprovisionLocked()
 }
 
 void
-StorageServerInstance::HibernateLocked()
+StorageServerInstance::ObliterateLocked()
 {
-	// Signal server to shut down, but keep data around for later wake
+	ShutdownServerProcess();
 
-	if (!m_ServerInstance.IsRunning())
-	{
-		return;
-	}
+	std::atomic<bool>					   AbortFlag{false};
+	std::atomic<bool>					   PauseFlag{false};
+	HydrationConfig						   Config	= MakeHydrationConfig(AbortFlag, PauseFlag);
+	std::unique_ptr<HydrationStrategyBase> Hydrator = m_Hydration.CreateHydrator(Config);
+	Hydrator->Obliterate();
+}
 
-	// m_ServerInstance.Shutdown() never throws.
-	m_ServerInstance.Shutdown();
+void
+StorageServerInstance::HibernateLocked()
+{
+	// Signal server to shut down, but keep data around for later wake
+	ShutdownServerProcess();
 }
 
 void
@@ -146,7 +201,10 @@ StorageServerInstance::WakeLocked()
 	}
 	catch (const std::exception& Ex)
 	{
-		ZEN_WARN("Failed spawning server instance for module '{}', at '{}' during waking. Reason: {}", m_ModuleId, m_BaseDir, Ex.what());
+		ZEN_WARN("Failed spawning server instance for module '{}', at '{}' during waking. Reason: {}",
+				 m_ModuleId,
+				 m_Config.StateDir,
+				 Ex.what());
 		throw;
 	}
 }
@@ -154,29 +212,34 @@ StorageServerInstance::WakeLocked()
 void
 StorageServerInstance::Hydrate()
 {
-	HydrationConfig Config{.ServerStateDir		= m_BaseDir,
-						   .TempDir				= m_TempDir,
-						   .ModuleId			= m_ModuleId,
-						   .TargetSpecification = m_Config.HydrationTargetSpecification,
-						   .Options				= m_Config.HydrationOptions};
-
-	std::unique_ptr<HydrationStrategyBase> Hydrator = CreateHydrator(Config);
-
-	Hydrator->Hydrate();
+	std::atomic<bool>					   AbortFlag{false};
+	std::atomic<bool>					   PauseFlag{false};
+	HydrationConfig						   Config	= MakeHydrationConfig(AbortFlag, PauseFlag);
+	std::unique_ptr<HydrationStrategyBase> Hydrator = m_Hydration.CreateHydrator(Config);
+	m_HydrationState								= Hydrator->Hydrate();
 }
 
 void
 StorageServerInstance::Dehydrate()
 {
-	HydrationConfig Config{.ServerStateDir		= m_BaseDir,
-						   .TempDir				= m_TempDir,
-						   .ModuleId			= m_ModuleId,
-						   .TargetSpecification = m_Config.HydrationTargetSpecification,
-						   .Options				= m_Config.HydrationOptions};
+	std::atomic<bool>					   AbortFlag{false};
+	std::atomic<bool>					   PauseFlag{false};
+	HydrationConfig						   Config	= MakeHydrationConfig(AbortFlag, PauseFlag);
+	std::unique_ptr<HydrationStrategyBase> Hydrator = m_Hydration.CreateHydrator(Config);
+	Hydrator->Dehydrate(m_HydrationState);
+}
 
-	std::unique_ptr<HydrationStrategyBase> Hydrator = CreateHydrator(Config);
+HydrationConfig
+StorageServerInstance::MakeHydrationConfig(std::atomic<bool>& AbortFlag, std::atomic<bool>& PauseFlag)
+{
+	HydrationConfig Config{.ServerStateDir = m_Config.StateDir, .TempDir = m_Config.TempDir, .ModuleId = m_ModuleId};
+	if (m_Config.OptionalWorkerPool)
+	{
+		Config.Threading.emplace(
+			HydrationConfig::ThreadingOptions{.WorkerPool = m_Config.OptionalWorkerPool, .AbortFlag = &AbortFlag, .PauseFlag = &PauseFlag});
+	}
 
-	Hydrator->Dehydrate();
+	return Config;
 }
 
 StorageServerInstance::SharedLockedPtr::SharedLockedPtr() : m_Lock(nullptr), m_Instance(nullptr)
@@ -345,6 +408,13 @@ StorageServerInstance::ExclusiveLockedPtr::Deprovision()
 }
 
 void
+StorageServerInstance::ExclusiveLockedPtr::Obliterate()
+{
+	ZEN_ASSERT(m_Instance != nullptr);
+	m_Instance->ObliterateLocked();
+}
+
+void
 StorageServerInstance::ExclusiveLockedPtr::Hibernate()
 {
 	ZEN_ASSERT(m_Instance != nullptr);