archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-17 01:24:33 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8221967: InternTest.java timed out

Browse source 
Move redundant table lookup and make rehashing be a needed guaranteed safepoint cleanup action.

Reviewed-by: dholmes, rehn
This commit is contained in:
Coleen Phillimore 2019-05-20 10:06:07 -04:00
parent b08841af0d
commit e47584d00d
3 changed files with 16 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/hotspot/share/classfile/stringTable.cpp
View file

@ -372,16 +372,19 @@ oop StringTable::do_intern(Handle string_or_null_h, const jchar* name,
bool rehash_warning;
do {
if (_local_table->get(THREAD, lookup, stg, &rehash_warning)) {
update_needs_rehash(rehash_warning);
return stg.get_res_oop();
}
// Callers have already looked up the String using the jchar* name, so just go to add.
WeakHandle<vm_string_table_data> wh = WeakHandle<vm_string_table_data>::create(string_h);
// The hash table takes ownership of the WeakHandle, even if it's not inserted.
if (_local_table->insert(THREAD, lookup, wh, &rehash_warning)) {
update_needs_rehash(rehash_warning);
return wh.resolve();
}
// In case another thread did a concurrent add, return value already in the table.
// This could fail if the String got gc'ed concurrently, so loop back until success.
if (_local_table->get(THREAD, lookup, stg, &rehash_warning)) {
update_needs_rehash(rehash_warning);
return stg.get_res_oop();
}
} while(true);
}