diff options
Diffstat (limited to 'src/zenserver')
| -rw-r--r-- | src/zenserver/storage/zenstorageserver.cpp | 4 | ||||
| -rw-r--r-- | src/zenserver/xmake.lua | 37 | ||||
| -rw-r--r-- | src/zenserver/zenserver.cpp | 23 | ||||
| -rw-r--r-- | src/zenserver/zenserver.h | 1 |
4 files changed, 55 insertions, 10 deletions
diff --git a/src/zenserver/storage/zenstorageserver.cpp b/src/zenserver/storage/zenstorageserver.cpp index e2f20f8b6..e4f8c6aa3 100644 --- a/src/zenserver/storage/zenstorageserver.cpp +++ b/src/zenserver/storage/zenstorageserver.cpp @@ -656,6 +656,10 @@ ZenStorageServer::Run() " / /\\ ___/| | \\ / \\| | ( <_> ) | \\/\\ ___/ \n" "/_______ \\___ >___| / /_______ /|__| \\____/|__| \\___ >\n" " \\/ \\/ \\/ \\/ \\/ \n"); + + ExtendableStringBuilder<256> BuildOptions; + GetBuildOptions(BuildOptions); + ZEN_INFO("Build options: {}", BuildOptions); } ZEN_INFO(ZEN_APP_NAME " now running (pid: {})", GetCurrentProcessId()); diff --git a/src/zenserver/xmake.lua b/src/zenserver/xmake.lua index 53d50313c..fb65fa949 100644 --- a/src/zenserver/xmake.lua +++ b/src/zenserver/xmake.lua @@ -18,7 +18,18 @@ target("zenserver") add_includedirs(".") set_symbols("debug") - add_deps("protozero", "asio") + add_deps("protozero", "asio", "cxxopts") + add_deps("sol2") + add_packages("json11") + add_packages("lua") + + if has_config("zenmimalloc") then + add_packages("mimalloc") + end + + if has_config("zensentry") then + add_packages("sentry-native") + end if is_mode("release") then set_optimize("fastest") @@ -48,15 +59,6 @@ target("zenserver") add_options("compute") add_options("exec") - add_packages( - "vcpkg::cxxopts", - "vcpkg::http-parser", - "vcpkg::json11", - "vcpkg::lua", - "vcpkg::mimalloc", - "vcpkg::sol2" - ) - -- to work around some unfortunate Ctrl-C behaviour on Linux/Mac due to -- our use of setsid() at startup we pass in `--no-detach` to zenserver -- ensure that it recieves signals when the user requests termination @@ -84,3 +86,18 @@ target("zenserver") os.execv(targetfile, args, {curdir = rundir, detach = option.get("detach")}) end end) + + after_build(function (target) + if has_config("zensentry") then + local crashpad_handler = "crashpad_handler" + if is_plat("windows") then + crashpad_handler = "crashpad_handler.exe" + end + local pkg = target:pkg("sentry-native") + if pkg then + local installdir = pkg:installdir() + os.cp(path.join(installdir, "bin/" .. crashpad_handler), target:targetdir()) + print("Copied " .. crashpad_handler .. " to output directory") + end + end + end) diff --git a/src/zenserver/zenserver.cpp b/src/zenserver/zenserver.cpp index 787f28693..5408f2f0b 100644 --- a/src/zenserver/zenserver.cpp +++ b/src/zenserver/zenserver.cpp @@ -13,6 +13,7 @@ #include <zencore/iobuffer.h> #include <zencore/jobqueue.h> #include <zencore/logging.h> +#include <zencore/memory/fmalloc.h> #include <zencore/scopeguard.h> #include <zencore/sentryintegration.h> #include <zencore/session.h> @@ -158,6 +159,28 @@ ZenServerBase::Finalize() } void +ZenServerBase::GetBuildOptions(StringBuilderBase& OutOptions) +{ + ZEN_MEMSCOPE(GetZenserverTag()); + + OutOptions << "ZEN_ADDRESS_SANITIZER=" << (ZEN_ADDRESS_SANITIZER ? "1" : "0"); + OutOptions << ","; + OutOptions << "ZEN_USE_SENTRY=" << (ZEN_USE_SENTRY ? "1" : "0"); + OutOptions << ","; + OutOptions << "ZEN_WITH_TESTS=" << (ZEN_WITH_TESTS ? "1" : "0"); + OutOptions << ","; + OutOptions << "ZEN_USE_MIMALLOC=" << (ZEN_USE_MIMALLOC ? "1" : "0"); + OutOptions << ","; + OutOptions << "ZEN_USE_RPMALLOC=" << (ZEN_USE_RPMALLOC ? "1" : "0"); + OutOptions << ","; + OutOptions << "ZEN_WITH_HTTPSYS=" << (ZEN_WITH_HTTPSYS ? "1" : "0"); + OutOptions << ","; + OutOptions << "ZEN_WITH_MEMTRACK=" << (ZEN_WITH_MEMTRACK ? "1" : "0"); + OutOptions << ","; + OutOptions << "ZEN_WITH_TRACE=" << (ZEN_WITH_TRACE ? "1" : "0"); +} + +void ZenServerBase::EnsureIoRunner() { ZEN_MEMSCOPE(GetZenserverTag()); diff --git a/src/zenserver/zenserver.h b/src/zenserver/zenserver.h index 09a994428..4de865a5f 100644 --- a/src/zenserver/zenserver.h +++ b/src/zenserver/zenserver.h @@ -45,6 +45,7 @@ public: protected: int Initialize(const ZenServerConfig& ServerOptions, ZenServerState::ZenServerEntry* ServerEntry); void Finalize(); + void GetBuildOptions(StringBuilderBase& OutOptions); protected: NamedMutex m_ServerMutex; |