diff options
| author | Per Larsson <[email protected]> | 2021-09-07 10:26:22 +0200 |
|---|---|---|
| committer | Per Larsson <[email protected]> | 2021-09-07 10:26:22 +0200 |
| commit | c5dd3d32cb29ac963f61eb6c119d54ed14f94f9a (patch) | |
| tree | 57a04246635577f11a35bb9a670610d508e694e8 /zencore | |
| parent | Added custom cpr::Response formatter and removed duplicate logging code. (diff) | |
| parent | Clarified some async/sync behaviour in HTTP implementation (diff) | |
| download | zen-c5dd3d32cb29ac963f61eb6c119d54ed14f94f9a.tar.xz zen-c5dd3d32cb29ac963f61eb6c119d54ed14f94f9a.zip | |
Merge branch 'main' of https://github.com/EpicGames/zen
Diffstat (limited to 'zencore')
| -rw-r--r-- | zencore/crc32.cpp | 2 | ||||
| -rw-r--r-- | zencore/include/zencore/httpserver.h | 3 | ||||
| -rw-r--r-- | zencore/include/zencore/memory.h | 2 | ||||
| -rw-r--r-- | zencore/xmake.lua | 12 |
4 files changed, 16 insertions, 3 deletions
diff --git a/zencore/crc32.cpp b/zencore/crc32.cpp index cd381d49f..d4a3cac57 100644 --- a/zencore/crc32.cpp +++ b/zencore/crc32.cpp @@ -418,7 +418,7 @@ static const uint32_t CRCTablesSB8[8][256] = { 0xbd4e1337, 0x71e413a9, 0x7b211ab0, 0xb78b1a2e, 0x39041dcd, 0xf5ae1d53, 0x2c8e0fff, 0xe0240f61, 0x6eab0882, 0xa201081c, 0xa8c40105, 0x646e019b, 0xeae10678, 0x264b06e6}}; -#define BYTESWAP_ORDER32(x) (((x) >> 24) + (((x) >> 8) & 0xff00) + (((x) << 8) & 0xff0000) + ((x) << 24)) +#define BYTESWAP_ORDER32(x) (((x) >> 24) + (((x) >> 8) & 0xff00) + (((x) << 8) & 0xff0000) + ((x) << 24)) #define UE_PTRDIFF_TO_UINT32(argument) static_cast<uint32_t>(argument) template<typename T> diff --git a/zencore/include/zencore/httpserver.h b/zencore/include/zencore/httpserver.h index 2158f87a8..d4d9e21e0 100644 --- a/zencore/include/zencore/httpserver.h +++ b/zencore/include/zencore/httpserver.h @@ -222,6 +222,9 @@ public: This will return a null buffer if the contents are not fully available yet, and the handler should at that point return - another completion request will be issued once the contents have been received fully. + + NOTE: in practice, via the http.sys implementation this always operates synchronously. This should + be updated to provide fully asynchronous operation for better scalability on shared instances */ virtual IoBuffer ReadPayload() = 0; diff --git a/zencore/include/zencore/memory.h b/zencore/include/zencore/memory.h index 040f97025..5a324955d 100644 --- a/zencore/include/zencore/memory.h +++ b/zencore/include/zencore/memory.h @@ -53,7 +53,7 @@ public: inline void Free(void* Ptr) { ZEN_UNUSED(Ptr); /* no-op */ } ChunkingLinearAllocator(const ChunkingLinearAllocator&) = delete; - ChunkingLinearAllocator&operator=(const ChunkingLinearAllocator&) = delete; + ChunkingLinearAllocator& operator=(const ChunkingLinearAllocator&) = delete; private: uint8_t* m_ChunkCursor = nullptr; diff --git a/zencore/xmake.lua b/zencore/xmake.lua index 39eb4590e..5de7f476d 100644 --- a/zencore/xmake.lua +++ b/zencore/xmake.lua @@ -3,4 +3,14 @@ target('zencore') add_files("**.cpp") add_includedirs("include", {public=true}) add_includedirs("..\\3rdparty\\utfcpp\\source") - + add_linkdirs("$(projectdir)/3rdparty/BLAKE3/lib/Win64", "$(projectdir)/3rdparty/Oodle/lib/Win64") + add_packages( + "vcpkg::spdlog", + "vcpkg::fmt", + "vcpkg::doctest", + "vcpkg::lz4", + "vcpkg::cpr", + "vcpkg::curl", -- required by cpr + "vcpkg::zlib", -- required by curl + "vcpkg::xxhash", + "vcpkg::gsl-lite") |