From 3785e7b1f715406d944322fcae8ee313d3217d4b Mon Sep 17 00:00:00 2001 From: Daniel Zheng Date: Mon, 14 Aug 2023 17:13:06 -0700 Subject: [PATCH] support negative zstd compression levels Zstd compression goes all the way down to -7. zstd compression level -3 gives around the same compression ratio as lz4 level=3. Need further testing to see performance comparison Test: ota_from_target_files, update_device.py Change-Id: Ic082b31aa8af938f80be628c73667e02353835f0 --- .../include/libsnapshot/cow_compress.h | 24 +++++++++-------- .../include/libsnapshot/cow_format.h | 2 +- .../libsnapshot_cow/cow_compress.cpp | 26 ++++++++++--------- .../libsnapshot/libsnapshot_cow/writer_v2.cpp | 2 +- .../libsnapshot/libsnapshot_cow/writer_v3.cpp | 2 +- 5 files changed, 30 insertions(+), 26 deletions(-) diff --git a/fs_mgr/libsnapshot/include/libsnapshot/cow_compress.h b/fs_mgr/libsnapshot/include/libsnapshot/cow_compress.h index ac0424567..21dc6667a 100644 --- a/fs_mgr/libsnapshot/include/libsnapshot/cow_compress.h +++ b/fs_mgr/libsnapshot/include/libsnapshot/cow_compress.h @@ -17,7 +17,6 @@ #pragma once #include -#include #include "libsnapshot/cow_format.h" namespace android { @@ -25,27 +24,30 @@ namespace snapshot { class ICompressor { public: - explicit ICompressor(uint32_t compression_level, uint32_t block_size) + explicit ICompressor(const int32_t compression_level, const uint32_t block_size) : compression_level_(compression_level), block_size_(block_size) {} virtual ~ICompressor() {} // Factory methods for compression methods. - static std::unique_ptr Gz(uint32_t compression_level, const int32_t block_size); - static std::unique_ptr Brotli(uint32_t compression_level, - const int32_t block_size); - static std::unique_ptr Lz4(uint32_t compression_level, const int32_t block_size); - static std::unique_ptr Zstd(uint32_t compression_level, const int32_t block_size); + static std::unique_ptr Gz(const int32_t compression_level, + const uint32_t block_size); + static std::unique_ptr Brotli(const int32_t compression_level, + const uint32_t block_size); + static std::unique_ptr Lz4(const int32_t compression_level, + const uint32_t block_size); + static std::unique_ptr Zstd(const int32_t compression_level, + const uint32_t block_size); static std::unique_ptr Create(CowCompression compression, - const int32_t block_size); + const uint32_t block_size); - uint32_t GetCompressionLevel() const { return compression_level_; } + int32_t GetCompressionLevel() const { return compression_level_; } uint32_t GetBlockSize() const { return block_size_; } [[nodiscard]] virtual std::vector Compress(const void* data, size_t length) const = 0; private: - uint32_t compression_level_; - uint32_t block_size_; + const int32_t compression_level_; + const uint32_t block_size_; }; } // namespace snapshot } // namespace android \ No newline at end of file diff --git a/fs_mgr/libsnapshot/include/libsnapshot/cow_format.h b/fs_mgr/libsnapshot/include/libsnapshot/cow_format.h index 6865b1944..6a7153dcb 100644 --- a/fs_mgr/libsnapshot/include/libsnapshot/cow_format.h +++ b/fs_mgr/libsnapshot/include/libsnapshot/cow_format.h @@ -293,7 +293,7 @@ enum CowCompressionAlgorithm : uint8_t { }; struct CowCompression { CowCompressionAlgorithm algorithm = kCowCompressNone; - uint32_t compression_level = 0; + int32_t compression_level = 0; }; static constexpr uint8_t kCowReadAheadNotStarted = 0; diff --git a/fs_mgr/libsnapshot/libsnapshot_cow/cow_compress.cpp b/fs_mgr/libsnapshot/libsnapshot_cow/cow_compress.cpp index 0205f5086..bff525779 100644 --- a/fs_mgr/libsnapshot/libsnapshot_cow/cow_compress.cpp +++ b/fs_mgr/libsnapshot/libsnapshot_cow/cow_compress.cpp @@ -17,6 +17,7 @@ #include #include +#include #include #include #include @@ -57,7 +58,7 @@ std::optional CompressionAlgorithmFromString(std::strin } std::unique_ptr ICompressor::Create(CowCompression compression, - const int32_t block_size) { + const uint32_t block_size) { switch (compression.algorithm) { case kCowCompressLz4: return ICompressor::Lz4(compression.compression_level, block_size); @@ -101,7 +102,7 @@ uint32_t CompressWorker::GetDefaultCompressionLevel(CowCompressionAlgorithm comp class GzCompressor final : public ICompressor { public: - GzCompressor(uint32_t compression_level, const uint32_t block_size) + GzCompressor(int32_t compression_level, const uint32_t block_size) : ICompressor(compression_level, block_size){}; std::vector Compress(const void* data, size_t length) const override { @@ -122,7 +123,7 @@ class GzCompressor final : public ICompressor { class Lz4Compressor final : public ICompressor { public: - Lz4Compressor(uint32_t compression_level, const uint32_t block_size) + Lz4Compressor(int32_t compression_level, const uint32_t block_size) : ICompressor(compression_level, block_size){}; std::vector Compress(const void* data, size_t length) const override { @@ -154,7 +155,7 @@ class Lz4Compressor final : public ICompressor { class BrotliCompressor final : public ICompressor { public: - BrotliCompressor(uint32_t compression_level, const uint32_t block_size) + BrotliCompressor(int32_t compression_level, const uint32_t block_size) : ICompressor(compression_level, block_size){}; std::vector Compress(const void* data, size_t length) const override { @@ -180,7 +181,7 @@ class BrotliCompressor final : public ICompressor { class ZstdCompressor final : public ICompressor { public: - ZstdCompressor(uint32_t compression_level, const uint32_t block_size) + ZstdCompressor(int32_t compression_level, const uint32_t block_size) : ICompressor(compression_level, block_size), zstd_context_(ZSTD_createCCtx(), ZSTD_freeCCtx) { ZSTD_CCtx_setParameter(zstd_context_.get(), ZSTD_c_compressionLevel, compression_level); @@ -318,22 +319,23 @@ bool CompressWorker::GetCompressedBuffers(std::vector>* com } } -std::unique_ptr ICompressor::Brotli(uint32_t compression_level, - const int32_t block_size) { +std::unique_ptr ICompressor::Brotli(const int32_t compression_level, + const uint32_t block_size) { return std::make_unique(compression_level, block_size); } -std::unique_ptr ICompressor::Gz(uint32_t compression_level, const int32_t block_size) { +std::unique_ptr ICompressor::Gz(const int32_t compression_level, + const uint32_t block_size) { return std::make_unique(compression_level, block_size); } -std::unique_ptr ICompressor::Lz4(uint32_t compression_level, - const int32_t block_size) { +std::unique_ptr ICompressor::Lz4(const int32_t compression_level, + const uint32_t block_size) { return std::make_unique(compression_level, block_size); } -std::unique_ptr ICompressor::Zstd(uint32_t compression_level, - const int32_t block_size) { +std::unique_ptr ICompressor::Zstd(const int32_t compression_level, + const uint32_t block_size) { return std::make_unique(compression_level, block_size); } diff --git a/fs_mgr/libsnapshot/libsnapshot_cow/writer_v2.cpp b/fs_mgr/libsnapshot/libsnapshot_cow/writer_v2.cpp index d0864e0a3..0993dbaef 100644 --- a/fs_mgr/libsnapshot/libsnapshot_cow/writer_v2.cpp +++ b/fs_mgr/libsnapshot/libsnapshot_cow/writer_v2.cpp @@ -134,7 +134,7 @@ bool CowWriterV2::ParseOptions() { return false; } if (parts.size() > 1) { - if (!android::base::ParseUint(parts[1], &compression_.compression_level)) { + if (!android::base::ParseInt(parts[1], &compression_.compression_level)) { LOG(ERROR) << "failed to parse compression level invalid type: " << parts[1]; return false; } diff --git a/fs_mgr/libsnapshot/libsnapshot_cow/writer_v3.cpp b/fs_mgr/libsnapshot/libsnapshot_cow/writer_v3.cpp index 73deafb05..95398e4b9 100644 --- a/fs_mgr/libsnapshot/libsnapshot_cow/writer_v3.cpp +++ b/fs_mgr/libsnapshot/libsnapshot_cow/writer_v3.cpp @@ -149,7 +149,7 @@ bool CowWriterV3::ParseOptions() { } if (parts.size() > 1) { - if (!android::base::ParseUint(parts[1], &compression_.compression_level)) { + if (!android::base::ParseInt(parts[1], &compression_.compression_level)) { LOG(ERROR) << "failed to parse compression level invalid type: " << parts[1]; return false; }