diff options
Diffstat (limited to 'src/zenserver')
| -rw-r--r-- | src/zenserver/hub/hydration.cpp | 6 | ||||
| -rw-r--r-- | src/zenserver/main.cpp | 24 | ||||
| -rw-r--r-- | src/zenserver/zenserver.cpp | 2 |
3 files changed, 8 insertions, 24 deletions
diff --git a/src/zenserver/hub/hydration.cpp b/src/zenserver/hub/hydration.cpp index 4a44da052..541127590 100644 --- a/src/zenserver/hub/hydration.cpp +++ b/src/zenserver/hub/hydration.cpp @@ -916,9 +916,9 @@ TEST_CASE("hydration.s3.current_state_json_selects_latest_folder") Hydrator->Dehydrate(); } - // ServerStateDir is now empty. Wait briefly so the v2 timestamp folder name is strictly later - // (timestamp resolution is 1 ms). - Sleep(2); + // ServerStateDir is now empty. Wait so the v2 timestamp folder name is strictly later + // (timestamp resolution is 1 ms, but macOS scheduler granularity requires a larger margin). + Sleep(100); // v2: dehydrate WITH a marker file that only v2 has CreateTestTree(ServerStateDir); diff --git a/src/zenserver/main.cpp b/src/zenserver/main.cpp index dff162b1c..00b7a67d7 100644 --- a/src/zenserver/main.cpp +++ b/src/zenserver/main.cpp @@ -249,7 +249,9 @@ test_main(int argc, char** argv) zen::MaximizeOpenFileCount(); - return ZEN_RUN_TESTS(argc, argv); + zen::testing::TestRunner Runner; + Runner.ApplyCommandLine(argc, argv); + return Runner.Run(); } #endif @@ -267,26 +269,6 @@ 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, 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, diff --git a/src/zenserver/zenserver.cpp b/src/zenserver/zenserver.cpp index de770156a..6aa02eb87 100644 --- a/src/zenserver/zenserver.cpp +++ b/src/zenserver/zenserver.cpp @@ -489,6 +489,7 @@ ZenServerBase::BuildSettingsList(const ZenServerConfig& ServerConfig) {"BasePort"sv, fmt::to_string(ServerConfig.BasePort)}, {"CoreLimit"sv, fmt::to_string(ServerConfig.CoreLimit)}, {"MemoryAllocator"sv, std::string(GMalloc->GetName())}, + {"AsioVersion"sv, fmt::format("{}.{}.{}", ASIO_VERSION / 100000, (ASIO_VERSION / 100) % 1000, ASIO_VERSION % 100)}, {"IsDebug"sv, fmt::to_string(ServerConfig.IsDebug)}, {"IsCleanStart"sv, fmt::to_string(ServerConfig.IsCleanStart)}, {"IsTest"sv, fmt::to_string(ServerConfig.IsTest)}, @@ -771,6 +772,7 @@ ZenServerMain::Run() ZEN_INFO(ZEN_APP_NAME " - starting on port {}, version '{}'", m_ServerOptions.BasePort, ZEN_CFG_VERSION_BUILD_STRING_FULL); ZEN_INFO(ZEN_APP_NAME " - memory allocator: {}", GMalloc->GetName()); + ZEN_INFO(ZEN_APP_NAME " - asio: {}.{}.{}", ASIO_VERSION / 100000, (ASIO_VERSION / 100) % 1000, ASIO_VERSION % 100); Entry = ServerState.Register(m_ServerOptions.BasePort); |