Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4215f1a9 authored by Daniel Zheng's avatar Daniel Zheng Committed by Gerrit Code Review
Browse files

Merge changes I5032300e,Idec3e051,I09be447b into main 

* changes:
  ZSTD read from wrong buf
  Fix warning
  Fix zstd optimization api usage
parents 7bb24d32 36882e98

fs_mgr/libsnapshot/include/libsnapshot/cow_compress.h

+2 −2
Original line number Diff line number Diff line
@@ -32,9 +32,9 @@ class ICompressor { 
    static std::unique_ptr<ICompressor> Gz(uint32_t compression_level);

    static std::unique_ptr<ICompressor> Brotli(uint32_t compression_level);

    static std::unique_ptr<ICompressor> Lz4(uint32_t compression_level);

    static std::unique_ptr<ICompressor> Zstd(uint32_t compression_level);

    static std::unique_ptr<ICompressor> Zstd(uint32_t compression_level, const int32_t BLOCK_SZ);



    static std::unique_ptr<ICompressor> Create(CowCompression compression);

    static std::unique_ptr<ICompressor> Create(CowCompression compression, const int32_t BLOCK_SZ);



    uint32_t GetCompressionLevel() const { return compression_level_; }

fs_mgr/libsnapshot/libsnapshot_cow/cow_compress.cpp

+7 −8
Original line number Diff line number Diff line
@@ -55,7 +55,8 @@ std::optional<CowCompressionAlgorithm> CompressionAlgorithmFromString(std::strin 
    }

}



std::unique_ptr<ICompressor> ICompressor::Create(CowCompression compression) {

std::unique_ptr<ICompressor> ICompressor::Create(CowCompression compression,

                                                 const int32_t BLOCK_SZ) {

    switch (compression.algorithm) {

        case kCowCompressLz4:

            return ICompressor::Lz4(compression.compression_level);
@@ -64,7 +65,7 @@ std::unique_ptr<ICompressor> ICompressor::Create(CowCompression compression) { 
        case kCowCompressGz:

            return ICompressor::Gz(compression.compression_level);

        case kCowCompressZstd:

            return ICompressor::Zstd(compression.compression_level);

            return ICompressor::Zstd(compression.compression_level, BLOCK_SZ);

        case kCowCompressNone:

            return nullptr;

    }
@@ -175,12 +176,10 @@ class BrotliCompressor final : public ICompressor { 


class ZstdCompressor final : public ICompressor {

  public:

    ZstdCompressor(uint32_t compression_level)

    ZstdCompressor(uint32_t compression_level, const uint32_t MAX_BLOCK_SIZE)

        : ICompressor(compression_level), zstd_context_(ZSTD_createCCtx(), ZSTD_freeCCtx) {

        ZSTD_CCtx_setParameter(zstd_context_.get(), ZSTD_c_compressionLevel, compression_level);

        // FIXME: hardcoding a value of 12 here for 4k blocks, should change to be either set by

        // user, or optimized depending on block size

        ZSTD_CCtx_setParameter(zstd_context_.get(), ZSTD_c_windowLog, 12);

        ZSTD_CCtx_setParameter(zstd_context_.get(), ZSTD_c_windowLog, log2(MAX_BLOCK_SIZE));

    };



    std::basic_string<uint8_t> Compress(const void* data, size_t length) const override {
@@ -326,8 +325,8 @@ std::unique_ptr<ICompressor> ICompressor::Lz4(uint32_t compression_level) { 
    return std::make_unique<Lz4Compressor>(compression_level);

}



std::unique_ptr<ICompressor> ICompressor::Zstd(uint32_t compression_level) {

    return std::make_unique<ZstdCompressor>(compression_level);

std::unique_ptr<ICompressor> ICompressor::Zstd(uint32_t compression_level, const int32_t BLOCK_SZ) {

    return std::make_unique<ZstdCompressor>(compression_level, BLOCK_SZ);

}



void CompressWorker::Finalize() {

fs_mgr/libsnapshot/libsnapshot_cow/cow_decompress.cpp

+1 −1
Original line number Diff line number Diff line
@@ -351,7 +351,7 @@ class ZstdDecompressor final : public IDecompressor { 
            return decompressed_size;

        }

        std::vector<unsigned char> ignore_buf(decompressed_size);

        if (!Decompress(buffer, decompressed_size)) {

        if (!Decompress(ignore_buf.data(), decompressed_size)) {

            return -1;

        }

        memcpy(buffer, ignore_buf.data() + ignore_bytes, buffer_size);

fs_mgr/libsnapshot/libsnapshot_cow/cow_reader.cpp

+1 −3
Original line number Diff line number Diff line
@@ -17,9 +17,7 @@ 
#include <sys/types.h>

#include <unistd.h>



#include <limits>

#include <optional>

#include <set>

#include <unordered_map>

#include <unordered_set>

#include <vector>
@@ -103,7 +101,7 @@ bool CowReader::Parse(android::base::borrowed_fd fd, std::optional<uint64_t> lab 
    footer_ = parser.footer();

    fd_size_ = parser.fd_size();

    last_label_ = parser.last_label();

    ops_ = std::move(parser.ops());

    ops_ = parser.ops();

    data_loc_ = parser.data_loc();



    // If we're resuming a write, we're not ready to merge

fs_mgr/libsnapshot/libsnapshot_cow/test_v2.cpp

+1 −1
Original line number Diff line number Diff line
@@ -480,7 +480,7 @@ TEST_P(CompressionTest, HorribleStream) { 
    std::string expected = "The quick brown fox jumps over the lazy dog.";

    expected.resize(4096, '\0');



    std::unique_ptr<ICompressor> compressor = ICompressor::Create(compression);

    std::unique_ptr<ICompressor> compressor = ICompressor::Create(compression, 4096);

    auto result = compressor->Compress(expected.data(), expected.size());

    ASSERT_FALSE(result.empty());