Skip to content

Commit 65af837

Browse files
iklamiklam
committedSep 22, 2020
8253496: [BACKOUT] JDK-8253208 Move CDS related code to a separate class
Reviewed-by: eosterlund, dcubed
·
jdk-25+17jdk-16-ga
1 parent 581f0f2 commit 65af837

22 files changed

+99
-103
lines changed
 

‎make/hotspot/symbols/symbols-unix

+3-3
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ JVM_GetPermittedSubclasses
123123
JVM_GetPrimitiveArrayElement
124124
JVM_GetProperties
125125
JVM_GetProtectionDomain
126-
JVM_GetRandomSeedForDumping
126+
JVM_GetRandomSeedForCDSDump
127127
JVM_GetRecordComponents
128128
JVM_GetSimpleBinaryName
129129
JVM_GetStackAccessControlContext
@@ -143,8 +143,8 @@ JVM_InternString
143143
JVM_Interrupt
144144
JVM_InvokeMethod
145145
JVM_IsArrayClass
146-
JVM_IsDynamicDumpingEnabled
147-
JVM_IsSharingEnabled
146+
JVM_IsCDSDumpingEnabled
147+
JVM_IsCDSSharingEnabled
148148
JVM_IsConstructorIx
149149
JVM_IsHiddenClass
150150
JVM_IsInterface

‎src/hotspot/share/include/jvm.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -198,13 +198,13 @@ JVM_LookupLambdaProxyClassFromArchive(JNIEnv* env, jclass caller,
198198
jboolean initialize);
199199

200200
JNIEXPORT jboolean JNICALL
201-
JVM_IsDynamicDumpingEnabled(JNIEnv* env);
201+
JVM_IsCDSDumpingEnabled(JNIEnv* env);
202202

203203
JNIEXPORT jboolean JNICALL
204-
JVM_IsSharingEnabled(JNIEnv* env);
204+
JVM_IsCDSSharingEnabled(JNIEnv* env);
205205

206206
JNIEXPORT jlong JNICALL
207-
JVM_GetRandomSeedForDumping();
207+
JVM_GetRandomSeedForCDSDump();
208208

