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

Commit c2080995 authored by Jeff Sharkey's avatar Jeff Sharkey
Browse files

Remove advisory registerNativeAllocation(). 

After consulting with the ART team, we learned that sending them
detailed advisory native allocation sizes isn't as useful when the
overall lifecycle of the object is tightly managed, which is the
case with Parcel objects.  (Because Parcel users use explicit
obtain() and recycle() methods, any variable-sized native
allocations have already been freed by the time a Parcel instance
is considered for GC.)

The Parcel benchmarks referenced below are showing a uniform ~3%
performance improvement across 1, 4, and 16 thread cases.  Note that
this is in addition to the improvements recently made with the shift
to a linked-list pooling design.

Bug: 165032569
Test: ./frameworks/base/libs/hwui/tests/scripts/prep_generic.sh little && atest CorePerfTests:android.os.ParcelObtainPerfTest
Change-Id: Id0ce9b3bff1d0ffb426a9f105c7a54eb00060f85
parent 95e32f0f

core/java/android/os/Parcel.java

+10 −29
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ import com.android.internal.annotations.GuardedBy; 


import dalvik.annotation.optimization.CriticalNative;

import dalvik.annotation.optimization.FastNative;

import dalvik.system.VMRuntime;



import libcore.util.ArrayUtils;

