Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 8d124f70: Merge "Fix a bug, where one thread is using JNIEnv associated with another thread." into gingerbread

Browse Source 
Merge commit '8d124f709e5c55f9737a336cda353af3dfb04605' into gingerbread-plus-aosp

* commit '8d124f709e5c55f9737a336cda353af3dfb04605':
  Fix a bug, where one thread is using JNIEnv associated with another thread.
This commit is contained in:
Wei-Ta Chen
2010-08-19 07:59:35 -07:00
committed by Android Git Automerger
parent e18790856b 8d124f709e
commit 9f7257f0a1
2 changed files with 22 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
core/jni/android/graphics/Graphics.cpp
View File

@@ -518,35 +518,48 @@ bool GraphicsJNI::setJavaPixelRef(JNIEnv* env, SkBitmap* bitmap,
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
JavaPixelAllocator::JavaPixelAllocator(JNIEnv* env, bool reportSizeToVM) JavaPixelAllocator::JavaPixelAllocator(JNIEnv* env, bool reportSizeToVM)
: fEnv(env), fReportSizeToVM(reportSizeToVM) {} : fReportSizeToVM(reportSizeToVM) {
if (env->GetJavaVM(&fVM) != JNI_OK) {
SkDebugf("------ [%p] env->GetJavaVM failed\n", env);
sk_throw();
}
}
bool JavaPixelAllocator::allocPixelRef(SkBitmap* bitmap, SkColorTable* ctable) { bool JavaPixelAllocator::allocPixelRef(SkBitmap* bitmap, SkColorTable* ctable) {
return GraphicsJNI::setJavaPixelRef(fEnv, bitmap, ctable, fReportSizeToVM); JNIEnv* env = vm2env(fVM);
return GraphicsJNI::setJavaPixelRef(env, bitmap, ctable, fReportSizeToVM);
} }
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
JavaMemoryUsageReporter::JavaMemoryUsageReporter(JNIEnv* env) JavaMemoryUsageReporter::JavaMemoryUsageReporter(JNIEnv* env)
: fEnv(env), fTotalSize(0) {} : fTotalSize(0) {
if (env->GetJavaVM(&fVM) != JNI_OK) {
SkDebugf("------ [%p] env->GetJavaVM failed\n", env);
sk_throw();
}
}
JavaMemoryUsageReporter::~JavaMemoryUsageReporter() { JavaMemoryUsageReporter::~JavaMemoryUsageReporter() {
JNIEnv* env = vm2env(fVM);
jlong jtotalSize = fTotalSize; jlong jtotalSize = fTotalSize;
fEnv->CallVoidMethod(gVMRuntime_singleton, env->CallVoidMethod(gVMRuntime_singleton,
gVMRuntime_trackExternalFreeMethodID, gVMRuntime_trackExternalFreeMethodID,
jtotalSize); jtotalSize);
} }
bool JavaMemoryUsageReporter::reportMemory(size_t memorySize) { bool JavaMemoryUsageReporter::reportMemory(size_t memorySize) {
jlong jsize = memorySize; // the VM wants longs for the size jlong jsize = memorySize; // the VM wants longs for the size
bool r = fEnv->CallBooleanMethod(gVMRuntime_singleton, JNIEnv* env = vm2env(fVM);
bool r = env->CallBooleanMethod(gVMRuntime_singleton,
gVMRuntime_trackExternalAllocationMethodID, gVMRuntime_trackExternalAllocationMethodID,
jsize); jsize);
if (GraphicsJNI::hasException(fEnv)) { if (GraphicsJNI::hasException(env)) {
return false; return false;
} }
if (!r) { if (!r) {
LOGE("VM won't let us allocate %zd bytes\n", memorySize); LOGE("VM won't let us allocate %zd bytes\n", memorySize);
doThrowOOME(fEnv, "bitmap size exceeds VM budget"); doThrowOOME(env, "bitmap size exceeds VM budget");
return false; return false;
} }
fTotalSize += memorySize; fTotalSize += memorySize;

4
core/jni/android/graphics/GraphicsJNI.h
View File

@@ -80,7 +80,7 @@ public:
virtual bool allocPixelRef(SkBitmap* bitmap, SkColorTable* ctable); virtual bool allocPixelRef(SkBitmap* bitmap, SkColorTable* ctable);
private: private:
JNIEnv* fEnv; JavaVM* fVM;
bool fReportSizeToVM; bool fReportSizeToVM;
}; };
@@ -92,7 +92,7 @@ public:
virtual bool reportMemory(size_t memorySize); virtual bool reportMemory(size_t memorySize);
private: private:
JNIEnv* fEnv; JavaVM* fVM;
size_t fTotalSize; size_t fTotalSize;
}; };