archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-27 23:04:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8140687: Move @Contended to the jdk.internal.vm.annotation package

Browse source 
Reviewed-by: alanb, dholmes, psandoz, shade
This commit is contained in:
Chris Hegarty 2015-11-24 11:49:44 +00:00
parent 7fe249f6db
commit e09cadb438
9 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

6
hotspot/src/share/vm/classfile/classFileParser.cpp
View file

@ -1693,7 +1693,7 @@ void ClassFileParser::parse_annotations(u1* buffer, int limit,
if (id == AnnotationCollector::_unknown) continue; if (id == AnnotationCollector::_unknown) continue;
coll->set_annotation(id); coll->set_annotation(id);
if (id == AnnotationCollector::_sun_misc_Contended) { if (id == AnnotationCollector::_jdk_internal_vm_annotation_Contended) {
// @Contended can optionally specify the contention group. // @Contended can optionally specify the contention group.
// //
// Contended group defines the equivalence class over the fields: // Contended group defines the equivalence class over the fields:
@ -1767,10 +1767,10 @@ ClassFileParser::AnnotationCollector::annotation_index(ClassLoaderData* loader_d
if (_location != _in_field) break; // only allow for fields if (_location != _in_field) break; // only allow for fields
if (!privileged) break; // only allow in privileged code if (!privileged) break; // only allow in privileged code
return _field_Stable; return _field_Stable;
case vmSymbols::VM_SYMBOL_ENUM_NAME(sun_misc_Contended_signature): case vmSymbols::VM_SYMBOL_ENUM_NAME(jdk_internal_vm_annotation_Contended_signature):
if (_location != _in_field && _location != _in_class) break; // only allow for fields and classes if (_location != _in_field && _location != _in_class) break; // only allow for fields and classes
if (!EnableContended || (RestrictContended && !privileged)) break; // honor privileges if (!EnableContended || (RestrictContended && !privileged)) break; // honor privileges
return _sun_misc_Contended; return _jdk_internal_vm_annotation_Contended;
default: break; default: break;
} }
return AnnotationCollector::_unknown; return AnnotationCollector::_unknown;

4
hotspot/src/share/vm/classfile/classFileParser.hpp
View file

@ -131,7 +131,7 @@ class ClassFileParser VALUE_OBJ_CLASS_SPEC {
_method_LambdaForm_Compiled, _method_LambdaForm_Compiled,
_method_LambdaForm_Hidden, _method_LambdaForm_Hidden,
_method_HotSpotIntrinsicCandidate, _method_HotSpotIntrinsicCandidate,
_sun_misc_Contended, _jdk_internal_vm_annotation_Contended,
_field_Stable, _field_Stable,
_annotation_LIMIT _annotation_LIMIT
}; };
@ -164,7 +164,7 @@ class ClassFileParser VALUE_OBJ_CLASS_SPEC {
void set_contended_group(u2 group) { _contended_group = group; } void set_contended_group(u2 group) { _contended_group = group; }
u2 contended_group() const { return _contended_group; } u2 contended_group() const { return _contended_group; }
bool is_contended() const { return has_annotation(_sun_misc_Contended); } bool is_contended() const { return has_annotation(_jdk_internal_vm_annotation_Contended); }
void set_stable(bool stable) { set_annotation(_field_Stable); } void set_stable(bool stable) { set_annotation(_field_Stable); }
bool is_stable() const { return has_annotation(_field_Stable); } bool is_stable() const { return has_annotation(_field_Stable); }

2
hotspot/src/share/vm/classfile/vmSymbols.hpp
View file

@ -210,7 +210,7 @@
template(java_util_concurrent_atomic_AtomicLongFieldUpdater_CASUpdater, "java/util/concurrent/atomic/AtomicLongFieldUpdater$CASUpdater") \ template(java_util_concurrent_atomic_AtomicLongFieldUpdater_CASUpdater, "java/util/concurrent/atomic/AtomicLongFieldUpdater$CASUpdater") \
template(java_util_concurrent_atomic_AtomicLongFieldUpdater_LockedUpdater, "java/util/concurrent/atomic/AtomicLongFieldUpdater$LockedUpdater") \ template(java_util_concurrent_atomic_AtomicLongFieldUpdater_LockedUpdater, "java/util/concurrent/atomic/AtomicLongFieldUpdater$LockedUpdater") \
template(java_util_concurrent_atomic_AtomicReferenceFieldUpdater_Impl, "java/util/concurrent/atomic/AtomicReferenceFieldUpdater$AtomicReferenceFieldUpdaterImpl") \ template(java_util_concurrent_atomic_AtomicReferenceFieldUpdater_Impl, "java/util/concurrent/atomic/AtomicReferenceFieldUpdater$AtomicReferenceFieldUpdaterImpl") \
template(sun_misc_Contended_signature, "Lsun/misc/Contended;") \ template(jdk_internal_vm_annotation_Contended_signature, "Ljdk/internal/vm/annotation/Contended;") \
\ \
/* class symbols needed by intrinsics */ \ /* class symbols needed by intrinsics */ \
VM_INTRINSICS_DO(VM_INTRINSIC_IGNORE, template, VM_SYMBOL_IGNORE, VM_SYMBOL_IGNORE, VM_ALIAS_IGNORE) \ VM_INTRINSICS_DO(VM_INTRINSIC_IGNORE, template, VM_SYMBOL_IGNORE, VM_SYMBOL_IGNORE, VM_ALIAS_IGNORE) \

2
hotspot/test/runtime/contended/Basic.java
View file

@ -36,7 +36,7 @@ import java.util.regex.Pattern;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import java.lang.reflect.Modifier; import java.lang.reflect.Modifier;
import sun.misc.Unsafe; import sun.misc.Unsafe;
import sun.misc.Contended; import jdk.internal.vm.annotation.Contended;
/* /*
* @test * @test

2
hotspot/test/runtime/contended/DefaultValue.java
View file

@ -36,7 +36,7 @@ import java.util.regex.Pattern;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import java.lang.reflect.Modifier; import java.lang.reflect.Modifier;
import sun.misc.Unsafe; import sun.misc.Unsafe;
import sun.misc.Contended; import jdk.internal.vm.annotation.Contended;
/* /*
* @test * @test

2
hotspot/test/runtime/contended/HasNonStatic.java
View file

@ -36,7 +36,7 @@ import java.util.regex.Pattern;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import java.lang.reflect.Modifier; import java.lang.reflect.Modifier;
import sun.misc.Unsafe; import sun.misc.Unsafe;
import sun.misc.Contended; import jdk.internal.vm.annotation.Contended;
/* /*
* @test * @test

2
hotspot/test/runtime/contended/Inheritance1.java
View file

@ -36,7 +36,7 @@ import java.util.regex.Pattern;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import java.lang.reflect.Modifier; import java.lang.reflect.Modifier;
import sun.misc.Unsafe; import sun.misc.Unsafe;
import sun.misc.Contended; import jdk.internal.vm.annotation.Contended;
/* /*
* @test * @test

2
hotspot/test/runtime/contended/OopMaps.java
View file

@ -36,7 +36,7 @@ import java.util.regex.Pattern;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import java.lang.reflect.Modifier; import java.lang.reflect.Modifier;
import sun.misc.Unsafe; import sun.misc.Unsafe;
import sun.misc.Contended; import jdk.internal.vm.annotation.Contended;
/* /*
* @test * @test

2
hotspot/test/runtime/contended/OopMapsSameGroup.java
View file

@ -36,7 +36,7 @@ import java.util.regex.Pattern;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import java.lang.reflect.Modifier; import java.lang.reflect.Modifier;
import sun.misc.Unsafe; import sun.misc.Unsafe;
import sun.misc.Contended; import jdk.internal.vm.annotation.Contended;
/* /*
* @test * @test