Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5e73e7e6 authored by Juan Yescas's avatar Juan Yescas Committed by Automerger Merge Worker
Browse files

Merge "CachedAppOptimizer: Remove PAGE_MASK usage" into main am: 3b35e9d4... 

Merge "CachedAppOptimizer: Remove PAGE_MASK usage" into main am: 3b35e9d4 am: fd825692 am: cfcbf5d8 am: 023b9ba3 am: 13a09104

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2714676



Change-Id: I9343fb1a3f574af6f1ef3d2de0c64e37f61c5c77
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4fc5667a 13a09104

services/core/jni/com_android_server_am_CachedAppOptimizer.cpp

+4 −2
Original line number Diff line number Diff line
@@ -54,6 +54,9 @@ using android::base::WriteStringToFile; 
using android::meminfo::ProcMemInfo;

using namespace android::meminfo;



static const size_t kPageSize = getpagesize();

static const size_t kPageMask = ~(kPageSize - 1);



#define COMPACT_ACTION_FILE_FLAG 1

#define COMPACT_ACTION_ANON_FLAG 2
@@ -64,7 +67,7 @@ using android::base::unique_fd; 
#define ASYNC_RECEIVED_WHILE_FROZEN (2)

#define TXNS_PENDING_WHILE_FROZEN (4)



#define MAX_RW_COUNT (INT_MAX & PAGE_MASK)

#define MAX_RW_COUNT (INT_MAX & kPageMask)



// Defines the maximum amount of VMAs we can send per process_madvise syscall.

// Currently this is set to UIO_MAXIOV which is the maximum segments allowed by
@@ -233,7 +236,6 @@ 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;