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

Commit 8212a70a authored by Alex Buynytskyy's avatar Alex Buynytskyy Committed by Android (Google) Code Review
Browse files

Merge "[incfs] Use a more efficient getBlockCount() for incfs v2" into sc-dev

parents eae3a9e4 4375a745

services/incremental/IncrementalService.cpp

+1 −1
Original line number Diff line number Diff line
@@ -2860,7 +2860,7 @@ void IncrementalService::DataLoaderStub::onDump(int fd) { 
    dprintf(fd, "        lastPendingReads: \n");

    const auto control = mService.mIncFs->openMount(mHealthPath);

    for (auto&& pendingRead : mLastPendingReads) {

        dprintf(fd, "          fileId: %s\n", mService.mIncFs->toString(pendingRead.id).c_str());

        dprintf(fd, "          fileId: %s\n", IncFsWrapper::toString(pendingRead.id).c_str());

        const auto metadata = mService.mIncFs->getMetadata(control, pendingRead.id);

        dprintf(fd, "          metadataHex: %s\n", toHexString(metadata).c_str());

        dprintf(fd, "          blockIndex: %d\n", pendingRead.block);

services/incremental/ServiceWrappers.cpp

+12 −1
Original line number Diff line number Diff line
@@ -134,6 +134,10 @@ private: 
    } mLooper;

};



std::string IncFsWrapper::toString(FileId fileId) {

    return incfs::toString(fileId);

}



class RealIncFs final : public IncFsWrapper {

public:

    RealIncFs() = default;
@@ -173,9 +177,16 @@ public: 
    FileId getFileId(const Control& control, std::string_view path) const final {

        return incfs::getFileId(control, path);

    }

    std::string toString(FileId fileId) const final { return incfs::toString(fileId); }

    std::pair<IncFsBlockIndex, IncFsBlockIndex> countFilledBlocks(

            const Control& control, std::string_view path) const final {

        if (incfs::features() & Features::v2) {

            const auto counts = incfs::getBlockCount(control, path);

            if (!counts) {

                return {-errno, -errno};

            }

            return {counts->filledDataBlocks + counts->filledHashBlocks,

                    counts->totalDataBlocks + counts->totalHashBlocks};

        }

        const auto fileId = incfs::getFileId(control, path);

        const auto fd = incfs::openForSpecialOps(control, fileId);

        int res = fd.get();

services/incremental/ServiceWrappers.h

+2 −1
Original line number Diff line number Diff line
@@ -84,6 +84,8 @@ public: 
            void(std::string_view root, std::string_view backingDir,

                 std::span<std::pair<std::string_view, std::string_view>> binds)>;



    static std::string toString(FileId fileId);



    virtual ~IncFsWrapper() = default;

    virtual Features features() const = 0;

    virtual void listExistingMounts(const ExistingMountCallback& cb) const = 0;
@@ -99,7 +101,6 @@ public: 
    virtual incfs::RawMetadata getMetadata(const Control& control, FileId fileid) const = 0;

    virtual incfs::RawMetadata getMetadata(const Control& control, std::string_view path) const = 0;

    virtual FileId getFileId(const Control& control, std::string_view path) const = 0;

    virtual std::string toString(FileId fileId) const = 0;

    virtual std::pair<IncFsBlockIndex, IncFsBlockIndex> countFilledBlocks(

            const Control& control, std::string_view path) const = 0;

    virtual incfs::LoadingState isFileFullyLoaded(const Control& control,

services/incremental/test/IncrementalServiceTest.cpp

+0 −1
Original line number Diff line number Diff line
@@ -362,7 +362,6 @@ public: 
    MOCK_CONST_METHOD2(getMetadata, RawMetadata(const Control& control, FileId fileid));

    MOCK_CONST_METHOD2(getMetadata, RawMetadata(const Control& control, std::string_view path));

    MOCK_CONST_METHOD2(getFileId, FileId(const Control& control, std::string_view path));

    MOCK_CONST_METHOD1(toString, std::string(FileId fileId));

    MOCK_CONST_METHOD2(countFilledBlocks,

                       std::pair<IncFsBlockIndex, IncFsBlockIndex>(const Control& control,

                                                                   std::string_view path));