commit cf912de17f1e086ccea707d8607a3d2eda56b98f
author Jason Sams <rjsams@android.com> Sun Jan 09 16:09:51 2011 -0800
committer Jason Sams <rjsams@android.com> Sun Jan 09 16:09:51 2011 -0800
tree 7e4cd4b6919b189bc4e189c5cff48d0e3394fa1f
parent 1c089c27301894ccc0ed6d8854ec1e7d4e73742f

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

Change-Id: Ia48e06c3d050b6b39b39f8fdc9f0eb89b92fe1bf

rsContext.cpp

diff --git a/rsContext.cpp b/rsContext.cpp
index c437d72..6a065b2 100644
--- a/rsContext.cpp
+++ b/rsContext.cpp
@@ -539,6 +539,7 @@
     }
     ObjectBase::zeroAllUserRef(this);
     LOGV("destroyWorkerThreadResources 2");
+    mExit = true;
 }
 
 void * Context::helperThreadProc(void *vrsc) {
@@ -713,6 +714,9 @@
 
 Context::~Context() {
     LOGV("Context::~Context");
+
+    mIO.mToCore.flush();
+    rsAssert(mExit);
     mExit = true;
     mPaused = false;
     void *res;