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

Commit e06c3a59 authored by Jason Sams's avatar Jason Sams Committed by Android (Google) Code Review
Browse files

Merge "Fix cleanup race condition where objects might may not be cleaned up... 

Merge "Fix cleanup race condition where objects might may not be cleaned up correctly." into honeycomb
parents 867b1f60 84035ff6

libs/rs/rsContext.cpp

+4 −0
Original line number Diff line number Diff line
@@ -539,6 +539,7 @@ void Context::destroyWorkerThreadResources() { 
    }

    ObjectBase::zeroAllUserRef(this);

    LOGV("destroyWorkerThreadResources 2");

    mExit = true;

}



void * Context::helperThreadProc(void *vrsc) {
@@ -713,6 +714,9 @@ bool Context::initContext(Device *dev, const RsSurfaceConfig *sc) { 


Context::~Context() {

    LOGV("Context::~Context");



    mIO.mToCore.flush();

    rsAssert(mExit);

    mExit = true;

    mPaused = false;

    void *res;