diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-09-14 23:30:45 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-09-14 23:30:45 +0000 |
commit | fa594dcb470d850969310b1017e7ea36a66d8df8 (patch) | |
tree | 26407752cac0d85f13f5b12e738e4e77c975b52e | |
parent | 200ddc11a03822aad7004c919f25f2414238f856 (diff) | |
parent | c82569e37a745665549df5a77159a0584b45e7d5 (diff) | |
download | incremental_delivery-fa594dcb470d850969310b1017e7ea36a66d8df8.tar.gz |
Snap for 9065525 from c82569e37a745665549df5a77159a0584b45e7d5 to tm-qpr1-releaseandroid-13.0.0_r30android-13.0.0_r29android-13.0.0_r28android-13.0.0_r27android-13.0.0_r24android-13.0.0_r23android-13.0.0_r22android-13.0.0_r21android-13.0.0_r20android-13.0.0_r19android-13.0.0_r18android-13.0.0_r17android-13.0.0_r16android13-qpr1-s8-releaseandroid13-qpr1-s7-releaseandroid13-qpr1-s6-releaseandroid13-qpr1-s5-releaseandroid13-qpr1-s4-releaseandroid13-qpr1-s3-releaseandroid13-qpr1-s2-releaseandroid13-qpr1-s1-releaseandroid13-qpr1-release
Change-Id: I355f1d56a8ba9cbea9c52a76cf0d0987eade2b5e
-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 +} |