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

Commit d84857fc authored by Daniel Zheng's avatar Daniel Zheng
Browse files

libsnapshot: remove op count check 

With variable block size compression being added, the number of ops
written cannot be calculated directly as easily since one op can cover
the data for multiple ops previously. We can get rid of this check for
XOR and Raw blocks as
within WriteOperation() we already make a check to see if we are
exceeding op_count_max limit.

We still need to keep this check for EmitZeroBlocks and EmitCopyBlocks
since the number of operations is determined ahead of time in those
function calls. Without this check in place, the ops will be added to
cached ops and return true when ops cannot be written.
with this change, v3 cow ota now works on cuttlefish with support for
variable block size compression.

Test: th
Change-Id: Ia55f152f5deb67a9022d0feff112345e72741dd3
parent 903f8e07

fs_mgr/libsnapshot/libsnapshot_cow/writer_v3.cpp

+3 −7
Original line number Diff line number Diff line
@@ -300,17 +300,11 @@ bool CowWriterV3::EmitCopy(uint64_t new_block, uint64_t old_block, uint64_t num_ 
}



bool CowWriterV3::EmitRawBlocks(uint64_t new_block_start, const void* data, size_t size) {

    if (!CheckOpCount(size / header_.block_size)) {

        return false;

    }

    return EmitBlocks(new_block_start, data, size, 0, 0, kCowReplaceOp);

}



bool CowWriterV3::EmitXorBlocks(uint32_t new_block_start, const void* data, size_t size,

                                uint32_t old_block, uint16_t offset) {

    if (!CheckOpCount(size / header_.block_size)) {

        return false;

    }

    return EmitBlocks(new_block_start, data, size, old_block, offset, kCowXorOp);

}
@@ -330,7 +324,9 @@ bool CowWriterV3::EmitBlocks(uint64_t new_block_start, const void* data, size_t 
    }

    const auto bytes = reinterpret_cast<const uint8_t*>(data);

    const size_t num_blocks = (size / header_.block_size);



    if (!CheckOpCount(num_blocks)) {

        return false;

    }

    for (size_t i = 0; i < num_blocks;) {

        const auto blocks_to_write =

                std::min<size_t>(batch_size_ - cached_data_.size(), num_blocks - i);