archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-28 15:24:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8210330: Make CLD claiming allow multiple claim bits

Browse source 
Reviewed-by: pliden, coleenp
This commit is contained in:
Erik Österlund 2018-10-16 13:16:11 +02:00
parent 782fa608d2
commit e39c5811b5
23 changed files with 68 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/hotspot/share/classfile/classLoaderData.cpp
View file

@ -139,7 +139,7 @@ ClassLoaderData::ClassLoaderData(Handle h_class_loader, bool is_unsafe_anonymous
// it from being unloaded during parsing of the unsafe anonymous class.
// The null-class-loader should always be kept alive.
_keep_alive((is_unsafe_anonymous || h_class_loader.is_null()) ? 1 : 0),
_claimed(0),
_claim(0),
_handles(),
_klasses(NULL), _packages(NULL), _modules(NULL), _unnamed_module(NULL), _dictionary(NULL),
_jmethod_ids(NULL),
@ -268,12 +268,17 @@ bool ClassLoaderData::ChunkedHandleList::owner_of(oop* oop_handle) {
}
#endif // PRODUCT
bool ClassLoaderData::claim() {
if (_claimed == 1) {
return false;
bool ClassLoaderData::try_claim(int claim) {
for (;;) {
int old_claim = Atomic::load(&_claim);
if ((old_claim & claim) == claim) {
return false;
}
int new_claim = old_claim | claim;
if (Atomic::cmpxchg(new_claim, &_claim, old_claim) == old_claim) {
return true;
}
}
return (int) Atomic::cmpxchg(1, &_claimed, 0) == 0;
}
// Unsafe anonymous classes have their own ClassLoaderData that is marked to keep alive
@ -295,8 +300,8 @@ void ClassLoaderData::dec_keep_alive() {
}
}
void ClassLoaderData::oops_do(OopClosure* f, bool must_claim, bool clear_mod_oops) {
if (must_claim && !claim()) {
void ClassLoaderData::oops_do(OopClosure* f, int claim_value, bool clear_mod_oops) {
if (claim_value != ClassLoaderData::_claim_none && !try_claim(claim_value)) {
return;
}