From 3feea108db690f880f6e30e6e8f974cfbb78eee3 Mon Sep 17 00:00:00 2001 From: JosJuice Date: Sun, 4 Oct 2020 00:09:55 +0200 Subject: [PATCH] DiscIO: Decrease RAM usage during zstd compression By calling ZSTD_CCtx_setPledgedSrcSize, we can let zstd know how large a chunk is going to be before which start compressing it, which lets zstd avoid allocating more memory than needed for various internal buffers. This greatly reduces the RAM usage when using a high compression level with a small chunk size, and doesn't have much of an effect in other circumstances. A side effect of calling ZSTD_CCtx_setPledgedSrcSize is that zstd by default will write the uncompressed size into the compressed data stream as metadata. In order to save space, and since the decompressed size can be figured out through the structure of the RVZ format anyway, we disable writing the uncompressed size by setting ZSTD_c_contentSizeFlag to 0. --- Source/Core/DiscIO/WIABlob.cpp | 4 ++-- Source/Core/DiscIO/WIACompression.cpp | 24 ++++++++++++++++++------ Source/Core/DiscIO/WIACompression.h | 10 +++++----- 3 files changed, 25 insertions(+), 13 deletions(-) diff --git a/Source/Core/DiscIO/WIABlob.cpp b/Source/Core/DiscIO/WIABlob.cpp index 4d4b10424228..999d3136acaf 100644 --- a/Source/Core/DiscIO/WIABlob.cpp +++ b/Source/Core/DiscIO/WIABlob.cpp @@ -1040,7 +1040,7 @@ std::optional> WIARVZFileReader::Compress(Compressor* compr { if (compressor) { - if (!compressor->Start() || !compressor->Compress(data, size) || !compressor->End()) + if (!compressor->Start(size) || !compressor->Compress(data, size) || !compressor->End()) return std::nullopt; data = compressor->GetData(); @@ -1564,7 +1564,7 @@ WIARVZFileReader::ProcessAndCompress(CompressThreadState* state, CompressPa if (state->compressor) { - if (!state->compressor->Start()) + if (!state->compressor->Start(entry.exception_lists.size() + entry.main_data.size())) return ConversionResultCode::InternalError; } diff --git a/Source/Core/DiscIO/WIACompression.cpp b/Source/Core/DiscIO/WIACompression.cpp index 20d19c487707..4fdf6cd4296b 100644 --- a/Source/Core/DiscIO/WIACompression.cpp +++ b/Source/Core/DiscIO/WIACompression.cpp @@ -446,7 +446,7 @@ PurgeCompressor::PurgeCompressor() PurgeCompressor::~PurgeCompressor() = default; -bool PurgeCompressor::Start() +bool PurgeCompressor::Start(std::optional size) { m_buffer.clear(); m_bytes_written = 0; @@ -550,7 +550,7 @@ Bzip2Compressor::~Bzip2Compressor() BZ2_bzCompressEnd(&m_stream); } -bool Bzip2Compressor::Start() +bool Bzip2Compressor::Start(std::optional size) { ASSERT_MSG(DISCIO, m_stream.state == nullptr, "Called Bzip2Compressor::Start() twice without calling Bzip2Compressor::End()"); @@ -674,7 +674,7 @@ LZMACompressor::~LZMACompressor() lzma_end(&m_stream); } -bool LZMACompressor::Start() +bool LZMACompressor::Start(std::optional size) { if (m_initialization_failed) return false; @@ -745,8 +745,11 @@ ZstdCompressor::ZstdCompressor(int compression_level) { m_stream = ZSTD_createCStream(); - if (ZSTD_isError(ZSTD_CCtx_setParameter(m_stream, ZSTD_c_compressionLevel, compression_level))) + if (ZSTD_isError(ZSTD_CCtx_setParameter(m_stream, ZSTD_c_compressionLevel, compression_level)) || + ZSTD_isError(ZSTD_CCtx_setParameter(m_stream, ZSTD_c_contentSizeFlag, 0))) + { m_stream = nullptr; + } } ZstdCompressor::~ZstdCompressor() @@ -754,7 +757,7 @@ ZstdCompressor::~ZstdCompressor() ZSTD_freeCStream(m_stream); } -bool ZstdCompressor::Start() +bool ZstdCompressor::Start(std::optional size) { if (!m_stream) return false; @@ -762,7 +765,16 @@ bool ZstdCompressor::Start() m_buffer.clear(); m_out_buffer = {}; - return !ZSTD_isError(ZSTD_CCtx_reset(m_stream, ZSTD_reset_session_only)); + if (ZSTD_isError(ZSTD_CCtx_reset(m_stream, ZSTD_reset_session_only))) + return false; + + if (size) + { + if (ZSTD_isError(ZSTD_CCtx_setPledgedSrcSize(m_stream, *size))) + return false; + } + + return true; } bool ZstdCompressor::Compress(const u8* data, size_t size) diff --git a/Source/Core/DiscIO/WIACompression.h b/Source/Core/DiscIO/WIACompression.h index 37e8cf3dc3f3..2a6bbc9f8dbe 100644 --- a/Source/Core/DiscIO/WIACompression.h +++ b/Source/Core/DiscIO/WIACompression.h @@ -154,7 +154,7 @@ class Compressor // First call Start, then AddDataOnlyForPurgeHashing/Compress any number of times, // then End, then GetData/GetSize any number of times. - virtual bool Start() = 0; + virtual bool Start(std::optional size) = 0; virtual bool AddPrecedingDataOnlyForPurgeHashing(const u8* data, size_t size) { return true; } virtual bool Compress(const u8* data, size_t size) = 0; virtual bool End() = 0; @@ -169,7 +169,7 @@ class PurgeCompressor final : public Compressor PurgeCompressor(); ~PurgeCompressor(); - bool Start() override; + bool Start(std::optional size) override; bool AddPrecedingDataOnlyForPurgeHashing(const u8* data, size_t size) override; bool Compress(const u8* data, size_t size) override; bool End() override; @@ -189,7 +189,7 @@ class Bzip2Compressor final : public Compressor Bzip2Compressor(int compression_level); ~Bzip2Compressor(); - bool Start() override; + bool Start(std::optional size) override; bool Compress(const u8* data, size_t size) override; bool End() override; @@ -211,7 +211,7 @@ class LZMACompressor final : public Compressor u8* compressor_data_size_out); ~LZMACompressor(); - bool Start() override; + bool Start(std::optional size) override; bool Compress(const u8* data, size_t size) override; bool End() override; @@ -234,7 +234,7 @@ class ZstdCompressor final : public Compressor ZstdCompressor(int compression_level); ~ZstdCompressor(); - bool Start() override; + bool Start(std::optional size) override; bool Compress(const u8* data, size_t size) override; bool End() override;