209209
/*
210210
* java.lang.Throwable

‎src/hotspot/share/prims/jvm.cpp

+7-7
Original file line numberDiff line numberDiff line change
@@ -3833,18 +3833,18 @@ JVM_ENTRY(jclass, JVM_LookupLambdaProxyClassFromArchive(JNIEnv* env,
38333833
#endif // INCLUDE_CDS
38343834
JVM_END
38353835

3836-
JVM_ENTRY(jboolean, JVM_IsDynamicDumpingEnabled(JNIEnv* env))
3837-
JVMWrapper("JVM_IsDynamicDumpingEnable");
3836+
JVM_ENTRY(jboolean, JVM_IsCDSDumpingEnabled(JNIEnv* env))
3837+
JVMWrapper("JVM_IsCDSDumpingEnable");
38383838
return DynamicDumpSharedSpaces;
38393839
JVM_END
38403840

3841-
JVM_ENTRY(jboolean, JVM_IsSharingEnabled(JNIEnv* env))
3842-
JVMWrapper("JVM_IsSharingEnable");
3841+
JVM_ENTRY(jboolean, JVM_IsCDSSharingEnabled(JNIEnv* env))
3842+
JVMWrapper("JVM_IsCDSSharingEnable");
38433843
return UseSharedSpaces;
38443844
JVM_END
38453845

3846-
JVM_ENTRY_NO_ENV(jlong, JVM_GetRandomSeedForDumping())
3847-
JVMWrapper("JVM_GetRandomSeedForDumping");
3846+
JVM_ENTRY_NO_ENV(jlong, JVM_GetRandomSeedForCDSDump())
3847+
JVMWrapper("JVM_GetRandomSeedForCDSDump");
38483848
if (DumpSharedSpaces) {
38493849
const char* release = Abstract_VM_Version::vm_release();
38503850
const char* dbg_level = Abstract_VM_Version::jdk_debug_level();
@@ -3859,7 +3859,7 @@ JVM_ENTRY_NO_ENV(jlong, JVM_GetRandomSeedForDumping())
38593859
if (seed == 0) { // don't let this ever be zero.
38603860
seed = 0x87654321;
38613861
}
3862-
log_debug(cds)("JVM_GetRandomSeedForDumping() = " JLONG_FORMAT, seed);
3862+
log_debug(cds)("JVM_GetRandomSeedForCDSDump() = " JLONG_FORMAT, seed);
38633863
return seed;
38643864
} else {
38653865
return 0;

‎src/java.base/share/classes/java/lang/Byte.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
package java.lang;
2727

2828
import jdk.internal.HotSpotIntrinsicCandidate;
29-
import jdk.internal.misc.CDS;
29+
import jdk.internal.misc.VM;
3030

3131
import java.lang.constant.Constable;
3232
import java.lang.constant.DynamicConstantDesc;
@@ -108,7 +108,7 @@ private ByteCache() {}
108108
final int size = -(-128) + 127 + 1;
109109

110110
// Load and use the archived cache if it exists
111-
CDS.initializeFromArchive(ByteCache.class);
111+
VM.initializeFromArchive(ByteCache.class);
112112
if (archivedCache == null || archivedCache.length != size) {
113113
Byte[] c = new Byte[size];
114114
byte value = (byte)-128;

‎src/java.base/share/classes/java/lang/Character.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
package java.lang;
2727

2828
import jdk.internal.HotSpotIntrinsicCandidate;
29-
import jdk.internal.misc.CDS;
29+
import jdk.internal.misc.VM;
3030

3131
import java.lang.constant.Constable;
3232
import java.lang.constant.DynamicConstantDesc;
@@ -8516,7 +8516,7 @@ private CharacterCache(){}
85168516
int size = 127 + 1;
85178517

85188518
// Load and use the archived cache if it exists
8519-
CDS.initializeFromArchive(CharacterCache.class);
8519+
VM.initializeFromArchive(CharacterCache.class);
85208520
if (archivedCache == null || archivedCache.length != size) {
85218521
Character[] c = new Character[size];
85228522
for (int i = 0; i < size; i++) {

‎src/java.base/share/classes/java/lang/Integer.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
import java.util.Optional;
3434

3535
import jdk.internal.HotSpotIntrinsicCandidate;
36-
import jdk.internal.misc.CDS;
3736
import jdk.internal.misc.VM;
3837

3938
import static java.lang.String.COMPACT_STRINGS;
@@ -1024,7 +1023,7 @@ private static class IntegerCache {
10241023
high = h;
10251024

10261025
// Load IntegerCache.archivedCache from archive, if possible
1027-
CDS.initializeFromArchive(IntegerCache.class);
1026+
VM.initializeFromArchive(IntegerCache.class);
10281027
int size = (high - low) + 1;
10291028

10301029
// Use the archived cache if it exists and is large enough

‎src/java.base/share/classes/java/lang/Long.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
import java.util.Optional;
3535

3636
import jdk.internal.HotSpotIntrinsicCandidate;
37-
import jdk.internal.misc.CDS;
37+
import jdk.internal.misc.VM;
3838

3939
import static java.lang.String.COMPACT_STRINGS;
4040
import static java.lang.String.LATIN1;
@@ -1169,7 +1169,7 @@ private LongCache() {}
11691169
int size = -(-128) + 127 + 1;
11701170

11711171
// Load and use the archived cache if it exists
1172-
CDS.initializeFromArchive(LongCache.class);
1172+
VM.initializeFromArchive(LongCache.class);
11731173
if (archivedCache == null || archivedCache.length != size) {
11741174
Long[] c = new Long[size];
11751175
long value = -128;

‎src/java.base/share/classes/java/lang/Module.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@
5555
import jdk.internal.loader.BuiltinClassLoader;
5656
import jdk.internal.loader.BootLoader;
5757
import jdk.internal.loader.ClassLoaders;
58-
import jdk.internal.misc.CDS;
5958
import jdk.internal.misc.VM;
6059
import jdk.internal.module.IllegalAccessLogger;
6160
import jdk.internal.module.ModuleLoaderMap;
@@ -278,7 +277,7 @@ static ArchivedData get() {
278277
}
279278

280279
static {
281-
CDS.initializeFromArchive(ArchivedData.class);
280+
VM.initializeFromArchive(ArchivedData.class);
282281
}
283282
}
284283

‎src/java.base/share/classes/java/lang/Short.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
package java.lang;
2727

2828
import jdk.internal.HotSpotIntrinsicCandidate;
29-
import jdk.internal.misc.CDS;
29+
import jdk.internal.misc.VM;
3030

3131
import java.lang.constant.Constable;
3232
import java.lang.constant.DynamicConstantDesc;
@@ -234,7 +234,7 @@ private ShortCache() {}
234234
int size = -(-128) + 127 + 1;
235235

236236
// Load and use the archived cache if it exists
237-
CDS.initializeFromArchive(ShortCache.class);
237+
VM.initializeFromArchive(ShortCache.class);
238238
if (archivedCache == null || archivedCache.length != size) {
239239
Short[] c = new Short[size];
240240
short value = -128;

‎src/java.base/share/classes/java/lang/invoke/LambdaProxyClassArchive.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,15 @@
2626
package java.lang.invoke;
2727

2828
import jdk.internal.loader.BuiltinClassLoader;
29-
import jdk.internal.misc.CDS;
29+
import jdk.internal.misc.VM;
3030

3131
final class LambdaProxyClassArchive {
3232
private static final boolean dumpArchive;
3333
private static final boolean sharingEnabled;
3434

3535
static {
36-
dumpArchive = CDS.isDynamicDumpingEnabled();
37-
sharingEnabled = CDS.isSharingEnabled();
36+
dumpArchive = VM.isCDSDumpingEnabled();
37+
sharingEnabled = VM.isCDSSharingEnabled();
3838
}
3939

4040
/**

‎src/java.base/share/classes/java/lang/module/Configuration.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
import java.util.stream.Collectors;
4242
import java.util.stream.Stream;
4343

44-
import jdk.internal.misc.CDS;
44+
import jdk.internal.misc.VM;
4545
import jdk.internal.module.ModuleReferenceImpl;
4646
import jdk.internal.module.ModuleTarget;
4747
import jdk.internal.vm.annotation.Stable;
@@ -110,7 +110,7 @@ public final class Configuration {
110110

111111
static {
112112
// Initialize EMPTY_CONFIGURATION from the archive.
113-
CDS.initializeFromArchive(Configuration.class);
113+
VM.initializeFromArchive(Configuration.class);
114114
// Create a new empty Configuration if there is no archived version.
115115
if (EMPTY_CONFIGURATION == null) {
116116
EMPTY_CONFIGURATION = new Configuration();

‎src/java.base/share/classes/java/util/ImmutableCollections.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
import java.util.function.Predicate;
3838
import java.util.function.UnaryOperator;
3939
import jdk.internal.access.SharedSecrets;
40-
import jdk.internal.misc.CDS;
40+
import jdk.internal.misc.VM;
4141
import jdk.internal.vm.annotation.Stable;
4242

4343
/**
@@ -76,7 +76,7 @@ class ImmutableCollections {
7676
// derived from the JVM build/version, so can we generate the exact same
7777
// CDS archive for the same JDK build. This makes it possible to verify the
7878
// consistency of the JDK build.
79-
long seed = CDS.getRandomSeedForDumping();
79+
long seed = VM.getRandomSeedForCDSDump();
8080
if (seed == 0) {
8181
seed = System.nanoTime();
8282
}
@@ -100,7 +100,7 @@ class ImmutableCollections {
100100
static final MapN<?,?> EMPTY_MAP;
101101

102102
static {
103-
CDS.initializeFromArchive(ImmutableCollections.class);
103+
VM.initializeFromArchive(ImmutableCollections.class);
104104
if (archivedObjects == null) {
105105
EMPTY = new Object();
106106
EMPTY_LIST = new ListN<>();

‎src/java.base/share/classes/java/util/jar/Attributes.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
import java.util.Objects;
3535
import java.util.Set;
3636

37-
import jdk.internal.misc.CDS;
37+
import jdk.internal.misc.VM;
3838
import jdk.internal.vm.annotation.Stable;
3939

4040
import sun.nio.cs.UTF_8;
@@ -672,7 +672,7 @@ private static void addName(Map<String, Name> names, Name name) {
672672

673673
static {
674674

675-
CDS.initializeFromArchive(Attributes.Name.class);
675+
VM.initializeFromArchive(Attributes.Name.class);
676676

677677
if (KNOWN_NAMES == null) {
678678
MANIFEST_VERSION = new Name("Manifest-Version");

‎src/java.base/share/classes/jdk/internal/loader/ArchivedClassLoaders.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
package jdk.internal.loader;
2626

2727
import java.util.Map;
28-
import jdk.internal.misc.CDS;
28+
import jdk.internal.misc.VM;
2929
import jdk.internal.module.ServicesCatalog;
3030

3131
/**
@@ -91,6 +91,6 @@ static ArchivedClassLoaders get() {
9191
}
9292

9393
static {
94-
CDS.initializeFromArchive(ArchivedClassLoaders.class);
94+
VM.initializeFromArchive(ArchivedClassLoaders.class);
9595
}
9696
}

‎src/java.base/share/classes/jdk/internal/math/FDBigInteger.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2013, 2020, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -24,7 +24,7 @@
2424
*/
2525
package jdk.internal.math;
2626

