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

Commit 35935025 authored by David Anderson's avatar David Anderson
Browse files

libsnapshot: Remove fallible ICowReader::GetHeader. 

This function cannot fail, so replace it with an infallible version.
This is also slightly more efficient since there's no copying involved.

Bug: 280529365
Test: builds
Change-Id: Iccfd6e72bc2192f4e1efda50cf544e1e956a9263
parent 467af3d6

fs_mgr/libsnapshot/include/libsnapshot/cow_reader.h

+0 −2
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ class ICowReader { 
    virtual ~ICowReader() {}



    // Return the file header.

    virtual bool GetHeader(CowHeader* header) = 0;

    virtual CowHeader& GetHeader() = 0;



    // Return the file footer.
@@ -107,7 +106,6 @@ class CowReader final : public ICowReader { 
    bool InitForMerge(android::base::unique_fd&& fd);

    bool VerifyMergeOps() override;



    bool GetHeader(CowHeader* header) override;

    bool GetFooter(CowFooter* footer) override;



    bool GetLastLabel(uint64_t* label) override;

fs_mgr/libsnapshot/libsnapshot_cow/cow_api_test.cpp

+16 −14
Original line number Diff line number Diff line
@@ -62,15 +62,16 @@ TEST_F(CowTest, CopyContiguous) { 
    ASSERT_EQ(lseek(cow_->fd, 0, SEEK_SET), 0);



    CowReader reader;

    CowHeader header;

    CowFooter footer;

    ASSERT_TRUE(reader.Parse(cow_->fd));

    ASSERT_TRUE(reader.GetHeader(&header));

    ASSERT_TRUE(reader.GetFooter(&footer));



    const auto& header = reader.GetHeader();

    ASSERT_EQ(header.magic, kCowMagicNumber);

    ASSERT_EQ(header.major_version, kCowVersionMajor);

    ASSERT_EQ(header.minor_version, kCowVersionMinor);

    ASSERT_EQ(header.block_size, options.block_size);



    CowFooter footer;

    ASSERT_TRUE(reader.GetFooter(&footer));

    ASSERT_EQ(footer.op.num_ops, 100);



    auto iter = reader.GetOpIter();
@@ -110,15 +111,16 @@ TEST_F(CowTest, ReadWrite) { 
    ASSERT_EQ(lseek(cow_->fd, 0, SEEK_SET), 0);



    CowReader reader;

    CowHeader header;

    CowFooter footer;

    ASSERT_TRUE(reader.Parse(cow_->fd));

    ASSERT_TRUE(reader.GetHeader(&header));

    ASSERT_TRUE(reader.GetFooter(&footer));



    const auto& header = reader.GetHeader();

    ASSERT_EQ(header.magic, kCowMagicNumber);

    ASSERT_EQ(header.major_version, kCowVersionMajor);

    ASSERT_EQ(header.minor_version, kCowVersionMinor);

    ASSERT_EQ(header.block_size, options.block_size);



    CowFooter footer;

    ASSERT_TRUE(reader.GetFooter(&footer));

    ASSERT_EQ(footer.op.num_ops, 4);



    auto iter = reader.GetOpIter();
@@ -188,15 +190,16 @@ TEST_F(CowTest, ReadWriteXor) { 
    ASSERT_EQ(lseek(cow_->fd, 0, SEEK_SET), 0);



    CowReader reader;

    CowHeader header;

    CowFooter footer;

    ASSERT_TRUE(reader.Parse(cow_->fd));

    ASSERT_TRUE(reader.GetHeader(&header));

    ASSERT_TRUE(reader.GetFooter(&footer));



    const auto& header = reader.GetHeader();

    ASSERT_EQ(header.magic, kCowMagicNumber);

    ASSERT_EQ(header.major_version, kCowVersionMajor);

    ASSERT_EQ(header.minor_version, kCowVersionMinor);

    ASSERT_EQ(header.block_size, options.block_size);



    CowFooter footer;

    ASSERT_TRUE(reader.GetFooter(&footer));

    ASSERT_EQ(footer.op.num_ops, 4);



    auto iter = reader.GetOpIter();
@@ -1065,8 +1068,7 @@ AssertionResult WriteDataBlock(CowWriter* writer, uint64_t new_block, std::strin 


AssertionResult CompareDataBlock(CowReader* reader, const CowOperation& op,

                                 const std::string& data) {

    CowHeader header;

    reader->GetHeader(&header);

    const auto& header = reader->GetHeader();



    std::string cmp = data;

    cmp.resize(header.block_size, '\0');

fs_mgr/libsnapshot/libsnapshot_cow/cow_reader.cpp

+0 −5
Original line number Diff line number Diff line
@@ -544,11 +544,6 @@ bool CowReader::VerifyMergeOps() { 
    return true;

}



bool CowReader::GetHeader(CowHeader* header) {

    *header = header_;

    return true;

}



bool CowReader::GetFooter(CowFooter* footer) {

    if (!footer_) return false;

    *footer = footer_.value();

fs_mgr/libsnapshot/libsnapshot_cow/cow_writer.cpp

+2 −1
Original line number Diff line number Diff line
@@ -392,10 +392,11 @@ bool CowWriter::OpenForAppend(uint64_t label) { 
    auto reader = std::make_unique<CowReader>();

    std::queue<CowOperation> toAdd;



    if (!reader->Parse(fd_, {label}) || !reader->GetHeader(&header_)) {

    if (!reader->Parse(fd_, {label})) {

        return false;

    }



    header_ = reader->GetHeader();

    options_.block_size = header_.block_size;

    options_.cluster_ops = header_.cluster_ops;

fs_mgr/libsnapshot/libsnapshot_cow/inspect_cow.cpp

+1 −5
Original line number Diff line number Diff line
@@ -94,11 +94,7 @@ static bool Inspect(const std::string& path, Options opt) { 
        return false;

    }



    CowHeader header;

    if (!reader.GetHeader(&header)) {

        LOG(ERROR) << "could not get header: " << path;

        return false;

    }

    const CowHeader& header = reader.GetHeader();

    CowFooter footer;

    bool has_footer = false;

    if (reader.GetFooter(&footer)) has_footer = true;