metin-server/m2dev-client-src
3
0
Fork 1
Code Issues 1 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

Optimize pack file loading

Browse Source 
- Add thread-local ZSTD decompression context reuse
- Integrate BufferPool for temporary buffers
- PackManager auto-uses BufferPool for all GetFile calls
- Thread-safe pack loading with mutex
This commit is contained in:
savis
2026-01-03 20:37:32 +01:00
parent 0958ea6214
commit e55fc4db17
4 changed files with 78 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/PackLib/Pack.cpp
View File

@@ -1,6 +1,18 @@
#include "Pack.h"
#include "EterLib/BufferPool.h"
#include <zstd.h>
static thread_local ZSTD_DCtx* g_zstdDCtx = nullptr;
static ZSTD_DCtx* GetThreadLocalZSTDContext()
{
if (!g_zstdDCtx)
{
g_zstdDCtx = ZSTD_createDCtx();
}
return g_zstdDCtx;
}
bool CPack::Open(const std::string& path, TPackFileMap& entries)
{
std::error_code ec;
@@ -38,27 +50,44 @@ bool CPack::Open(const std::string& path, TPackFileMap& entries)
}
bool CPack::GetFile(const TPackFileEntry& entry, TPackFile& result)
{
return GetFileWithPool(entry, result, nullptr);
}
bool CPack::GetFileWithPool(const TPackFileEntry& entry, TPackFile& result, CBufferPool* pPool)
{
result.resize(entry.file_size);
size_t offset = m_header.data_begin + entry.offset;
ZSTD_DCtx* dctx = GetThreadLocalZSTDContext();
switch (entry.encryption)
{
case 0: {
size_t decompressed_size = ZSTD_decompress(result.data(), result.size(), m_file.data() + offset, entry.compressed_size);
size_t decompressed_size = ZSTD_decompressDCtx(dctx, result.data(), result.size(), m_file.data() + offset, entry.compressed_size);
if (decompressed_size != entry.file_size) {
return false;
}
} break;
case 1: {
std::vector<uint8_t> compressed_data(entry.compressed_size);
std::vector<uint8_t> compressed_data;
if (pPool) {
compressed_data = pPool->Acquire(entry.compressed_size);
}
compressed_data.resize(entry.compressed_size);
memcpy(compressed_data.data(), m_file.data() + offset, entry.compressed_size);
m_decryption.Resynchronize(entry.iv, sizeof(entry.iv));
m_decryption.ProcessData(compressed_data.data(), compressed_data.data(), entry.compressed_size);
size_t decompressed_size = ZSTD_decompress(result.data(), result.size(), compressed_data.data(), compressed_data.size());
size_t decompressed_size = ZSTD_decompressDCtx(dctx, result.data(), result.size(), compressed_data.data(), compressed_data.size());
if (pPool) {
pPool->Release(std::move(compressed_data));
}
if (decompressed_size != entry.file_size) {
return false;
}