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

Commit 767478f4 authored by Mark Salyzyn's avatar Mark Salyzyn Committed by android-build-merger
Browse files

Merge "liblp: Add MetadataBuilder::UsedSpace()" am: 613963cd 

am: 3763ffe8

Change-Id: I75616201f9d9c09d8e85f91fd8296ca00f7ba60e
parents 231308e5 3763ffe8

fs_mgr/liblp/builder.cpp

+8 −0
Original line number Diff line number Diff line
@@ -482,6 +482,14 @@ uint64_t MetadataBuilder::AllocatableSpace() const { 
    return (geometry_.last_logical_sector - geometry_.first_logical_sector + 1) * LP_SECTOR_SIZE;

}



uint64_t MetadataBuilder::UsedSpace() const {

    uint64_t size = 0;

    for (const auto& partition : partitions_) {

        size += partition->size();

    }

    return size;

}



uint64_t MetadataBuilder::AlignSector(uint64_t sector) {

    // Note: when reading alignment info from the Kernel, we don't assume it

    // is aligned to the sector size, so we round up to the nearest sector.

fs_mgr/liblp/builder_test.cpp

+19 −5
Original line number Diff line number Diff line
@@ -202,14 +202,28 @@ TEST(liblp, InternalPartitionAlignment) { 
}



TEST(liblp, UseAllDiskSpace) {

    unique_ptr<MetadataBuilder> builder = MetadataBuilder::New(1024 * 1024, 1024, 2);

    EXPECT_EQ(builder->AllocatableSpace(), 1036288);

    static constexpr uint64_t total = 1024 * 1024;

    static constexpr uint64_t metadata = 1024;

    static constexpr uint64_t slots = 2;

    unique_ptr<MetadataBuilder> builder = MetadataBuilder::New(total, metadata, slots);

    // We reserve a geometry block (4KB) plus space for each copy of the

    // maximum size of a metadata blob. Then, we double that space since

    // we store a backup copy of everything.

    static constexpr uint64_t geometry = 4 * 1024;

    static constexpr uint64_t allocatable = total - (metadata * slots + geometry) * 2;

    EXPECT_EQ(builder->AllocatableSpace(), allocatable);

    EXPECT_EQ(builder->UsedSpace(), 0);



    Partition* system = builder->AddPartition("system", TEST_GUID, LP_PARTITION_ATTR_READONLY);

    ASSERT_NE(system, nullptr);

    EXPECT_EQ(builder->ResizePartition(system, 1036288), true);

    EXPECT_EQ(system->size(), 1036288);

    EXPECT_EQ(builder->ResizePartition(system, 1036289), false);

    EXPECT_EQ(builder->ResizePartition(system, allocatable), true);

    EXPECT_EQ(system->size(), allocatable);

    EXPECT_EQ(builder->UsedSpace(), allocatable);

    EXPECT_EQ(builder->AllocatableSpace(), allocatable);

    EXPECT_EQ(builder->ResizePartition(system, allocatable + 1), false);

    EXPECT_EQ(system->size(), allocatable);

    EXPECT_EQ(builder->UsedSpace(), allocatable);

    EXPECT_EQ(builder->AllocatableSpace(), allocatable);

}



TEST(liblp, BuildComplex) {

fs_mgr/liblp/include/liblp/builder.h

+1 −0
Original line number Diff line number Diff line
@@ -184,6 +184,7 @@ class MetadataBuilder { 


    // Amount of space that can be allocated to logical partitions.

    uint64_t AllocatableSpace() const;

    uint64_t UsedSpace() const;



    // Merge new block device information into previous values. Alignment values

    // are only overwritten if the new values are non-zero.