Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "libincfs and libdataloader headers not using std::span" into rvc-dev

Browse Source
This commit is contained in:
Songchun Fan
2020-03-04 05:14:08 +00:00
committed by Android (Google) Code Review
parent 2b75d73bb6 9b75308974
commit 2c3f5d24ce
4 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/core/jni/com_android_server_pm_PackageManagerShellCommandDataLoader.cpp
View File

@@ -375,7 +375,7 @@ private:
} }
// Installation. // Installation.
bool onPrepareImage(const dataloader::DataLoaderInstallationFiles& addedFiles) final { bool onPrepareImage(dataloader::DataLoaderInstallationFiles addedFiles) final {
JNIEnv* env = GetOrAttachJNIEnvironment(mJvm); JNIEnv* env = GetOrAttachJNIEnvironment(mJvm);
const auto& jni = jniIds(env); const auto& jni = jniIds(env);
@@ -510,7 +510,7 @@ private:
consumed += remain; consumed += remain;
} }
auto res = mIfs->writeBlocks({blocks->data(), blocks->data() + blocks->size()}); auto res = mIfs->writeBlocks({blocks->data(), blocks->size()});
blocks->clear(); blocks->clear();
buffer->erase(buffer->begin(), buffer->begin() + consumed); buffer->erase(buffer->begin(), buffer->begin() + consumed);
@@ -530,7 +530,7 @@ private:
uint32_t count; uint32_t count;
}; };
void onPageReads(const android::dataloader::PageReads& pageReads) final { void onPageReads(android::dataloader::PageReads pageReads) final {
auto trace = atrace_is_tag_enabled(ATRACE_TAG); auto trace = atrace_is_tag_enabled(ATRACE_TAG);
if (CC_LIKELY(!trace)) { if (CC_LIKELY(!trace)) {
return; return;
@@ -600,7 +600,7 @@ private:
} }
// IFS callbacks. // IFS callbacks.
void onPendingReads(const dataloader::PendingReads& pendingReads) final { void onPendingReads(dataloader::PendingReads pendingReads) final {
CHECK(mIfs); CHECK(mIfs);
for (auto&& pendingRead : pendingReads) { for (auto&& pendingRead : pendingReads) {
const android::dataloader::FileId& fileId = pendingRead.id; const android::dataloader::FileId& fileId = pendingRead.id;

10
services/incremental/IncrementalService.h
View File

@@ -31,6 +31,7 @@
#include <limits> #include <limits>
#include <map> #include <map>
#include <mutex> #include <mutex>
#include <span>
#include <string> #include <string>
#include <string_view> #include <string_view>
#include <unordered_map> #include <unordered_map>
@@ -96,8 +97,7 @@ public:
std::optional<std::future<void>> onSystemReady(); std::optional<std::future<void>> onSystemReady();
StorageId createStorage(std::string_view mountPoint, StorageId createStorage(std::string_view mountPoint, DataLoaderParamsParcel&& dataLoaderParams,
DataLoaderParamsParcel&& dataLoaderParams,
const DataLoaderStatusListener& dataLoaderStatusListener, const DataLoaderStatusListener& dataLoaderStatusListener,
CreateOptions options = CreateOptions::Default); CreateOptions options = CreateOptions::Default);
StorageId createLinkedStorage(std::string_view mountPoint, StorageId linkedStorage, StorageId createLinkedStorage(std::string_view mountPoint, StorageId linkedStorage,
@@ -133,7 +133,8 @@ public:
std::string_view libDirRelativePath, std::string_view abi); std::string_view libDirRelativePath, std::string_view abi);
class IncrementalDataLoaderListener : public android::content::pm::BnDataLoaderStatusListener { class IncrementalDataLoaderListener : public android::content::pm::BnDataLoaderStatusListener {
public: public:
IncrementalDataLoaderListener(IncrementalService& incrementalService, DataLoaderStatusListener externalListener) IncrementalDataLoaderListener(IncrementalService& incrementalService,
DataLoaderStatusListener externalListener)
: incrementalService(incrementalService), externalListener(externalListener) {} : incrementalService(incrementalService), externalListener(externalListener) {}
// Callbacks interface // Callbacks interface
binder::Status onStatusChanged(MountId mount, int newStatus) override; binder::Status onStatusChanged(MountId mount, int newStatus) override;
@@ -206,7 +207,8 @@ private:
std::string&& source, std::string&& target, BindKind kind, std::string&& source, std::string&& target, BindKind kind,
std::unique_lock<std::mutex>& mainLock); std::unique_lock<std::mutex>& mainLock);
bool prepareDataLoader(IncFsMount& ifs, DataLoaderParamsParcel* params = nullptr, const DataLoaderStatusListener* externalListener = nullptr); bool prepareDataLoader(IncFsMount& ifs, DataLoaderParamsParcel* params = nullptr,
const DataLoaderStatusListener* externalListener = nullptr);
BindPathMap::const_iterator findStorageLocked(std::string_view path) const; BindPathMap::const_iterator findStorageLocked(std::string_view path) const;
StorageId findStorageId(std::string_view path) const; StorageId findStorageId(std::string_view path) const;

4
services/incremental/ServiceWrappers.h
View File

@@ -75,7 +75,7 @@ public:
virtual ErrorCode link(Control control, std::string_view from, std::string_view to) const = 0; virtual ErrorCode link(Control control, std::string_view from, std::string_view to) const = 0;
virtual ErrorCode unlink(Control control, std::string_view path) const = 0; virtual ErrorCode unlink(Control control, std::string_view path) const = 0;
virtual base::unique_fd openWrite(Control control, FileId id) const = 0; virtual base::unique_fd openWrite(Control control, FileId id) const = 0;
virtual ErrorCode writeBlocks(std::span<const DataBlock> blocks) const = 0; virtual ErrorCode writeBlocks(Span<const DataBlock> blocks) const = 0;
}; };
class ServiceManagerWrapper { class ServiceManagerWrapper {
@@ -177,7 +177,7 @@ public:
base::unique_fd openWrite(Control control, FileId id) const override { base::unique_fd openWrite(Control control, FileId id) const override {
return base::unique_fd{incfs::openWrite(control, id)}; return base::unique_fd{incfs::openWrite(control, id)};
} }
ErrorCode writeBlocks(std::span<const DataBlock> blocks) const override { ErrorCode writeBlocks(Span<const DataBlock> blocks) const override {
return incfs::writeBlocks(blocks); return incfs::writeBlocks(blocks);
} }
}; };

2
services/incremental/test/IncrementalServiceTest.cpp
View File

@@ -160,7 +160,7 @@ public:
ErrorCode(Control control, std::string_view from, std::string_view to)); ErrorCode(Control control, std::string_view from, std::string_view to));
MOCK_CONST_METHOD2(unlink, ErrorCode(Control control, std::string_view path)); MOCK_CONST_METHOD2(unlink, ErrorCode(Control control, std::string_view path));
MOCK_CONST_METHOD2(openWrite, base::unique_fd(Control control, FileId id)); MOCK_CONST_METHOD2(openWrite, base::unique_fd(Control control, FileId id));
MOCK_CONST_METHOD1(writeBlocks, ErrorCode(std::span<const DataBlock> blocks)); MOCK_CONST_METHOD1(writeBlocks, ErrorCode(Span<const DataBlock> blocks));
void makeFileFails() { ON_CALL(*this, makeFile(_, _, _, _, _)).WillByDefault(Return(-1)); } void makeFileFails() { ON_CALL(*this, makeFile(_, _, _, _, _)).WillByDefault(Return(-1)); }
void makeFileSuccess() { ON_CALL(*this, makeFile(_, _, _, _, _)).WillByDefault(Return(0)); } void makeFileSuccess() { ON_CALL(*this, makeFile(_, _, _, _, _)).WillByDefault(Return(0)); }