Extended ZenServerInstance life cycle management

1 files changed, 16 insertions, 2 deletions

diff --git a/zenutil/include/zenserverprocess.h b/zenutil/include/zenserverprocess.h
index d2101c8e8..d0093537e 100644
--- a/zenutil/include/zenserverprocess.h
+++ b/zenutil/include/zenserverprocess.h
@@ -2,9 +2,11 @@
 
 #pragma once
 
+#include <zencore/enumflags.h>
 #include <zencore/thread.h>
 
 #include <spdlog/spdlog.h>
+#include <gsl/gsl-lite.hpp>
 
 #include <atomic>
 #include <filesystem>
@@ -36,7 +38,8 @@ struct ZenServerInstance
 	ZenServerInstance(ZenServerEnvironment& TestEnvironment);
 	~ZenServerInstance();
 
-	void			   SignalShutdown() { m_ShutdownEvent.Set(); }
+	void			   Shutdown();
+	void			   SignalShutdown();
 	void			   WaitUntilReady();
 	[[nodiscard]] bool WaitUntilReady(int Timeout);
 	void			   EnableTermination() { m_Terminate = true; }
@@ -49,6 +52,7 @@ struct ZenServerInstance
 	}
 
 	void SpawnServer(int BasePort = 0);
+
 	void AttachToRunningServer(int BasePort = 0);
 
 private:
@@ -59,6 +63,8 @@ private:
 	bool				  m_Terminate = false;
 	std::filesystem::path m_TestDir;
 	bool				  m_MeshEnabled = false;
+
+	void CreateShutdownEvent(int BasePort);
 };
 
 /** Shared system state
@@ -79,11 +85,19 @@ public:
 	{
 		std::atomic<uint32_t> Pid;
 		std::atomic<uint16_t> ListenPort;
-		uint16_t			  Flags;
+		std::atomic<uint16_t> Flags;
 		uint8_t				  SessionId[12];
 		uint8_t				  Padding[12];
 
+		enum class FlagsEnum : uint16_t
+		{
+			kShutdownPlease = 1 << 0
+		};
+
+		FRIEND_ENUM_CLASS_FLAGS(FlagsEnum);
+
 		void Reset();
+		void SignalShutdownRequest();
 	};
 
 	static_assert(sizeof(ZenServerEntry) == 32);