stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8338897: Small startup regression remains after JDK-8309622 and JDK-8331932

Browse Source 
Reviewed-by: liach, naoto
This commit is contained in:
Claes Redestad 2024-08-28 18:16:00 +00:00
parent 3d49fb8a17
commit a98ecad0a9
2 changed files with 21 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/java.base/share/classes/java/util/Locale.java
View File

@ -988,17 +988,23 @@ public final class Locale implements Cloneable, Serializable {
if (locale != null) { if (locale != null) {
return locale; return locale;
} }
return LOCALE_CACHE.computeIfAbsent(baseloc, LOCALE_CREATOR); return LocaleCache.cache(baseloc);
} else { } else {
LocaleKey key = new LocaleKey(baseloc, extensions); LocaleKey key = new LocaleKey(baseloc, extensions);
return LOCALE_CACHE.computeIfAbsent(key, LOCALE_CREATOR); return LocaleCache.cache(key);
} }
} }
private static final ReferencedKeyMap<Object, Locale> LOCALE_CACHE private static final class LocaleCache implements Function<Object, Locale> {
= ReferencedKeyMap.create(true, ReferencedKeyMap.concurrentHashMapSupplier()); private static final ReferencedKeyMap<Object, Locale> LOCALE_CACHE
= ReferencedKeyMap.create(true, ReferencedKeyMap.concurrentHashMapSupplier());
private static final Function<Object, Locale> LOCALE_CREATOR = new LocaleCache();
public static Locale cache(Object key) {
return LOCALE_CACHE.computeIfAbsent(key, LOCALE_CREATOR);
}
private static final Function<Object, Locale> LOCALE_CREATOR = new Function<>() {
@Override @Override
public Locale apply(Object key) { public Locale apply(Object key) {
if (key instanceof BaseLocale base) { if (key instanceof BaseLocale base) {
@ -1007,7 +1013,7 @@ public final class Locale implements Cloneable, Serializable {
LocaleKey lk = (LocaleKey)key; LocaleKey lk = (LocaleKey)key;
return new Locale(lk.base, lk.exts); return new Locale(lk.base, lk.exts);
} }
}; }
private static final class LocaleKey { private static final class LocaleKey {

28
src/java.base/share/classes/sun/util/locale/BaseLocale.java
View File

@ -38,7 +38,6 @@ import jdk.internal.util.StaticProperty;
import jdk.internal.vm.annotation.Stable; import jdk.internal.vm.annotation.Stable;
import java.util.StringJoiner; import java.util.StringJoiner;
import java.util.function.UnaryOperator;
public final class BaseLocale { public final class BaseLocale {
@ -91,10 +90,6 @@ public final class BaseLocale {
} }
} }
// Interned BaseLocale cache
private static final ReferencedKeySet<BaseLocale> CACHE =
ReferencedKeySet.create(true, ReferencedKeySet.concurrentHashMapSupplier());
public static final String SEP = "_"; public static final String SEP = "_";
private final String language; private final String language;
@ -163,21 +158,16 @@ public final class BaseLocale {
// Obtain the "interned" BaseLocale from the cache. The returned // Obtain the "interned" BaseLocale from the cache. The returned
// "interned" instance can subsequently be used by the Locale // "interned" instance can subsequently be used by the Locale
// instance which guarantees the locale components are properly cased/interned. // instance which guarantees the locale components are properly cased/interned.
return CACHE.intern(new BaseLocale(language, script, region, variant), class InterningCache { // TODO: StableValue
// Avoid lambdas since this may be on the bootstrap path in many locales private static final ReferencedKeySet<BaseLocale> CACHE =
INTERNER); ReferencedKeySet.create(true, ReferencedKeySet.concurrentHashMapSupplier());
}
public static final UnaryOperator<BaseLocale> INTERNER = new UnaryOperator<>() {
@Override
public BaseLocale apply(BaseLocale b) {
return new BaseLocale(
LocaleUtils.toLowerString(b.language).intern(),
LocaleUtils.toTitleString(b.script).intern(),
LocaleUtils.toUpperString(b.region).intern(),
b.variant.intern());
} }
}; return InterningCache.CACHE.intern(new BaseLocale(
language.intern(), // guaranteed to be lower-case
LocaleUtils.toTitleString(script).intern(),
region.intern(), // guaranteed to be upper-case
variant.intern()));
}
public static String convertOldISOCodes(String language) { public static String convertOldISOCodes(String language) {
return switch (language) { return switch (language) {