Global lock levels.
Introduce the notion of the mutators/GC being a shared-exclusive (aka
reader-writer) lock. Introduce globally ordered locks, analysable by
annotalysis, statically at compile time. Add locking attributes to
methods.
More subtly, remove the heap_lock_ and split between various locks that
are held for smaller periods (where work doesn't get blocked). Remove
buggy Dalvik style thread transitions. Make GC use CMS in all cases when
concurrent is enabled. Fix bug where suspend counts rather than debug
suspend counts were sent to JDWP. Move the PathClassLoader to
WellKnownClasses. In debugger refactor calls to send request and
possibly suspend. Break apart different VmWait thread states. Move
identity hash code to a shared method.
Change-Id: Icdbfc3ce3fcccd14341860ac7305d8e97b51f5c6
diff --git a/src/native/sun_misc_Unsafe.cc b/src/native/sun_misc_Unsafe.cc
index dfddd86..282731d 100644
--- a/src/native/sun_misc_Unsafe.cc
+++ b/src/native/sun_misc_Unsafe.cc
@@ -16,34 +16,34 @@
#include "jni_internal.h"
#include "object.h"
-#include "scoped_jni_thread_state.h"
+#include "scoped_thread_state_change.h"
namespace art {
static jlong Unsafe_objectFieldOffset0(JNIEnv* env, jclass, jobject javaField) {
// TODO: move to Java code
jfieldID fid = env->FromReflectedField(javaField);
- ScopedJniThreadState ts(env);
- Field* field = ts.DecodeField(fid);
+ ScopedObjectAccess soa(env);
+ Field* field = soa.DecodeField(fid);
return field->GetOffset().Int32Value();
}
static jint Unsafe_arrayBaseOffset0(JNIEnv* env, jclass, jclass javaArrayClass) {
// TODO: move to Java code
- ScopedJniThreadState ts(env);
- Class* array_class = ts.Decode<Class*>(javaArrayClass);
+ ScopedObjectAccess soa(env);
+ Class* array_class = soa.Decode<Class*>(javaArrayClass);
return Array::DataOffset(array_class->GetComponentSize()).Int32Value();
}
static jint Unsafe_arrayIndexScale0(JNIEnv* env, jclass, jclass javaClass) {
- ScopedJniThreadState ts(env);
- Class* c = ts.Decode<Class*>(javaClass);
+ ScopedObjectAccess soa(env);
+ Class* c = soa.Decode<Class*>(javaClass);
return c->GetComponentSize();
}
static jboolean Unsafe_compareAndSwapInt(JNIEnv* env, jobject, jobject javaObj, jlong offset, jint expectedValue, jint newValue) {
- ScopedJniThreadState ts(env);
- Object* obj = ts.Decode<Object*>(javaObj);
+ ScopedObjectAccess soa(env);
+ Object* obj = soa.Decode<Object*>(javaObj);
byte* raw_addr = reinterpret_cast<byte*>(obj) + offset;
volatile int32_t* address = reinterpret_cast<volatile int32_t*>(raw_addr);
// Note: android_atomic_release_cas() returns 0 on success, not failure.
@@ -52,8 +52,8 @@
}
static jboolean Unsafe_compareAndSwapLong(JNIEnv* env, jobject, jobject javaObj, jlong offset, jlong expectedValue, jlong newValue) {
- ScopedJniThreadState ts(env);
- Object* obj = ts.Decode<Object*>(javaObj);
+ ScopedObjectAccess soa(env);
+ Object* obj = soa.Decode<Object*>(javaObj);
byte* raw_addr = reinterpret_cast<byte*>(obj) + offset;
volatile int64_t* address = reinterpret_cast<volatile int64_t*>(raw_addr);
// Note: android_atomic_cmpxchg() returns 0 on success, not failure.
@@ -62,10 +62,10 @@
}
static jboolean Unsafe_compareAndSwapObject(JNIEnv* env, jobject, jobject javaObj, jlong offset, jobject javaExpectedValue, jobject javaNewValue) {
- ScopedJniThreadState ts(env);
- Object* obj = ts.Decode<Object*>(javaObj);
- Object* expectedValue = ts.Decode<Object*>(javaExpectedValue);
- Object* newValue = ts.Decode<Object*>(javaNewValue);
+ ScopedObjectAccess soa(env);
+ Object* obj = soa.Decode<Object*>(javaObj);
+ Object* expectedValue = soa.Decode<Object*>(javaExpectedValue);
+ Object* newValue = soa.Decode<Object*>(javaNewValue);
byte* raw_addr = reinterpret_cast<byte*>(obj) + offset;
int32_t* address = reinterpret_cast<int32_t*>(raw_addr);
// Note: android_atomic_cmpxchg() returns 0 on success, not failure.
@@ -78,105 +78,105 @@
}
static jint Unsafe_getInt(JNIEnv* env, jobject, jobject javaObj, jlong offset) {
- ScopedJniThreadState ts(env);
- Object* obj = ts.Decode<Object*>(javaObj);
+ ScopedObjectAccess soa(env);
+ Object* obj = soa.Decode<Object*>(javaObj);
return obj->GetField32(MemberOffset(offset), false);
}
static jint Unsafe_getIntVolatile(JNIEnv* env, jobject, jobject javaObj, jlong offset) {
- ScopedJniThreadState ts(env);
- Object* obj = ts.Decode<Object*>(javaObj);
+ ScopedObjectAccess soa(env);
+ Object* obj = soa.Decode<Object*>(javaObj);
byte* raw_addr = reinterpret_cast<byte*>(obj) + offset;
volatile int32_t* address = reinterpret_cast<volatile int32_t*>(raw_addr);
return android_atomic_acquire_load(address);
}
static void Unsafe_putInt(JNIEnv* env, jobject, jobject javaObj, jlong offset, jint newValue) {
- ScopedJniThreadState ts(env);
- Object* obj = ts.Decode<Object*>(javaObj);
+ ScopedObjectAccess soa(env);
+ Object* obj = soa.Decode<Object*>(javaObj);
obj->SetField32(MemberOffset(offset), newValue, false);
}
static void Unsafe_putIntVolatile(JNIEnv* env, jobject, jobject javaObj, jlong offset, jint newValue) {
- ScopedJniThreadState ts(env);
- Object* obj = ts.Decode<Object*>(javaObj);
+ ScopedObjectAccess soa(env);
+ Object* obj = soa.Decode<Object*>(javaObj);
byte* raw_addr = reinterpret_cast<byte*>(obj) + offset;
volatile int32_t* address = reinterpret_cast<volatile int32_t*>(raw_addr);
android_atomic_release_store(newValue, address);
}
static void Unsafe_putOrderedInt(JNIEnv* env, jobject, jobject javaObj, jlong offset, jint newValue) {
- ScopedJniThreadState ts(env);
- Object* obj = ts.Decode<Object*>(javaObj);
+ ScopedObjectAccess soa(env);
+ Object* obj = soa.Decode<Object*>(javaObj);
ANDROID_MEMBAR_STORE();
obj->SetField32(MemberOffset(offset), newValue, false);
}
static jlong Unsafe_getLong(JNIEnv* env, jobject, jobject javaObj, jlong offset) {
- ScopedJniThreadState ts(env);
- Object* obj = ts.Decode<Object*>(javaObj);
+ ScopedObjectAccess soa(env);
+ Object* obj = soa.Decode<Object*>(javaObj);
byte* raw_addr = reinterpret_cast<byte*>(obj) + offset;
int64_t* address = reinterpret_cast<int64_t*>(raw_addr);
return *address;
}
static jlong Unsafe_getLongVolatile(JNIEnv* env, jobject, jobject javaObj, jlong offset) {
- ScopedJniThreadState ts(env);
- Object* obj = ts.Decode<Object*>(javaObj);
+ ScopedObjectAccess soa(env);
+ Object* obj = soa.Decode<Object*>(javaObj);
return obj->GetField64(MemberOffset(offset), true);
}
static void Unsafe_putLong(JNIEnv* env, jobject, jobject javaObj, jlong offset, jlong newValue) {
- ScopedJniThreadState ts(env);
- Object* obj = ts.Decode<Object*>(javaObj);
+ ScopedObjectAccess soa(env);
+ Object* obj = soa.Decode<Object*>(javaObj);
obj->SetField64(MemberOffset(offset), newValue, false);
}
static void Unsafe_putLongVolatile(JNIEnv* env, jobject, jobject javaObj, jlong offset, jlong newValue) {
- ScopedJniThreadState ts(env);
- Object* obj = ts.Decode<Object*>(javaObj);
+ ScopedObjectAccess soa(env);
+ Object* obj = soa.Decode<Object*>(javaObj);
obj->SetField64(MemberOffset(offset), newValue, true);
}
static void Unsafe_putOrderedLong(JNIEnv* env, jobject, jobject javaObj, jlong offset, jlong newValue) {
- ScopedJniThreadState ts(env);
- Object* obj = ts.Decode<Object*>(javaObj);
+ ScopedObjectAccess soa(env);
+ Object* obj = soa.Decode<Object*>(javaObj);
ANDROID_MEMBAR_STORE();
obj->SetField64(MemberOffset(offset), newValue, false);
}
static jobject Unsafe_getObjectVolatile(JNIEnv* env, jobject, jobject javaObj, jlong offset) {
- ScopedJniThreadState ts(env);
- Object* obj = ts.Decode<Object*>(javaObj);
+ ScopedObjectAccess soa(env);
+ Object* obj = soa.Decode<Object*>(javaObj);
Object* value = obj->GetFieldObject<Object*>(MemberOffset(offset), true);
- return ts.AddLocalReference<jobject>(value);
+ return soa.AddLocalReference<jobject>(value);
}
static jobject Unsafe_getObject(JNIEnv* env, jobject, jobject javaObj, jlong offset) {
- ScopedJniThreadState ts(env);
- Object* obj = ts.Decode<Object*>(javaObj);
+ ScopedObjectAccess soa(env);
+ Object* obj = soa.Decode<Object*>(javaObj);
Object* value = obj->GetFieldObject<Object*>(MemberOffset(offset), false);
- return ts.AddLocalReference<jobject>(value);
+ return soa.AddLocalReference<jobject>(value);
}
static void Unsafe_putObject(JNIEnv* env, jobject, jobject javaObj, jlong offset, jobject javaNewValue) {
- ScopedJniThreadState ts(env);
- Object* obj = ts.Decode<Object*>(javaObj);
- Object* newValue = ts.Decode<Object*>(javaNewValue);
+ ScopedObjectAccess soa(env);
+ Object* obj = soa.Decode<Object*>(javaObj);
+ Object* newValue = soa.Decode<Object*>(javaNewValue);
obj->SetFieldObject(MemberOffset(offset), newValue, false);
}
static void Unsafe_putObjectVolatile(JNIEnv* env, jobject, jobject javaObj, jlong offset, jobject javaNewValue) {
- ScopedJniThreadState ts(env);
- Object* obj = ts.Decode<Object*>(javaObj);
- Object* newValue = ts.Decode<Object*>(javaNewValue);
+ ScopedObjectAccess soa(env);
+ Object* obj = soa.Decode<Object*>(javaObj);
+ Object* newValue = soa.Decode<Object*>(javaNewValue);
obj->SetFieldObject(MemberOffset(offset), newValue, true);
}
static void Unsafe_putOrderedObject(JNIEnv* env, jobject, jobject javaObj, jlong offset, jobject javaNewValue) {
- ScopedJniThreadState ts(env);
- Object* obj = ts.Decode<Object*>(javaObj);
- Object* newValue = ts.Decode<Object*>(javaNewValue);
+ ScopedObjectAccess soa(env);
+ Object* obj = soa.Decode<Object*>(javaObj);
+ Object* newValue = soa.Decode<Object*>(javaNewValue);
ANDROID_MEMBAR_STORE();
obj->SetFieldObject(MemberOffset(offset), newValue, false);
}