[incfs] Space trimming for IncFS v1
Run a manual timed job that trims all files one by one on the
old version of IncFS, where it didn't do it automatically.
Bug: 183435580
Fixes: 183436717
Test: atest libincfs-test service.incremental_test
Change-Id: I57885b2826e383814822c767802f837135fd8464
diff --git a/services/incremental/ServiceWrappers.cpp b/services/incremental/ServiceWrappers.cpp
index 3465499..8e416f3 100644
--- a/services/incremental/ServiceWrappers.cpp
+++ b/services/incremental/ServiceWrappers.cpp
@@ -212,6 +212,9 @@
std::string_view path) const final {
return incfs::isFullyLoaded(control, path);
}
+ incfs::LoadingState isFileFullyLoaded(const Control& control, FileId id) const final {
+ return incfs::isFullyLoaded(control, id);
+ }
incfs::LoadingState isEverythingFullyLoaded(const Control& control) const final {
return incfs::isEverythingFullyLoaded(control);
}
@@ -227,9 +230,8 @@
ErrorCode writeBlocks(std::span<const incfs::DataBlock> blocks) const final {
return incfs::writeBlocks({blocks.data(), size_t(blocks.size())});
}
- ErrorCode reserveSpace(const Control& control, std::string_view path,
- IncFsSize size) const final {
- return incfs::reserveSpace(control, path, size);
+ ErrorCode reserveSpace(const Control& control, FileId id, IncFsSize size) const final {
+ return incfs::reserveSpace(control, id, size);
}
WaitResult waitForPendingReads(const Control& control, std::chrono::milliseconds timeout,
std::vector<incfs::ReadInfo>* pendingReadsBuffer) const final {
@@ -238,19 +240,26 @@
ErrorCode setUidReadTimeouts(const Control& control,
const std::vector<android::os::incremental::PerUidReadTimeouts>&
perUidReadTimeouts) const final {
- std::vector<incfs::UidReadTimeouts> timeouts;
- timeouts.resize(perUidReadTimeouts.size());
+ std::vector<incfs::UidReadTimeouts> timeouts(perUidReadTimeouts.size());
for (int i = 0, size = perUidReadTimeouts.size(); i < size; ++i) {
- auto&& timeout = timeouts[i];
+ auto& timeout = timeouts[i];
const auto& perUidTimeout = perUidReadTimeouts[i];
timeout.uid = perUidTimeout.uid;
timeout.minTimeUs = perUidTimeout.minTimeUs;
timeout.minPendingTimeUs = perUidTimeout.minPendingTimeUs;
timeout.maxPendingTimeUs = perUidTimeout.maxPendingTimeUs;
}
-
return incfs::setUidReadTimeouts(control, timeouts);
}
+ ErrorCode forEachFile(const Control& control, FileCallback cb) const final {
+ return incfs::forEachFile(control,
+ [&](auto& control, FileId id) { return cb(control, id); });
+ }
+ ErrorCode forEachIncompleteFile(const Control& control, FileCallback cb) const final {
+ return incfs::forEachIncompleteFile(control, [&](auto& control, FileId id) {
+ return cb(control, id);
+ });
+ }
};
static JNIEnv* getOrAttachJniEnv(JavaVM* jvm);