< prev index next >
src/share/vm/prims/jni.cpp
Print this page
*** 337,350 ****
ResourceMark rm(THREAD);
ClassFileStream st((u1*) buf, bufLen, NULL);
Handle class_loader (THREAD, JNIHandles::resolve(loaderRef));
if (UsePerfData && !class_loader.is_null()) {
// check whether the current caller thread holds the lock or not.
// If not, increment the corresponding counter
if (ObjectSynchronizer::
! query_lock_ownership((JavaThread*)THREAD, class_loader) !=
ObjectSynchronizer::owner_self) {
ClassLoader::sync_JNIDefineClassLockFreeCounter()->inc();
}
}
Klass* k = SystemDictionary::resolve_from_stream(class_name, class_loader,
--- 337,351 ----
ResourceMark rm(THREAD);
ClassFileStream st((u1*) buf, bufLen, NULL);
Handle class_loader (THREAD, JNIHandles::resolve(loaderRef));
if (UsePerfData && !class_loader.is_null()) {
+ Handle class_loader1 (THREAD, oopDesc::bs()->write_barrier(class_loader()));
// check whether the current caller thread holds the lock or not.
// If not, increment the corresponding counter
if (ObjectSynchronizer::
! query_lock_ownership((JavaThread*)THREAD, class_loader1) !=
ObjectSynchronizer::owner_self) {
ClassLoader::sync_JNIDefineClassLockFreeCounter()->inc();
}
}
Klass* k = SystemDictionary::resolve_from_stream(class_name, class_loader,
*** 576,586 ****
oop sub_mirror = JNIHandles::resolve_non_null(sub);
oop super_mirror = JNIHandles::resolve_non_null(super);
if (java_lang_Class::is_primitive(sub_mirror) ||
java_lang_Class::is_primitive(super_mirror)) {
jboolean ret = (sub_mirror == super_mirror);
!
HOTSPOT_JNI_ISASSIGNABLEFROM_RETURN(ret);
return ret;
}
Klass* sub_klass = java_lang_Class::as_Klass(sub_mirror);
Klass* super_klass = java_lang_Class::as_Klass(super_mirror);
--- 577,591 ----
oop sub_mirror = JNIHandles::resolve_non_null(sub);
oop super_mirror = JNIHandles::resolve_non_null(super);
if (java_lang_Class::is_primitive(sub_mirror) ||
java_lang_Class::is_primitive(super_mirror)) {
jboolean ret = (sub_mirror == super_mirror);
! if (UseShenandoahGC && ret == JNI_FALSE) {
! sub_mirror = oopDesc::bs()->read_barrier(sub_mirror);
! super_mirror = oopDesc::bs()->read_barrier(super_mirror);
! ret = (sub_mirror == super_mirror);
! }
HOTSPOT_JNI_ISASSIGNABLEFROM_RETURN(ret);
return ret;
}
Klass* sub_klass = java_lang_Class::as_Klass(sub_mirror);
Klass* super_klass = java_lang_Class::as_Klass(super_mirror);
*** 818,827 ****
--- 823,837 ----
oop a = JNIHandles::resolve(r1);
oop b = JNIHandles::resolve(r2);
jboolean ret = (a == b) ? JNI_TRUE : JNI_FALSE;
+ if (UseShenandoahGC && ret == JNI_FALSE) {
+ a = oopDesc::bs()->read_barrier(a);
+ b = oopDesc::bs()->read_barrier(b);
+ ret = (a == b) ? JNI_TRUE : JNI_FALSE;
+ }
HOTSPOT_JNI_ISSAMEOBJECT_RETURN(ret);
return ret;
JNI_END
*** 2060,2070 ****
jobject ret = JNIHandles::make_local(env, o->obj_field(offset));
#if INCLUDE_ALL_GCS
// If G1 is enabled and we are accessing the value of the referent
// field in a reference object then we need to register a non-null
// referent with the SATB barrier.
! if (UseG1GC) {
bool needs_barrier = false;
if (ret != NULL &&
offset == java_lang_ref_Reference::referent_offset &&
InstanceKlass::cast(k)->reference_type() != REF_NONE) {
--- 2070,2080 ----
jobject ret = JNIHandles::make_local(env, o->obj_field(offset));
#if INCLUDE_ALL_GCS
// If G1 is enabled and we are accessing the value of the referent
// field in a reference object then we need to register a non-null
// referent with the SATB barrier.
! if (UseG1GC || UseShenandoahGC) {
bool needs_barrier = false;
if (ret != NULL &&
offset == java_lang_ref_Reference::referent_offset &&
InstanceKlass::cast(k)->reference_type() != REF_NONE) {
*** 2713,2722 ****
--- 2723,2733 ----
jni_Get##Result##ArrayElements(JNIEnv *env, ElementType##Array array, jboolean *isCopy)) \
JNIWrapper("Get" XSTR(Result) "ArrayElements"); \
EntryProbe; \
/* allocate an chunk of memory in c land */ \
typeArrayOop a = typeArrayOop(JNIHandles::resolve_non_null(array)); \
+ a = typeArrayOop(oopDesc::bs()->read_barrier(a)); \
ElementType* result; \
int len = a->length(); \
if (len == 0) { \
/* Empty array: legal but useless, can't return NULL. \
* Return a pointer to something useless. \
*** 2771,2780 ****
--- 2782,2792 ----
jni_Release##Result##ArrayElements(JNIEnv *env, ElementType##Array array, \
ElementType *buf, jint mode)) \
JNIWrapper("Release" XSTR(Result) "ArrayElements"); \
EntryProbe; \
typeArrayOop a = typeArrayOop(JNIHandles::resolve_non_null(array)); \
+ a = typeArrayOop(oopDesc::bs()->write_barrier(a)); \
int len = a->length(); \
if (len != 0) { /* Empty array: nothing to free or copy. */ \
if ((mode == 0) || (mode == JNI_COMMIT)) { \
memcpy(a->Tag##_at_addr(0), buf, sizeof(ElementType)*len); \
} \
*** 2821,2830 ****
--- 2833,2843 ----
jsize len, ElementType *buf)) \
JNIWrapper("Get" XSTR(Result) "ArrayRegion"); \
EntryProbe; \
DT_VOID_RETURN_MARK(Get##Result##ArrayRegion); \
typeArrayOop src = typeArrayOop(JNIHandles::resolve_non_null(array)); \
+ src = typeArrayOop(oopDesc::bs()->read_barrier(src)); \
if (start < 0 || len < 0 || ((unsigned int)start + (unsigned int)len > (unsigned int)src->length())) { \
THROW(vmSymbols::java_lang_ArrayIndexOutOfBoundsException()); \
} else { \
if (len > 0) { \
int sc = TypeArrayKlass::cast(src->klass())->log2_element_size(); \
*** 2871,2880 ****
--- 2884,2894 ----
jsize len, const ElementType *buf)) \
JNIWrapper("Set" XSTR(Result) "ArrayRegion"); \
EntryProbe; \
DT_VOID_RETURN_MARK(Set##Result##ArrayRegion); \
typeArrayOop dst = typeArrayOop(JNIHandles::resolve_non_null(array)); \
+ dst = typeArrayOop(oopDesc::bs()->write_barrier(dst)); \
if (start < 0 || len < 0 || ((unsigned int)start + (unsigned int)len > (unsigned int)dst->length())) { \
THROW(vmSymbols::java_lang_ArrayIndexOutOfBoundsException()); \
} else { \
if (len > 0) { \
int sc = TypeArrayKlass::cast(dst->klass())->log2_element_size(); \
*** 3069,3079 ****
// If the object is null, we can't do anything with it
if (jobj == NULL) {
THROW_(vmSymbols::java_lang_NullPointerException(), JNI_ERR);
}
! Handle obj(thread, JNIHandles::resolve_non_null(jobj));
ObjectSynchronizer::jni_enter(obj, CHECK_(JNI_ERR));
ret = JNI_OK;
return ret;
JNI_END
--- 3083,3093 ----
// If the object is null, we can't do anything with it
if (jobj == NULL) {
THROW_(vmSymbols::java_lang_NullPointerException(), JNI_ERR);
}
! Handle obj(thread, oopDesc::bs()->write_barrier(JNIHandles::resolve_non_null(jobj)));
ObjectSynchronizer::jni_enter(obj, CHECK_(JNI_ERR));
ret = JNI_OK;
return ret;
JNI_END
*** 3088,3098 ****
// Don't do anything with a null object
if (jobj == NULL) {
THROW_(vmSymbols::java_lang_NullPointerException(), JNI_ERR);
}
! Handle obj(THREAD, JNIHandles::resolve_non_null(jobj));
ObjectSynchronizer::jni_exit(obj(), CHECK_(JNI_ERR));
ret = JNI_OK;
return ret;
JNI_END
--- 3102,3112 ----
// Don't do anything with a null object
if (jobj == NULL) {
THROW_(vmSymbols::java_lang_NullPointerException(), JNI_ERR);
}
! Handle obj(THREAD, oopDesc::bs()->write_barrier(JNIHandles::resolve_non_null(jobj)));
ObjectSynchronizer::jni_exit(obj(), CHECK_(JNI_ERR));
ret = JNI_OK;
return ret;
JNI_END
*** 3154,3163 ****
--- 3168,3178 ----
GC_locker::lock_critical(thread);
if (isCopy != NULL) {
*isCopy = JNI_FALSE;
}
oop a = JNIHandles::resolve_non_null(array);
+ a = oopDesc::bs()->write_barrier(a);
assert(a->is_array(), "just checking");
BasicType type;
if (a->is_objArray()) {
type = T_OBJECT;
} else {
< prev index next >