diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-11-01 21:43:44 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-11-01 21:43:44 +0000 |
commit | 8af624c5a8039d17ca400cf097d050d77a5a61b9 (patch) | |
tree | 26407752cac0d85f13f5b12e738e4e77c975b52e | |
parent | 9b6bd03f6a9c4e911d72295fead7000234623f54 (diff) | |
parent | 0ca1b6199fe2b5242e7aeee0f7cd2fb32f480246 (diff) | |
download | incremental_delivery-8af624c5a8039d17ca400cf097d050d77a5a61b9.tar.gz |
Snap for 9239618 from 0ca1b6199fe2b5242e7aeee0f7cd2fb32f480246 to tm-platform-releaseandroid-platform-13.0.0_r5android-platform-13.0.0_r4android-platform-13.0.0_r3
Change-Id: Ia41b412b21394a3e164177d566ef2c21ca398525
-rw-r--r-- | incfs/MountRegistry.cpp | 3 | ||||
-rw-r--r-- | incfs/include/incfs_inline.h | 2 | ||||
-rw-r--r-- | incfs/tests/util/map_ptr_test.cpp | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/incfs/MountRegistry.cpp b/incfs/MountRegistry.cpp index 4f16f73..376eaf2 100644 --- a/incfs/MountRegistry.cpp +++ b/incfs/MountRegistry.cpp @@ -355,7 +355,8 @@ bool MountRegistry::Mounts::loadFrom(base::borrowed_fd fd, std::string_view file if (mount.backing.empty()) { mount.backing = std::move(backingDir); } else if (mount.backing != backingDir) { - LOG(WARNING) << "[incfs] root '" << *mount.roots.begin() + LOG(WARNING) << "[incfs] root '" + << (!mount.roots.empty() ? *mount.roots.begin() : "<unknown>") << "' mounted in multiple places with different backing dirs, '" << mount.backing << "' vs new '" << backingDir << "'; updating to the new one"; diff --git a/incfs/include/incfs_inline.h b/incfs/include/incfs_inline.h index f3d1e89..545a735 100644 --- a/incfs/include/incfs_inline.h +++ b/incfs/include/incfs_inline.h @@ -306,9 +306,9 @@ inline std::pair<ErrorCode, FilledRanges> getFilledRanges(int fd, } inline std::pair<ErrorCode, FilledRanges> getFilledRanges(int fd, FilledRanges&& resumeFrom) { + auto totalRanges = resumeFrom.dataRanges().size() + resumeFrom.hashRanges().size(); auto rawRanges = resumeFrom.internalRawRanges(); auto buffer = resumeFrom.extractInternalBufferAndClear(); - auto totalRanges = resumeFrom.dataRanges().size() + resumeFrom.hashRanges().size(); auto remainingSpace = buffer.size() - totalRanges; const bool loadAll = remainingSpace == 0; int res; diff --git a/incfs/tests/util/map_ptr_test.cpp b/incfs/tests/util/map_ptr_test.cpp index c78d91d..f9c96aa 100644 --- a/incfs/tests/util/map_ptr_test.cpp +++ b/incfs/tests/util/map_ptr_test.cpp @@ -325,4 +325,4 @@ TEST_F(MapPtrTest, GetDataAfterClose) { auto p1 = map->data().offset(missing_page_start).convert<uint32_t>(); ASSERT_FALSE(p1); ASSERT_SIGBUS(p1.value()); -}
\ No newline at end of file +} |