Merge "incremental_delivery: Remove PAGE_SIZE usage" into main am: 0951db5595 am: 45bdd29b32 am: 8fea35ef6f am: abd5c1c112 am: 8848b13d84
Original change: https://android-review.googlesource.com/c/platform/system/incremental_delivery/+/2700941
Change-Id: I59b78d5402bc3c3054676cf9246c0bb781537854
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/incfs/incfs.cpp b/incfs/incfs.cpp
index e0b91eb..8953b77 100644
--- a/incfs/incfs.cpp
+++ b/incfs/incfs.cpp
@@ -59,6 +59,10 @@
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 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 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);
}