diff options
| author | Stefan Boberg <[email protected]> | 2025-11-07 14:49:13 +0100 |
|---|---|---|
| committer | GitHub Enterprise <[email protected]> | 2025-11-07 14:49:13 +0100 |
| commit | 24e43a913f29ac3b314354e8ce5175f135bcc64f (patch) | |
| tree | ca442937ceeb63461012b33a4576e9835099f106 /src/zencore/memory/memory.cpp | |
| parent | get oplog attachments (#622) (diff) | |
| download | zen-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/zencore/memory/memory.cpp')
| -rw-r--r-- | src/zencore/memory/memory.cpp | 38 |
1 files changed, 35 insertions, 3 deletions
diff --git a/src/zencore/memory/memory.cpp b/src/zencore/memory/memory.cpp index fced2a4d3..fc8de5d02 100644 --- a/src/zencore/memory/memory.cpp +++ b/src/zencore/memory/memory.cpp @@ -39,19 +39,23 @@ InitGMalloc() FMalloc* InitMalloc = GMalloc; // Pick a default base allocator based on availability/platform + // when using sanitizers, we should use the default/ansi allocator -#if ZEN_MIMALLOC_ENABLED +#if ZEN_OVERRIDE_NEW_DELETE + +# if ZEN_MIMALLOC_ENABLED if (Malloc == MallocImpl::None) { Malloc = MallocImpl::Mimalloc; } -#endif +# endif -#if ZEN_RPMALLOC_ENABLED +# if ZEN_RPMALLOC_ENABLED if (Malloc == MallocImpl::None) { Malloc = MallocImpl::Rpmalloc; } +# endif #endif // Process any command line overrides @@ -287,6 +291,8 @@ zen_free_aligned(void* Ptr, size_t Alignment) noexcept // EASTL operator new +#if ZEN_OVERRIDE_NEW_DELETE + void* operator new[](size_t size, const char* pName, int flags, unsigned debugFlags, const char* file, int line) { @@ -310,3 +316,29 @@ operator new[](size_t size, return zen_new_aligned(size, alignment); } + +#else + +void* +operator new[](size_t size, const char* pName, int flags, unsigned debugFlags, const char* file, int line) +{ + ZEN_UNUSED(pName, flags, debugFlags, file, line); + return ::operator new[](size); +} + +void* +operator new[](size_t size, + size_t alignment, + size_t alignmentOffset, + const char* pName, + int flags, + unsigned debugFlags, + const char* file, + int line) +{ + ZEN_UNUSED(alignmentOffset, pName, flags, debugFlags, file, line); + ZEN_ASSERT_SLOW(alignmentOffset == 0); // currently not supported + return ::operator new[](size, std::align_val_t(alignment)); +} + +#endif |