27-
import jdk.internal.misc.CDS;
27+
import jdk.internal.misc.VM;
2828

2929
import java.math.BigInteger;
3030
import java.util.Arrays;
@@ -84,7 +84,7 @@
8484

8585
// Initialize FDBigInteger cache of powers of 5.
8686
static {
87-
CDS.initializeFromArchive(FDBigInteger.class);
87+
VM.initializeFromArchive(FDBigInteger.class);
8888
Object[] caches = archivedCaches;
8989
if (caches == null) {
9090
long[] long5pow = {

‎src/java.base/share/classes/jdk/internal/misc/VM.java

+25
Original file line numberDiff line numberDiff line change
@@ -457,6 +457,31 @@ public static boolean isSetUID() {
457457
}
458458
private static native void initialize();
459459

460+
/**
461+
* Initialize archived static fields in the given Class using archived
462+
* values from CDS dump time. Also initialize the classes of objects in
463+
* the archived graph referenced by those fields.
464+
*
465+
* Those static fields remain as uninitialized if there is no mapped CDS
466+
* java heap data or there is any error during initialization of the
467+
* object class in the archived graph.
468+
*/
469+
public static native void initializeFromArchive(Class<?> c);
470+
471+
public static native void defineArchivedModules(ClassLoader platformLoader, ClassLoader systemLoader);
472+
473+
public static native long getRandomSeedForCDSDump();
474+
475+
/**
476+
* Check if CDS dynamic dumping is enabled via the DynamicDumpSharedSpaces flag.
477+
*/
478+
public static native boolean isCDSDumpingEnabled();
479+
480+
/**
481+
* Check if CDS sharing is enabled by via the UseSharedSpaces flag.
482+
*/
483+
public static native boolean isCDSSharingEnabled();
484+
460485
/**
461486
* Provides access to information on buffer usage.
462487
*/

‎src/java.base/share/classes/jdk/internal/module/ArchivedBootLayer.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
*/
2525
package jdk.internal.module;
2626

27-
import jdk.internal.misc.CDS;
27+
import jdk.internal.misc.VM;
2828

2929
/**
3030
* Used by ModuleBootstrap for archiving the boot layer and the builder needed to
@@ -59,6 +59,6 @@ static void archive(ModuleLayer layer, IllegalAccessLogger.Builder builder) {
5959
}
6060

6161
static {
62-
CDS.initializeFromArchive(ArchivedBootLayer.class);
62+
VM.initializeFromArchive(ArchivedBootLayer.class);
6363
}
6464
}

‎src/java.base/share/classes/jdk/internal/module/ArchivedModuleGraph.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
import java.util.function.Function;
3030
import java.lang.module.Configuration;
3131
import java.lang.module.ModuleFinder;
32-
import jdk.internal.misc.CDS;
32+
import jdk.internal.misc.VM;
3333

3434
/**
3535
* Used by ModuleBootstrap for archiving the configuration for the boot layer,
@@ -123,6 +123,6 @@ static void archive(boolean hasSplitPackages,
123123
}
124124

125125
static {
126-
CDS.initializeFromArchive(ArchivedModuleGraph.class);
126+
VM.initializeFromArchive(ArchivedModuleGraph.class);
127127
}
128128
}

‎src/java.base/share/classes/jdk/internal/module/ModuleBootstrap.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
import jdk.internal.loader.BootLoader;
5555
import jdk.internal.loader.BuiltinClassLoader;
5656
import jdk.internal.loader.ClassLoaders;
57-
import jdk.internal.misc.CDS;
57+
import jdk.internal.misc.VM;
5858
import jdk.internal.perf.PerfCounter;
5959

6060
/**
@@ -167,7 +167,7 @@ public static ModuleLayer boot() {
167167
assert canUseArchivedBootLayer();
168168
bootLayer = archivedBootLayer.bootLayer();
169169
BootLoader.getUnnamedModule(); // trigger <clinit> of BootLoader.
170-
CDS.defineArchivedModules(ClassLoaders.platformClassLoader(), ClassLoaders.appClassLoader());
170+
VM.defineArchivedModules(ClassLoaders.platformClassLoader(), ClassLoaders.appClassLoader());
171171

172172
// assume boot layer has at least one module providing a service
173173
// that is mapped to the application class loader.

‎src/java.base/share/classes/sun/util/locale/BaseLocale.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232

3333
package sun.util.locale;
3434

35-
import jdk.internal.misc.CDS;
35+
import jdk.internal.misc.VM;
3636
import jdk.internal.vm.annotation.Stable;
3737

3838
import java.lang.ref.SoftReference;
@@ -62,7 +62,7 @@ public final class BaseLocale {
6262
ROOT = 18,
6363
NUM_CONSTANTS = 19;
6464
static {
65-
CDS.initializeFromArchive(BaseLocale.class);
65+
VM.initializeFromArchive(BaseLocale.class);
6666
BaseLocale[] baseLocales = constantBaseLocales;
6767
if (baseLocales == null) {
6868
baseLocales = new BaseLocale[NUM_CONSTANTS];

‎src/java.base/share/native/libjava/CDS.c

-55
This file was deleted.

‎src/java.base/share/native/libjava/VM.c

+28
Original file line numberDiff line numberDiff line change
@@ -55,3 +55,31 @@ JNIEXPORT jobjectArray JNICALL
5555
Java_jdk_internal_misc_VM_getRuntimeArguments(JNIEnv *env, jclass cls) {
5656
return JVM_GetVmArguments(env);
5757
}
58+
59+
JNIEXPORT void JNICALL
60+
Java_jdk_internal_misc_VM_initializeFromArchive(JNIEnv *env, jclass ignore,
61+
jclass c) {
62+
JVM_InitializeFromArchive(env, c);
63+
}
64+
65+
JNIEXPORT void JNICALL
66+
Java_jdk_internal_misc_VM_defineArchivedModules(JNIEnv *env, jclass ignore,
67+
jobject platform_loader,
68+
jobject system_loader) {
69+
JVM_DefineArchivedModules(env, platform_loader, system_loader);
70+
}
71+
72+
JNIEXPORT jlong JNICALL
73+
Java_jdk_internal_misc_VM_getRandomSeedForCDSDump(JNIEnv *env, jclass ignore) {
74+
return JVM_GetRandomSeedForCDSDump();
75+
}
76+
77+
JNIEXPORT jboolean JNICALL
78+
Java_jdk_internal_misc_VM_isCDSDumpingEnabled(JNIEnv *env, jclass jcls) {
79+
return JVM_IsCDSDumpingEnabled(env);
80+
}
81+
82+
JNIEXPORT jboolean JNICALL
83+
Java_jdk_internal_misc_VM_isCDSSharingEnabled(JNIEnv *env, jclass jcls) {
84+
return JVM_IsCDSSharingEnabled(env);
85+
}

1 commit comments

Comments
 (1)

bridgekeeper[bot] commented on Sep 22, 2020

@bridgekeeper[bot]
bridgekeeper[bot]
on Sep 22, 2020

Review

Issues

Please sign in to comment.