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

Commit 17035b02 authored by John Reck's avatar John Reck
Browse files

Have destroy call freePrefetchedLayers 

 Bug: 17208461

 There's a potential race condition between HardwareRenderer.destroy()
 being called (which calls destroyCanvasAndSurface()) and the renderer
 being finalized (which is what calls freePrefetchedLayers), during which
 time it's possible we get a TRIM_MEMORY_COMPLETE and destroy the EGL
 context.

 Fix this race condition by moving stopDrawing() and freePrefetchedLayers()
 into destroyCanvasAndSurface() where they should have been in the first
 place.

 Also, if we hit the assertion failure, dump the current state of
 Caches to try and provide more context for the failure.

Change-Id: Ife0ba3562041e8b08e87e3e13640472b3004eed6
parent 6e31e0f3

core/java/android/view/ThreadedRenderer.java

+2 −2
Original line number Diff line number Diff line
@@ -126,7 +126,7 @@ public class ThreadedRenderer extends HardwareRenderer { 
    void destroy() {

        mInitialized = false;

        updateEnabledState(null);

        nDestroyCanvasAndSurface(mNativeProxy);

        nDestroy(mNativeProxy);

    }



    private void updateEnabledState(Surface surface) {
@@ -488,7 +488,7 @@ public class ThreadedRenderer extends HardwareRenderer { 
    private static native void nSetOpaque(long nativeProxy, boolean opaque);

    private static native int nSyncAndDrawFrame(long nativeProxy,

            long frameTimeNanos, long recordDuration, float density);

    private static native void nDestroyCanvasAndSurface(long nativeProxy);

    private static native void nDestroy(long nativeProxy);

    private static native void nRegisterAnimatingRenderNode(long rootRenderNode, long animatingNode);



    private static native void nInvokeFunctor(long functor, boolean waitForCompletion);

core/jni/android_view_ThreadedRenderer.cpp

+3 −3
Original line number Diff line number Diff line
@@ -291,10 +291,10 @@ static int android_view_ThreadedRenderer_syncAndDrawFrame(JNIEnv* env, jobject c 
    return proxy->syncAndDrawFrame(frameTimeNanos, recordDuration, density);

}



static void android_view_ThreadedRenderer_destroyCanvasAndSurface(JNIEnv* env, jobject clazz,

static void android_view_ThreadedRenderer_destroy(JNIEnv* env, jobject clazz,

        jlong proxyPtr) {

    RenderProxy* proxy = reinterpret_cast<RenderProxy*>(proxyPtr);

    proxy->destroyCanvasAndSurface();

    proxy->destroy();

}



static void android_view_ThreadedRenderer_registerAnimatingRenderNode(JNIEnv* env, jobject clazz,
@@ -430,7 +430,7 @@ static JNINativeMethod gMethods[] = { 
    { "nSetup", "(JIIFFFFII)V", (void*) android_view_ThreadedRenderer_setup },

    { "nSetOpaque", "(JZ)V", (void*) android_view_ThreadedRenderer_setOpaque },

    { "nSyncAndDrawFrame", "(JJJF)I", (void*) android_view_ThreadedRenderer_syncAndDrawFrame },

    { "nDestroyCanvasAndSurface", "(J)V", (void*) android_view_ThreadedRenderer_destroyCanvasAndSurface },

    { "nDestroy", "(J)V", (void*) android_view_ThreadedRenderer_destroy },

    { "nRegisterAnimatingRenderNode", "(JJ)V", (void*) android_view_ThreadedRenderer_registerAnimatingRenderNode },

    { "nInvokeFunctor", "(JZ)V", (void*) android_view_ThreadedRenderer_invokeFunctor },

    { "nCreateDisplayListLayer", "(JII)J", (void*) android_view_ThreadedRenderer_createDisplayListLayer },

libs/hwui/Caches.cpp

+7 −3
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#include "Properties.h"

#include "LayerRenderer.h"

#include "ShadowTessellator.h"

#include "RenderState.h"



namespace android {
@@ -49,7 +50,7 @@ namespace uirenderer { 
///////////////////////////////////////////////////////////////////////////////



Caches::Caches(): Singleton<Caches>(),

        mExtensions(Extensions::getInstance()), mInitialized(false) {

        mExtensions(Extensions::getInstance()), mInitialized(false), mRenderState(NULL) {

    init();

    initFont();

    initConstraints();
@@ -267,8 +268,11 @@ void Caches::dumpMemoryUsage(String8 &log) { 
    log.appendFormat("Current memory usage / total memory usage (bytes):\n");

    log.appendFormat("  TextureCache         %8d / %8d\n",

            textureCache.getSize(), textureCache.getMaxSize());

    log.appendFormat("  LayerCache           %8d / %8d\n",

            layerCache.getSize(), layerCache.getMaxSize());

    log.appendFormat("  LayerCache           %8d / %8d (numLayers = %zu)\n",

            layerCache.getSize(), layerCache.getMaxSize(), layerCache.getCount());

    log.appendFormat("  Garbage layers       %8zu\n", mLayerGarbage.size());

    log.appendFormat("  Active layers        %8zu\n",

            mRenderState ? mRenderState->mActiveLayers.size() : 0);

    log.appendFormat("  RenderBufferCache    %8d / %8d\n",

            renderBufferCache.getSize(), renderBufferCache.getMaxSize());

    log.appendFormat("  GradientCache        %8d / %8d\n",

libs/hwui/Caches.h

+5 −0
Original line number Diff line number Diff line
@@ -107,6 +107,7 @@ struct CacheLogger { 
///////////////////////////////////////////////////////////////////////////////



class RenderNode;

class RenderState;



class ANDROID_API Caches: public Singleton<Caches> {

    Caches();
@@ -132,6 +133,8 @@ public: 
     */

    bool initProperties();



    void setRenderState(RenderState* renderState) { mRenderState = renderState; }



    /**

     * Flush the cache.

     *
@@ -431,6 +434,8 @@ private: 
    GLuint mBoundTextures[REQUIRED_TEXTURE_UNITS_COUNT];



    OverdrawColorSet mOverdrawDebugColorSet;



    RenderState* mRenderState;

}; // class Caches



}; // namespace uirenderer

libs/hwui/LayerCache.cpp

+4 −0
Original line number Diff line number Diff line
@@ -49,6 +49,10 @@ LayerCache::~LayerCache() { 
// Size management

///////////////////////////////////////////////////////////////////////////////



size_t LayerCache::getCount() {

    return mCache.size();

}



uint32_t LayerCache::getSize() {

    return mSize;

}