clean up trace options parsing (#473)

* clean up trace command line options
explicitly shut down worker pools
* some additional startup trace scopes

1 files changed, 13 insertions, 2 deletions

diff --git a/src/zenserver/zenserver.cpp b/src/zenserver/zenserver.cpp
index 5cab54acc..71b52817c 100644
--- a/src/zenserver/zenserver.cpp
+++ b/src/zenserver/zenserver.cpp
@@ -128,6 +128,8 @@ ZenServer::OnReady()
 int
 ZenServer::Initialize(const ZenServerOptions& ServerOptions, ZenServerState::ZenServerEntry* ServerEntry)
 {
+	ZEN_TRACE_CPU("ZenServer::Initialize");
+
 	ZEN_MEMSCOPE(GetZenserverTag());
 	const std::string MutexName = fmt::format("zen_{}", ServerOptions.BasePort);
 
@@ -189,6 +191,7 @@ ZenServer::Initialize(const ZenServerOptions& ServerOptions, ZenServerState::Zen
 
 	// Setup authentication manager
 	{
+		ZEN_TRACE_CPU("Zenserver::InitAuth");
 		std::string EncryptionKey = ServerOptions.EncryptionKey;
 
 		if (EncryptionKey.empty())
@@ -379,6 +382,8 @@ ZenServer::Initialize(const ZenServerOptions& ServerOptions, ZenServerState::Zen
 void
 ZenServer::InitializeState(const ZenServerOptions& ServerOptions)
 {
+	ZEN_TRACE_CPU("ZenServer::InitializeState");
+
 	EnqueueSigIntTimer();
 
 	// Check root manifest to deal with schema versioning
@@ -543,6 +548,8 @@ ZenServer::InitializeState(const ZenServerOptions& ServerOptions)
 void
 ZenServer::InitializeStructuredCache(const ZenServerOptions& ServerOptions)
 {
+	ZEN_TRACE_CPU("ZenServer::InitializeStructuredCache");
+
 	using namespace std::literals;
 
 	ZEN_INFO("instantiating structured cache service");
@@ -815,6 +822,7 @@ ZenServer::RequestExit(int ExitCode)
 void
 ZenServer::Cleanup()
 {
+	ZEN_TRACE_CPU("ZenServer::Cleanup");
 	ZEN_INFO(ZEN_APP_NAME " cleaning up");
 	try
 	{
@@ -838,8 +846,6 @@ ZenServer::Cleanup()
 
 		Flush();
 
-		ShutdownWorkerPools();
-
 		m_AdminService.reset();
 		m_VfsService.reset();
 		m_ObjStoreService.reset();
@@ -863,6 +869,9 @@ ZenServer::Cleanup()
 		m_AuthService.reset();
 		m_AuthMgr.reset();
 		m_Http = {};
+
+		ShutdownWorkerPools();
+
 		m_JobQueue.reset();
 	}
 	catch (const std::exception& Ex)
@@ -1042,6 +1051,8 @@ ZenServer::CheckOwnerPid()
 void
 ZenServer::Flush()
 {
+	ZEN_TRACE_CPU("ZenServer::Flush");
+
 	for (auto& It : m_CidStores)
 	{
 		It.second->Flush();