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

Commit 8e542793 authored by Hans Boehm's avatar Hans Boehm Committed by Automerger Merge Worker
Browse files

Merge "Don't MAP_POPULATE native ZygoteCommandBuffer" am: 265cc772 am: 74ddb63a am: 859840da 

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



Change-Id: Iac7a5bf89b40ca6f7f923f93949350e747a59cbb
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c8d87910 859840da

core/jni/com_android_internal_os_ZygoteCommandBuffer.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -296,7 +296,7 @@ jlong com_android_internal_os_ZygoteCommandBuffer_getNativeBuffer(JNIEnv* env, j 
  ++buffersAllocd;

  ++buffersAllocd;

  // MMap explicitly to get it page aligned.

  // MMap explicitly to get it page aligned.

  void *bufferMem = mmap(NULL, sizeof(NativeCommandBuffer), PROT_READ | PROT_WRITE,

  void *bufferMem = mmap(NULL, sizeof(NativeCommandBuffer), PROT_READ | PROT_WRITE,

                         MAP_ANONYMOUS | MAP_PRIVATE | MAP_POPULATE, -1, 0);

                         MAP_ANONYMOUS | MAP_PRIVATE, -1, 0);

  // Currently we mmap and unmap one for every request handled by the Java code.

  // Currently we mmap and unmap one for every request handled by the Java code.

  // That could be improved, but unclear it matters.

  // That could be improved, but unclear it matters.

  if (bufferMem == MAP_FAILED) {

  if (bufferMem == MAP_FAILED) {