aboutsummaryrefslogtreecommitdiff
path: root/src/zenserver
diff options
context:
space:
mode:
authorStefan Boberg <[email protected]>2025-11-07 14:49:13 +0100
committerGitHub Enterprise <[email protected]>2025-11-07 14:49:13 +0100
commit24e43a913f29ac3b314354e8ce5175f135bcc64f (patch)
treeca442937ceeb63461012b33a4576e9835099f106 /src/zenserver
parentget oplog attachments (#622) (diff)
downloadzen-24e43a913f29ac3b314354e8ce5175f135bcc64f.tar.xz
zen-24e43a913f29ac3b314354e8ce5175f135bcc64f.zip
switch to xmake for package management (#611)
This change removes our dependency on vcpkg for package management, in favour of bringing some code in-tree in the `thirdparty` folder as well as using the xmake build-in package management feature. For the latter, all the package definitions are maintained in the zen repo itself, in the `repo` folder. It should now also be easier to build the project as it will no longer depend on having the right version of vcpkg installed, which has been a common problem for new people coming in to the codebase. Now you should only need xmake to build. * Bumps xmake requirement on github runners to 2.9.9 to resolve an issue where xmake on Windows invokes cmake with `v144` toolchain which does not exist * BLAKE3 is now in-tree at `thirdparty/blake3` * cpr is now in-tree at `thirdparty/cpr` * cxxopts is now in-tree at `thirdparty/cxxopts` * fmt is now in-tree at `thirdparty/fmt` * robin-map is now in-tree at `thirdparty/robin-map` * ryml is now in-tree at `thirdparty/ryml` * sol2 is now in-tree at `thirdparty/sol2` * spdlog is now in-tree at `thirdparty/spdlog` * utfcpp is now in-tree at `thirdparty/utfcpp` * xmake package repo definitions is in `repo` * implemented support for sanitizers. ASAN is supported on windows, TSAN, UBSAN, MSAN etc are supported on Linux/MacOS though I have not yet tested it extensively on MacOS * the zencore encryption implementation also now supports using mbedTLS which is used on MacOS, though for now we still use openssl on Linux * crashpad * bumps libcurl to 8.11.0 (from 8.8.0) which should address a rare build upload bug
Diffstat (limited to 'src/zenserver')
-rw-r--r--src/zenserver/storage/zenstorageserver.cpp4
-rw-r--r--src/zenserver/xmake.lua37
-rw-r--r--src/zenserver/zenserver.cpp23
-rw-r--r--src/zenserver/zenserver.h1
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;