Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CachedAppOptimizer: Remove use of hardcoded PAGE_SIZE 4096

Browse Source 
bionic hard codes the PAGE_SIZE macro as 4096. This is going away as
Android begins to support larger page sizes. Remove the usage of this
assumption from CachedAppOptimizer source; use instead getpagesize()
which provides the real pagesize.

Test: mma
Bug: 295082310
Change-Id: I2adc60ffa38bd23442a08cbd80b68f0158057c5e
Signed-off-by: Kalesh Singh <kaleshsingh@google.com>
This commit is contained in:
Kalesh Singh
2023-08-09 13:26:15 -07:00
parent 1e44213dce
commit d6102197ee
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/core/jni/com_android_server_am_CachedAppOptimizer.cpp
View File

@@ -224,6 +224,7 @@ public:
// process_madvise on failure
int madviseVmasFromBatch(unique_fd& pidfd, VmaBatch& batch, int madviseType,
uint64_t* outBytesProcessed) {
static const size_t kPageSize = getpagesize();
if (batch.totalVmas == 0 || batch.totalBytes == 0) {
// No VMAs in Batch, skip.
*outBytesProcessed = 0;
@@ -249,7 +250,7 @@ int madviseVmasFromBatch(unique_fd& pidfd, VmaBatch& batch, int madviseType,
} else if (bytesProcessedInSend < batch.totalBytes) {
// Partially processed the bytes requested
// skip last page which is where it failed.
bytesProcessedInSend += PAGE_SIZE;
bytesProcessedInSend += kPageSize;
}
bytesProcessedInSend = consumeBytes(batch, bytesProcessedInSend);