diff options
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2023-08-11 00:51:43 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-08-11 00:51:43 +0000 |
| commit | 8848b13d84f6fcc1c3e5bdc2ece46fdaa510be9b (patch) | |
| tree | 7e81a09628fd582fef041a3bfd57c654f5718071 | |
| parent | 36c4dfe35a968971394c7fca13fac82a51ee4887 (diff) | |
| parent | abd5c1c112af8071a236aa16cb7f2f92339f8f37 (diff) | |
| download | incremental_delivery-8848b13d84f6fcc1c3e5bdc2ece46fdaa510be9b.tar.gz | |
Merge "incremental_delivery: Remove PAGE_SIZE usage" into main am: 0951db5595 am: 45bdd29b32 am: 8fea35ef6f am: abd5c1c112
Original change: https://android-review.googlesource.com/c/platform/system/incremental_delivery/+/2700941
Change-Id: I4457ff42e0c330c8b80fc3319ebbb240c704de9e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | incfs/incfs.cpp | 4 | ||||
| -rw-r--r-- | incfs/include/incfs_inline.h | 10 |
2 files changed, 10 insertions, 4 deletions
diff --git a/incfs/incfs.cpp b/incfs/incfs.cpp index 29574c1..e12b530 100644 --- a/incfs/incfs.cpp +++ b/incfs/incfs.cpp @@ -59,6 +59,10 @@ using namespace android::incfs; using namespace android::sysprop; namespace ab = android::base; +namespace android::incfs { +extern const size_t kPageSize = getpagesize(); +} + struct IncFsControl final { IncFsFd cmd; IncFsFd pendingReads; diff --git a/incfs/include/incfs_inline.h b/incfs/include/incfs_inline.h index 545a735..68d33d1 100644 --- a/incfs/include/incfs_inline.h +++ b/incfs/include/incfs_inline.h @@ -28,6 +28,8 @@ constexpr char kIdAttrName[] = INCFS_XATTR_ID_NAME; constexpr char kSizeAttrName[] = INCFS_XATTR_SIZE_NAME; constexpr char kMetadataAttrName[] = INCFS_XATTR_METADATA_NAME; +extern const size_t kPageSize; + namespace details { class CStrWrapper { @@ -271,16 +273,16 @@ inline WaitResult waitForPendingReads(const Control& control, std::chrono::milli inline WaitResult waitForPageReads(const Control& control, std::chrono::milliseconds timeout, std::vector<ReadInfo>* pageReadsBuffer) { - static constexpr auto kDefaultBufferSize = - INCFS_DEFAULT_PAGE_READ_BUFFER_PAGES * PAGE_SIZE / sizeof(ReadInfo); + static const auto kDefaultBufferSize = + INCFS_DEFAULT_PAGE_READ_BUFFER_PAGES * kPageSize / sizeof(ReadInfo); return waitForReads(control, timeout, pageReadsBuffer, kDefaultBufferSize, IncFs_WaitForPageReads); } inline WaitResult waitForPageReads(const Control& control, std::chrono::milliseconds timeout, std::vector<ReadInfoWithUid>* pageReadsBuffer) { - static constexpr auto kDefaultBufferSize = - INCFS_DEFAULT_PAGE_READ_BUFFER_PAGES * PAGE_SIZE / sizeof(ReadInfoWithUid); + static const auto kDefaultBufferSize = + INCFS_DEFAULT_PAGE_READ_BUFFER_PAGES * kPageSize / sizeof(ReadInfoWithUid); return waitForReads(control, timeout, pageReadsBuffer, kDefaultBufferSize, IncFs_WaitForPageReadsWithUid); } |