import libcore.util.SneakyThrow;
@@ -309,7 +308,7 @@ public final class Parcel { 
    @CriticalNative

    private static native int nativeDataCapacity(long nativePtr);

    @FastNative

    private static native long nativeSetDataSize(long nativePtr, int size);

    private static native void nativeSetDataSize(long nativePtr, int size);

    @CriticalNative

    private static native void nativeSetDataPosition(long nativePtr, int pos);

    @FastNative
@@ -338,7 +337,7 @@ public final class Parcel { 
    @FastNative

    private static native void nativeWriteStrongBinder(long nativePtr, IBinder val);

    @FastNative

    private static native long nativeWriteFileDescriptor(long nativePtr, FileDescriptor val);

    private static native void nativeWriteFileDescriptor(long nativePtr, FileDescriptor val);



    private static native byte[] nativeCreateByteArray(long nativePtr);

    private static native boolean nativeReadByteArray(long nativePtr, byte[] dest, int destLen);
@@ -361,14 +360,14 @@ public final class Parcel { 
    private static native FileDescriptor nativeReadFileDescriptor(long nativePtr);



    private static native long nativeCreate();

    private static native long nativeFreeBuffer(long nativePtr);

    private static native void nativeFreeBuffer(long nativePtr);

    private static native void nativeDestroy(long nativePtr);



    private static native byte[] nativeMarshall(long nativePtr);

    private static native long nativeUnmarshall(

    private static native void nativeUnmarshall(

            long nativePtr, byte[] data, int offset, int length);

    private static native int nativeCompareData(long thisNativePtr, long otherNativePtr);

    private static native long nativeAppendFrom(

    private static native void nativeAppendFrom(

            long thisNativePtr, long otherNativePtr, int offset, int length);

    @CriticalNative

    private static native boolean nativeHasFileDescriptors(long nativePtr);
@@ -563,7 +562,7 @@ public final class Parcel { 
     * @param size The new number of bytes in the Parcel.

     */

    public final void setDataSize(int size) {

        updateNativeSize(nativeSetDataSize(mNativePtr, size));

        nativeSetDataSize(mNativePtr, size);

    }



    /**
@@ -615,11 +614,11 @@ public final class Parcel { 
     * Set the bytes in data to be the raw bytes of this Parcel.

     */

    public final void unmarshall(@NonNull byte[] data, int offset, int length) {

        updateNativeSize(nativeUnmarshall(mNativePtr, data, offset, length));

        nativeUnmarshall(mNativePtr, data, offset, length);

    }



    public final void appendFrom(Parcel parcel, int offset, int length) {

        updateNativeSize(nativeAppendFrom(mNativePtr, parcel.mNativePtr, offset, length));

        nativeAppendFrom(mNativePtr, parcel.mNativePtr, offset, length);

    }



    /** @hide */
@@ -902,24 +901,7 @@ public final class Parcel { 
     * if {@link Parcelable#PARCELABLE_WRITE_RETURN_VALUE} is set.</p>

     */

    public final void writeFileDescriptor(@NonNull FileDescriptor val) {

        updateNativeSize(nativeWriteFileDescriptor(mNativePtr, val));

    }



    private void updateNativeSize(long newNativeSize) {

        if (mOwnsNativeParcelObject) {

            if (newNativeSize > Integer.MAX_VALUE) {

                newNativeSize = Integer.MAX_VALUE;

            }

            if (newNativeSize != mNativeSize) {

                int delta = (int) (newNativeSize - mNativeSize);

                if (delta > 0) {

                    VMRuntime.getRuntime().registerNativeAllocation(delta);

                } else {

                    VMRuntime.getRuntime().registerNativeFree(-delta);

                }

                mNativeSize = newNativeSize;

            }

        }

        nativeWriteFileDescriptor(mNativePtr, val);

    }



    /**
@@ -3571,7 +3553,7 @@ public final class Parcel { 
    private void freeBuffer() {

        resetSqaushingState();

        if (mOwnsNativeParcelObject) {

            updateNativeSize(nativeFreeBuffer(mNativePtr));

            nativeFreeBuffer(mNativePtr);

        }

        mReadWriteHelper = ReadWriteHelper.DEFAULT;

    }
@@ -3581,7 +3563,6 @@ public final class Parcel { 
        if (mNativePtr != 0) {

            if (mOwnsNativeParcelObject) {

                nativeDestroy(mNativePtr);

                updateNativeSize(0);

            }

            mNativePtr = 0;

        }

core/jni/android_os_Parcel.cpp

+14 −21
Original line number Diff line number Diff line
@@ -114,7 +114,7 @@ static jint android_os_Parcel_dataCapacity(jlong nativePtr) 
    return parcel ? parcel->dataCapacity() : 0;

}



static jlong android_os_Parcel_setDataSize(JNIEnv* env, jclass clazz, jlong nativePtr, jint size)

static void android_os_Parcel_setDataSize(JNIEnv* env, jclass clazz, jlong nativePtr, jint size)

{

    Parcel* parcel = reinterpret_cast<Parcel*>(nativePtr);

    if (parcel != NULL) {
@@ -122,9 +122,7 @@ static jlong android_os_Parcel_setDataSize(JNIEnv* env, jclass clazz, jlong nati 
        if (err != NO_ERROR) {

            signalExceptionForError(env, clazz, err);

        }

        return parcel->getOpenAshmemSize();

    }

    return 0;

}



static void android_os_Parcel_setDataPosition(jlong nativePtr, jint pos)
@@ -308,7 +306,7 @@ static void android_os_Parcel_writeStrongBinder(JNIEnv* env, jclass clazz, jlong 
    }

}



static jlong android_os_Parcel_writeFileDescriptor(JNIEnv* env, jclass clazz, jlong nativePtr, jobject object)

static void android_os_Parcel_writeFileDescriptor(JNIEnv* env, jclass clazz, jlong nativePtr, jobject object)

{

    Parcel* parcel = reinterpret_cast<Parcel*>(nativePtr);

    if (parcel != NULL) {
@@ -317,9 +315,7 @@ static jlong android_os_Parcel_writeFileDescriptor(JNIEnv* env, jclass clazz, jl 
        if (err != NO_ERROR) {

            signalExceptionForError(env, clazz, err);

        }

        return parcel->getOpenAshmemSize();

    }

    return 0;

}



static jbyteArray android_os_Parcel_createByteArray(JNIEnv* env, jclass clazz, jlong nativePtr)
@@ -506,14 +502,12 @@ static jlong android_os_Parcel_create(JNIEnv* env, jclass clazz) 
    return reinterpret_cast<jlong>(parcel);

}



static jlong android_os_Parcel_freeBuffer(JNIEnv* env, jclass clazz, jlong nativePtr)

static void android_os_Parcel_freeBuffer(JNIEnv* env, jclass clazz, jlong nativePtr)

{

    Parcel* parcel = reinterpret_cast<Parcel*>(nativePtr);

    if (parcel != NULL) {

        parcel->freeData();

        return parcel->getOpenAshmemSize();

    }

    return 0;

}



static void android_os_Parcel_destroy(JNIEnv* env, jclass clazz, jlong nativePtr)
@@ -551,12 +545,12 @@ static jbyteArray android_os_Parcel_marshall(JNIEnv* env, jclass clazz, jlong na 
    return ret;

}



static jlong android_os_Parcel_unmarshall(JNIEnv* env, jclass clazz, jlong nativePtr,

static void android_os_Parcel_unmarshall(JNIEnv* env, jclass clazz, jlong nativePtr,

                                          jbyteArray data, jint offset, jint length)

{

    Parcel* parcel = reinterpret_cast<Parcel*>(nativePtr);

    if (parcel == NULL || length < 0) {

       return 0;

       return;

    }



    jbyte* array = (jbyte*)env->GetPrimitiveArrayCritical(data, 0);
@@ -570,7 +564,6 @@ static jlong android_os_Parcel_unmarshall(JNIEnv* env, jclass clazz, jlong nativ 


        env->ReleasePrimitiveArrayCritical(data, array, 0);

    }

    return parcel->getOpenAshmemSize();

}



static jint android_os_Parcel_compareData(JNIEnv* env, jclass clazz, jlong thisNativePtr,
@@ -588,23 +581,23 @@ static jint android_os_Parcel_compareData(JNIEnv* env, jclass clazz, jlong thisN 
    return thisParcel->compareData(*otherParcel);

}



static jlong android_os_Parcel_appendFrom(JNIEnv* env, jclass clazz, jlong thisNativePtr,

static void android_os_Parcel_appendFrom(JNIEnv* env, jclass clazz, jlong thisNativePtr,

                                          jlong otherNativePtr, jint offset, jint length)

{

    Parcel* thisParcel = reinterpret_cast<Parcel*>(thisNativePtr);

    if (thisParcel == NULL) {

       return 0;

       return;

    }

    Parcel* otherParcel = reinterpret_cast<Parcel*>(otherNativePtr);

    if (otherParcel == NULL) {

       return thisParcel->getOpenAshmemSize();

       return;

    }



    status_t err = thisParcel->appendFrom(otherParcel, offset, length);

    if (err != NO_ERROR) {

        signalExceptionForError(env, clazz, err);

    }

    return thisParcel->getOpenAshmemSize();

    return;

}



static jboolean android_os_Parcel_hasFileDescriptors(jlong nativePtr)
@@ -720,7 +713,7 @@ static const JNINativeMethod gParcelMethods[] = { 
    // @CriticalNative

    {"nativeDataCapacity",        "(J)I", (void*)android_os_Parcel_dataCapacity},

    // @FastNative

    {"nativeSetDataSize",         "(JI)J", (void*)android_os_Parcel_setDataSize},

    {"nativeSetDataSize",         "(JI)V", (void*)android_os_Parcel_setDataSize},

    // @CriticalNative

    {"nativeSetDataPosition",     "(JI)V", (void*)android_os_Parcel_setDataPosition},

    // @FastNative
@@ -749,7 +742,7 @@ static const JNINativeMethod gParcelMethods[] = { 
    // @FastNative

    {"nativeWriteStrongBinder",   "(JLandroid/os/IBinder;)V", (void*)android_os_Parcel_writeStrongBinder},

    // @FastNative

    {"nativeWriteFileDescriptor", "(JLjava/io/FileDescriptor;)J", (void*)android_os_Parcel_writeFileDescriptor},

    {"nativeWriteFileDescriptor", "(JLjava/io/FileDescriptor;)V", (void*)android_os_Parcel_writeFileDescriptor},



    {"nativeCreateByteArray",     "(J)[B", (void*)android_os_Parcel_createByteArray},

    {"nativeReadByteArray",       "(J[BI)Z", (void*)android_os_Parcel_readByteArray},
@@ -772,13 +765,13 @@ static const JNINativeMethod gParcelMethods[] = { 
    {"nativeReadFileDescriptor",  "(J)Ljava/io/FileDescriptor;", (void*)android_os_Parcel_readFileDescriptor},



    {"nativeCreate",              "()J", (void*)android_os_Parcel_create},

    {"nativeFreeBuffer",          "(J)J", (void*)android_os_Parcel_freeBuffer},

    {"nativeFreeBuffer",          "(J)V", (void*)android_os_Parcel_freeBuffer},

    {"nativeDestroy",             "(J)V", (void*)android_os_Parcel_destroy},



    {"nativeMarshall",            "(J)[B", (void*)android_os_Parcel_marshall},

    {"nativeUnmarshall",          "(J[BII)J", (void*)android_os_Parcel_unmarshall},

    {"nativeUnmarshall",          "(J[BII)V", (void*)android_os_Parcel_unmarshall},

    {"nativeCompareData",         "(JJ)I", (void*)android_os_Parcel_compareData},

    {"nativeAppendFrom",          "(JJII)J", (void*)android_os_Parcel_appendFrom},

    {"nativeAppendFrom",          "(JJII)V", (void*)android_os_Parcel_appendFrom},

    // @CriticalNative

    {"nativeHasFileDescriptors",  "(J)Z", (void*)android_os_Parcel_hasFileDescriptors},

    {"nativeWriteInterfaceToken", "(JLjava/lang/String;)V", (void*)android_os_Parcel_writeInterfaceToken},