Merge branch 'main' into lm/restrict-content-type

1 files changed, 61 insertions, 8 deletions

diff --git a/src/zenserver/main.cpp b/src/zenserver/main.cpp
index 3a58d1f4a..09ecc48e5 100644
--- a/src/zenserver/main.cpp
+++ b/src/zenserver/main.cpp
@@ -19,10 +19,13 @@
 #include <zencore/thread.h>
 #include <zencore/trace.h>
 #include <zentelemetry/otlptrace.h>
-#include <zenutil/commandlineoptions.h>
+#include <zenutil/config/commandlineoptions.h>
 #include <zenutil/service.h>
 
 #include "diag/logging.h"
+
+#include "compute/computeserver.h"
+
 #include "storage/storageconfig.h"
 #include "storage/zenstorageserver.h"
 
@@ -38,7 +41,6 @@
 // in some shared code into the executable
 
 #if ZEN_WITH_TESTS
-#	define ZEN_TEST_WITH_RUNNER 1
 #	include <zencore/testing.h>
 #endif
 
@@ -61,11 +63,19 @@ namespace zen {
 
 #if ZEN_PLATFORM_WINDOWS
 
-template<class T>
+/** Windows Service wrapper for Zen servers
+ *
+ * This class wraps a Zen server main entry point (the Main template parameter)
+ * into a Windows Service by implementing the WindowsService interface.
+ *
+ * The Main type needs to implement the virtual functions from the ZenServerMain
+ * base class, which provides the actual server logic.
+ */
+template<class Main>
 class ZenWindowsService : public WindowsService
 {
 public:
-	ZenWindowsService(typename T::Config& ServerOptions) : m_EntryPoint(ServerOptions) {}
+	ZenWindowsService(typename Main::Config& ServerOptions) : m_EntryPoint(ServerOptions) {}
 
 	ZenWindowsService(const ZenWindowsService&) = delete;
 	ZenWindowsService& operator=(const ZenWindowsService&) = delete;
@@ -73,7 +83,7 @@ public:
 	virtual int Run() override { return m_EntryPoint.Run(); }
 
 private:
-	T m_EntryPoint;
+	Main m_EntryPoint;
 };
 
 #endif	// ZEN_PLATFORM_WINDOWS
@@ -84,6 +94,23 @@ private:
 
 namespace zen {
 
+/** Application main entry point template
+ *
+ * This function handles common application startup tasks while allowing
+ * different server types to be plugged in via the Main template parameter.
+ *
+ * On Windows, this function also handles platform-specific service
+ * installation and uninstallation.
+ *
+ * The Main type needs to implement the virtual functions from the ZenServerMain
+ * base class, which provides the actual server logic.
+ *
+ * The Main type is also expected to provide the following members:
+ *
+ * typedef Config -- Server configuration type, derived from ZenServerConfig
+ * typedef Configurator -- Server configuration handler type, implements ZenServerConfiguratorBase
+ *
+ */
 template<class Main>
 int
 AppMain(int argc, char* argv[])
@@ -219,7 +246,7 @@ test_main(int argc, char** argv)
 #	endif	// ZEN_PLATFORM_WINDOWS
 
 	zen::logging::InitializeLogging();
-	zen::logging::SetLogLevel(zen::logging::level::Debug);
+	zen::logging::SetLogLevel(zen::logging::Debug);
 
 	zen::MaximizeOpenFileCount();
 
@@ -239,16 +266,31 @@ main(int argc, char* argv[])
 	using namespace zen;
 	using namespace std::literals;
 
+	// note: doctest has locally (in thirdparty) been fixed to not cause shutdown
+	// 		 crashes due to TLS destructors
+	//
+	// mimalloc on the other hand might still be causing issues, in which case
+	// we should work out either how to eliminate the mimalloc dependency or how
+	// to configure it in a way that doesn't cause shutdown issues
+
+#if 0 	
 	auto _ = zen::MakeGuard([] {
 		// Allow some time for worker threads to unravel, in an effort
-		// to prevent shutdown races in TLS object destruction
+		// to prevent shutdown races in TLS object destruction, mainly due to
+		// threads which we don't directly control (Windows thread pool) and
+		// therefore can't join.
+		//
+		// This isn't a great solution, but for now it seems to help reduce
+		// shutdown crashes observed in some situations.
 		WaitForThreads(1000);
 	});
+#endif
 
 	enum
 	{
 		kHub,
 		kStore,
+		kCompute,
 		kTest
 	} ServerMode = kStore;
 
@@ -258,10 +300,14 @@ main(int argc, char* argv[])
 		{
 			ServerMode = kHub;
 		}
-		else if (argv[1] == "store"sv)
+		else if ((argv[1] == "store"sv) || (argv[1] == "storage"sv))
 		{
 			ServerMode = kStore;
 		}
+		else if (argv[1] == "compute"sv)
+		{
+			ServerMode = kCompute;
+		}
 		else if (argv[1] == "test"sv)
 		{
 			ServerMode = kTest;
@@ -280,6 +326,13 @@ main(int argc, char* argv[])
 			break;
 		case kHub:
 			return AppMain<ZenHubServerMain>(argc, argv);
+		case kCompute:
+#if ZEN_WITH_COMPUTE_SERVICES
+			return AppMain<ZenComputeServerMain>(argc, argv);
+#else
+			fprintf(stderr, "compute services are not compiled in!\n");
+			exit(5);
+#endif
 		default:
 		case kStore:
 			return AppMain<ZenStorageServerMain>(argc, argv);