diff --git a/jdk/make/mapfiles/libjava/mapfile-vers b/jdk/make/mapfiles/libjava/mapfile-vers index dd7e58a6b2e..ac1be88ebe6 100644 --- a/jdk/make/mapfiles/libjava/mapfile-vers +++ b/jdk/make/mapfiles/libjava/mapfile-vers @@ -274,12 +274,12 @@ SUNWprivate_1.1 { Java_sun_reflect_Reflection_getClassAccessFlags; Java_sun_misc_Version_getJdkVersionInfo; Java_sun_misc_Version_getJvmVersionInfo; - Java_sun_misc_VM_latestUserDefinedLoader; - Java_sun_misc_VM_getuid; - Java_sun_misc_VM_geteuid; - Java_sun_misc_VM_getgid; - Java_sun_misc_VM_getegid; - Java_sun_misc_VM_initialize; + Java_jdk_internal_misc_VM_latestUserDefinedLoader; + Java_jdk_internal_misc_VM_getuid; + Java_jdk_internal_misc_VM_geteuid; + Java_jdk_internal_misc_VM_getgid; + Java_jdk_internal_misc_VM_getegid; + Java_jdk_internal_misc_VM_initialize; Java_sun_misc_VMSupport_initAgentProperties; Java_sun_misc_VMSupport_getVMTemporaryDirectory; diff --git a/jdk/src/java.base/share/classes/java/io/ObjectInputStream.java b/jdk/src/java.base/share/classes/java/io/ObjectInputStream.java index 779257e87c0..d739bc411e1 100644 --- a/jdk/src/java.base/share/classes/java/io/ObjectInputStream.java +++ b/jdk/src/java.base/share/classes/java/io/ObjectInputStream.java @@ -2135,7 +2135,7 @@ public class ObjectInputStream * corresponding modifications to the above class. */ private static ClassLoader latestUserDefinedLoader() { - return sun.misc.VM.latestUserDefinedLoader(); + return jdk.internal.misc.VM.latestUserDefinedLoader(); } /** diff --git a/jdk/src/java.base/share/classes/java/lang/Class.java b/jdk/src/java.base/share/classes/java/lang/Class.java index 013b5843a1e..af75faf371a 100644 --- a/jdk/src/java.base/share/classes/java/lang/Class.java +++ b/jdk/src/java.base/share/classes/java/lang/Class.java @@ -56,6 +56,7 @@ import java.util.HashMap; import java.util.Objects; import java.util.StringJoiner; import jdk.internal.misc.Unsafe; +import jdk.internal.misc.VM; import jdk.internal.HotSpotIntrinsicCandidate; import sun.reflect.CallerSensitive; import sun.reflect.ConstantPool; @@ -360,9 +361,9 @@ public final class Class implements java.io.Serializable, // Reflective call to get caller class is only needed if a security manager // is present. Avoid the overhead of making this call otherwise. caller = Reflection.getCallerClass(); - if (sun.misc.VM.isSystemDomainLoader(loader)) { + if (VM.isSystemDomainLoader(loader)) { ClassLoader ccl = ClassLoader.getClassLoader(caller); - if (!sun.misc.VM.isSystemDomainLoader(ccl)) { + if (!VM.isSystemDomainLoader(ccl)) { sm.checkPermission( SecurityConstants.GET_CLASSLOADER_PERMISSION); } diff --git a/jdk/src/java.base/share/classes/java/lang/Integer.java b/jdk/src/java.base/share/classes/java/lang/Integer.java index e34ae9d9395..11afbef0d47 100644 --- a/jdk/src/java.base/share/classes/java/lang/Integer.java +++ b/jdk/src/java.base/share/classes/java/lang/Integer.java @@ -28,6 +28,7 @@ package java.lang; import java.lang.annotation.Native; import java.util.Objects; import jdk.internal.HotSpotIntrinsicCandidate; +import jdk.internal.misc.VM; import static java.lang.String.COMPACT_STRINGS; import static java.lang.String.LATIN1; @@ -1018,7 +1019,7 @@ public final class Integer extends Number implements Comparable { * may be controlled by the {@code -XX:AutoBoxCacheMax=} option. * During VM initialization, java.lang.Integer.IntegerCache.high property * may be set and saved in the private system properties in the - * sun.misc.VM class. + * jdk.internal.misc.VM class. */ private static class IntegerCache { @@ -1030,7 +1031,7 @@ public final class Integer extends Number implements Comparable { // high value may be configured by property int h = 127; String integerCacheHighPropValue = - sun.misc.VM.getSavedProperty("java.lang.Integer.IntegerCache.high"); + VM.getSavedProperty("java.lang.Integer.IntegerCache.high"); if (integerCacheHighPropValue != null) { try { int i = parseInt(integerCacheHighPropValue); diff --git a/jdk/src/java.base/share/classes/java/lang/StackStreamFactory.java b/jdk/src/java.base/share/classes/java/lang/StackStreamFactory.java index 34c60a755d0..dcb471c4cc2 100644 --- a/jdk/src/java.base/share/classes/java/lang/StackStreamFactory.java +++ b/jdk/src/java.base/share/classes/java/lang/StackStreamFactory.java @@ -24,7 +24,7 @@ */ package java.lang; -import sun.misc.VM; +import jdk.internal.misc.VM; import java.io.PrintStream; import java.lang.StackWalker.Option; diff --git a/jdk/src/java.base/share/classes/java/lang/System.java b/jdk/src/java.base/share/classes/java/lang/System.java index ea3ad405cfc..8ea79588235 100644 --- a/jdk/src/java.base/share/classes/java/lang/System.java +++ b/jdk/src/java.base/share/classes/java/lang/System.java @@ -46,6 +46,7 @@ import sun.reflect.annotation.AnnotationType; import jdk.internal.HotSpotIntrinsicCandidate; import jdk.internal.misc.JavaLangAccess;; import jdk.internal.misc.SharedSecrets;; +import jdk.internal.misc.VM; import jdk.internal.logger.LoggerFinderLoader; import jdk.internal.logger.LazyLoggers; import jdk.internal.logger.LocalizedLoggerWrapper; @@ -1817,12 +1818,12 @@ public final class System { // removed from the system properties. // // See java.lang.Integer.IntegerCache and the - // sun.misc.VM.saveAndRemoveProperties method for example. + // VM.saveAndRemoveProperties method for example. // // Save a private copy of the system properties object that // can only be accessed by the internal implementation. Remove // certain system properties that are not intended for public access. - sun.misc.VM.saveAndRemoveProperties(props); + VM.saveAndRemoveProperties(props); lineSeparator = props.getProperty("line.separator"); @@ -1846,7 +1847,7 @@ public final class System { // set for the class libraries. Currently this is no-op everywhere except // for Windows where the process-wide error mode is set before the java.io // classes are used. - sun.misc.VM.initializeOSEnvironment(); + VM.initializeOSEnvironment(); // The main thread is not added to its thread group in the same // way as other threads; we must do it ourselves here. @@ -1857,10 +1858,10 @@ public final class System { setJavaLangAccess(); // Subsystems that are invoked during initialization can invoke - // sun.misc.VM.isBooted() in order to avoid doing things that should + // VM.isBooted() in order to avoid doing things that should // wait until the application class loader has been set up. // IMPORTANT: Ensure that this remains the last initialization action! - sun.misc.VM.booted(); + VM.booted(); } private static void setJavaLangAccess() { diff --git a/jdk/src/java.base/share/classes/java/lang/Thread.java b/jdk/src/java.base/share/classes/java/lang/Thread.java index 56935eabd34..eb47a05427d 100644 --- a/jdk/src/java.base/share/classes/java/lang/Thread.java +++ b/jdk/src/java.base/share/classes/java/lang/Thread.java @@ -1869,7 +1869,7 @@ class Thread implements Runnable { */ public State getState() { // get current thread state - return sun.misc.VM.toThreadState(threadStatus); + return jdk.internal.misc.VM.toThreadState(threadStatus); } // Added in JSR-166 diff --git a/jdk/src/java.base/share/classes/java/lang/ThreadGroup.java b/jdk/src/java.base/share/classes/java/lang/ThreadGroup.java index eda2e7d1ab8..e477800f61c 100644 --- a/jdk/src/java.base/share/classes/java/lang/ThreadGroup.java +++ b/jdk/src/java.base/share/classes/java/lang/ThreadGroup.java @@ -27,7 +27,7 @@ package java.lang; import java.io.PrintStream; import java.util.Arrays; -import sun.misc.VM; +import jdk.internal.misc.VM; /** * A thread group represents a set of threads. In addition, a thread diff --git a/jdk/src/java.base/share/classes/java/lang/Throwable.java b/jdk/src/java.base/share/classes/java/lang/Throwable.java index 68dc204693b..9d5f547c2a5 100644 --- a/jdk/src/java.base/share/classes/java/lang/Throwable.java +++ b/jdk/src/java.base/share/classes/java/lang/Throwable.java @@ -24,7 +24,7 @@ */ package java.lang; -import sun.misc.VM; +import jdk.internal.misc.VM; import java.io.*; import java.util.*; diff --git a/jdk/src/java.base/share/classes/java/lang/invoke/MethodHandles.java b/jdk/src/java.base/share/classes/java/lang/invoke/MethodHandles.java index 0c8317db5c1..1448ded8b03 100644 --- a/jdk/src/java.base/share/classes/java/lang/invoke/MethodHandles.java +++ b/jdk/src/java.base/share/classes/java/lang/invoke/MethodHandles.java @@ -1836,7 +1836,7 @@ return mh1; return false; } ClassLoader loader = defc.getClassLoader(); - if (!sun.misc.VM.isSystemDomainLoader(loader)) { + if (!jdk.internal.misc.VM.isSystemDomainLoader(loader)) { ClassLoader sysl = ClassLoader.getSystemClassLoader(); boolean found = false; while (sysl != null) { diff --git a/jdk/src/java.base/share/classes/java/lang/ref/Finalizer.java b/jdk/src/java.base/share/classes/java/lang/ref/Finalizer.java index 221d07e207b..ead17ef1c9f 100644 --- a/jdk/src/java.base/share/classes/java/lang/ref/Finalizer.java +++ b/jdk/src/java.base/share/classes/java/lang/ref/Finalizer.java @@ -29,7 +29,7 @@ import java.security.PrivilegedAction; import java.security.AccessController; import jdk.internal.misc.JavaLangAccess; import jdk.internal.misc.SharedSecrets; -import sun.misc.VM; +import jdk.internal.misc.VM; final class Finalizer extends FinalReference { /* Package-private; must be in same package as the Reference diff --git a/jdk/src/java.base/share/classes/java/lang/ref/ReferenceQueue.java b/jdk/src/java.base/share/classes/java/lang/ref/ReferenceQueue.java index dcd50ae8575..61f43791400 100644 --- a/jdk/src/java.base/share/classes/java/lang/ref/ReferenceQueue.java +++ b/jdk/src/java.base/share/classes/java/lang/ref/ReferenceQueue.java @@ -26,6 +26,7 @@ package java.lang.ref; import java.util.function.Consumer; +import jdk.internal.misc.VM; /** * Reference queues, to which registered reference objects are appended by the @@ -73,7 +74,7 @@ public class ReferenceQueue { // Volatiles ensure ordering. r.queue = ENQUEUED; if (r instanceof FinalReference) { - sun.misc.VM.addFinalRefCount(1); + VM.addFinalRefCount(1); } lock.notifyAll(); return true; @@ -93,7 +94,7 @@ public class ReferenceQueue { r.next = r; queueLength--; if (r instanceof FinalReference) { - sun.misc.VM.addFinalRefCount(-1); + VM.addFinalRefCount(-1); } return r; } diff --git a/jdk/src/java.base/share/classes/java/lang/reflect/Proxy.java b/jdk/src/java.base/share/classes/java/lang/reflect/Proxy.java index 765713a4afd..f6c6ebd4d2f 100644 --- a/jdk/src/java.base/share/classes/java/lang/reflect/Proxy.java +++ b/jdk/src/java.base/share/classes/java/lang/reflect/Proxy.java @@ -34,7 +34,7 @@ import java.util.Map; import java.util.Objects; import java.util.concurrent.atomic.AtomicLong; import java.util.function.BiFunction; -import sun.misc.VM; +import jdk.internal.misc.VM; import sun.reflect.CallerSensitive; import sun.reflect.Reflection; import sun.reflect.misc.ReflectUtil; diff --git a/jdk/src/java.base/share/classes/java/net/URL.java b/jdk/src/java.base/share/classes/java/net/URL.java index 73e488831a5..e8a694116fd 100644 --- a/jdk/src/java.base/share/classes/java/net/URL.java +++ b/jdk/src/java.base/share/classes/java/net/URL.java @@ -1242,7 +1242,7 @@ public final class URL implements java.io.Serializable { private static ThreadLocal gate = new ThreadLocal<>(); private static URLStreamHandler lookupViaProviders(final String protocol) { - if (!sun.misc.VM.isBooted()) + if (!jdk.internal.misc.VM.isBooted()) return null; if (gate.get() != null) diff --git a/jdk/src/java.base/share/classes/java/nio/Bits.java b/jdk/src/java.base/share/classes/java/nio/Bits.java index 724fb0c01f5..09623eab845 100644 --- a/jdk/src/java.base/share/classes/java/nio/Bits.java +++ b/jdk/src/java.base/share/classes/java/nio/Bits.java @@ -31,7 +31,7 @@ import jdk.internal.misc.JavaNioAccess; import jdk.internal.misc.JavaLangRefAccess; import jdk.internal.misc.SharedSecrets; import jdk.internal.misc.Unsafe; -import sun.misc.VM; +import jdk.internal.misc.VM; /** * Access to bits, native and otherwise. diff --git a/jdk/src/java.base/share/classes/java/nio/Direct-X-Buffer.java.template b/jdk/src/java.base/share/classes/java/nio/Direct-X-Buffer.java.template index c2d8d8ea12e..16e495a4fba 100644 --- a/jdk/src/java.base/share/classes/java/nio/Direct-X-Buffer.java.template +++ b/jdk/src/java.base/share/classes/java/nio/Direct-X-Buffer.java.template @@ -30,7 +30,7 @@ package java.nio; import java.io.FileDescriptor; import sun.misc.Cleaner; import jdk.internal.misc.Unsafe; -import sun.misc.VM; +import jdk.internal.misc.VM; import sun.nio.ch.DirectBuffer; diff --git a/jdk/src/java.base/share/classes/java/nio/charset/Charset.java b/jdk/src/java.base/share/classes/java/nio/charset/Charset.java index d48f5a972db..de85b2f525c 100644 --- a/jdk/src/java.base/share/classes/java/nio/charset/Charset.java +++ b/jdk/src/java.base/share/classes/java/nio/charset/Charset.java @@ -43,6 +43,7 @@ import java.util.ServiceLoader; import java.util.ServiceConfigurationError; import java.util.SortedMap; import java.util.TreeMap; +import jdk.internal.misc.VM; import sun.misc.ASCIICaseInsensitiveComparator; import sun.nio.cs.StandardCharsets; import sun.nio.cs.ThreadLocalCoders; @@ -281,7 +282,7 @@ public abstract class Charset static boolean atBugLevel(String bl) { // package-private String level = bugLevel; if (level == null) { - if (!sun.misc.VM.isBooted()) + if (!VM.isBooted()) return false; bugLevel = level = AccessController.doPrivileged( new GetPropertyAction("sun.nio.cs.bugLevel", "")); @@ -394,7 +395,7 @@ public abstract class Charset // that loader to be prematurely initialized with incomplete // information. // - if (!sun.misc.VM.isBooted()) + if (!VM.isBooted()) return null; if (gate.get() != null) @@ -445,7 +446,7 @@ public abstract class Charset } private static Charset lookupExtendedCharset(String charsetName) { - if (!sun.misc.VM.isBooted()) // see lookupViaProviders() + if (!VM.isBooted()) // see lookupViaProviders() return null; CharsetProvider[] ecps = ExtendedProviderHolder.extendedProviders; for (CharsetProvider cp : ecps) { diff --git a/jdk/src/java.base/share/classes/java/time/Clock.java b/jdk/src/java.base/share/classes/java/time/Clock.java index 0d02c524dd0..121afa3730b 100644 --- a/jdk/src/java.base/share/classes/java/time/Clock.java +++ b/jdk/src/java.base/share/classes/java/time/Clock.java @@ -69,7 +69,7 @@ import static java.time.LocalTime.NANOS_PER_MILLI; import java.io.Serializable; import java.util.Objects; import java.util.TimeZone; -import sun.misc.VM; +import jdk.internal.misc.VM; /** * A clock providing access to the current instant, date and time using a time-zone. diff --git a/jdk/src/java.base/share/classes/jdk/internal/logger/BootstrapLogger.java b/jdk/src/java.base/share/classes/jdk/internal/logger/BootstrapLogger.java index 813c4787e86..bf2bccf9e1e 100644 --- a/jdk/src/java.base/share/classes/jdk/internal/logger/BootstrapLogger.java +++ b/jdk/src/java.base/share/classes/jdk/internal/logger/BootstrapLogger.java @@ -48,7 +48,7 @@ import java.util.concurrent.ThreadFactory; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; import sun.misc.InnocuousThread; -import sun.misc.VM; +import jdk.internal.misc.VM; import sun.util.logging.PlatformLogger; import jdk.internal.logger.LazyLoggers.LazyLoggerAccessor; diff --git a/jdk/src/java.base/share/classes/jdk/internal/logger/LazyLoggers.java b/jdk/src/java.base/share/classes/jdk/internal/logger/LazyLoggers.java index c54fc1a55ff..04b64ea98b1 100644 --- a/jdk/src/java.base/share/classes/jdk/internal/logger/LazyLoggers.java +++ b/jdk/src/java.base/share/classes/jdk/internal/logger/LazyLoggers.java @@ -32,7 +32,7 @@ import java.lang.System.LoggerFinder; import java.lang.System.Logger; import java.lang.ref.WeakReference; import java.util.Objects; -import sun.misc.VM; +import jdk.internal.misc.VM; import sun.util.logging.PlatformLogger; /** diff --git a/jdk/src/java.base/share/classes/jdk/internal/misc/Unsafe.java b/jdk/src/java.base/share/classes/jdk/internal/misc/Unsafe.java index 83bb4f34ff1..9176784def0 100644 --- a/jdk/src/java.base/share/classes/jdk/internal/misc/Unsafe.java +++ b/jdk/src/java.base/share/classes/jdk/internal/misc/Unsafe.java @@ -30,7 +30,7 @@ import java.security.ProtectionDomain; import sun.reflect.CallerSensitive; import sun.reflect.Reflection; -import sun.misc.VM; +import jdk.internal.misc.VM; import jdk.internal.HotSpotIntrinsicCandidate; diff --git a/jdk/src/java.base/share/classes/sun/misc/VM.java b/jdk/src/java.base/share/classes/jdk/internal/misc/VM.java similarity index 99% rename from jdk/src/java.base/share/classes/sun/misc/VM.java rename to jdk/src/java.base/share/classes/jdk/internal/misc/VM.java index 4c83dfaf049..04af46a49f9 100644 --- a/jdk/src/java.base/share/classes/sun/misc/VM.java +++ b/jdk/src/java.base/share/classes/jdk/internal/misc/VM.java @@ -23,7 +23,7 @@ * questions. */ -package sun.misc; +package jdk.internal.misc; import static java.lang.Thread.State.*; import java.util.Properties; diff --git a/jdk/src/java.base/share/classes/sun/misc/VMNotification.java b/jdk/src/java.base/share/classes/jdk/internal/misc/VMNotification.java similarity index 98% rename from jdk/src/java.base/share/classes/sun/misc/VMNotification.java rename to jdk/src/java.base/share/classes/jdk/internal/misc/VMNotification.java index bf4abef3432..3c7ad9b4891 100644 --- a/jdk/src/java.base/share/classes/sun/misc/VMNotification.java +++ b/jdk/src/java.base/share/classes/jdk/internal/misc/VMNotification.java @@ -23,7 +23,7 @@ * questions. */ -package sun.misc; +package jdk.internal.misc; /** @deprecated */ @Deprecated diff --git a/jdk/src/java.base/share/classes/sun/launcher/LauncherHelper.java b/jdk/src/java.base/share/classes/sun/launcher/LauncherHelper.java index 5845979b1a5..3f9e3668e69 100644 --- a/jdk/src/java.base/share/classes/sun/launcher/LauncherHelper.java +++ b/jdk/src/java.base/share/classes/sun/launcher/LauncherHelper.java @@ -66,6 +66,7 @@ import java.util.TreeSet; import java.util.jar.Attributes; import java.util.jar.JarFile; import java.util.jar.Manifest; +import jdk.internal.misc.VM; public enum LauncherHelper { INSTANCE; @@ -86,9 +87,9 @@ public enum LauncherHelper { private static final String PROP_SETTINGS = "Property settings:"; private static final String LOCALE_SETTINGS = "Locale settings:"; - // sync with java.c and sun.misc.VM + // sync with java.c and jdk.internal.misc.VM private static final String diagprop = "sun.java.launcher.diag"; - static final boolean trace = sun.misc.VM.getSavedProperty(diagprop) != null; + static final boolean trace = VM.getSavedProperty(diagprop) != null; private static final String defaultBundleName = "sun.launcher.resources.launcher"; diff --git a/jdk/src/java.base/share/classes/sun/misc/Unsafe.java b/jdk/src/java.base/share/classes/sun/misc/Unsafe.java index 6a4775a4c3a..e07dc31262f 100644 --- a/jdk/src/java.base/share/classes/sun/misc/Unsafe.java +++ b/jdk/src/java.base/share/classes/sun/misc/Unsafe.java @@ -32,6 +32,7 @@ import sun.reflect.CallerSensitive; import sun.reflect.Reflection; import jdk.internal.HotSpotIntrinsicCandidate; +import jdk.internal.misc.VM; /** diff --git a/jdk/src/java.base/share/classes/sun/nio/ch/Util.java b/jdk/src/java.base/share/classes/sun/nio/ch/Util.java index bb8df722927..3b8d814bcd1 100644 --- a/jdk/src/java.base/share/classes/sun/nio/ch/Util.java +++ b/jdk/src/java.base/share/classes/sun/nio/ch/Util.java @@ -389,7 +389,7 @@ public class Util { static boolean atBugLevel(String bl) { // package-private if (bugLevel == null) { - if (!sun.misc.VM.isBooted()) + if (!jdk.internal.misc.VM.isBooted()) return false; String value = AccessController.doPrivileged( new GetPropertyAction("sun.nio.ch.bugLevel")); diff --git a/jdk/src/java.base/share/classes/sun/nio/cs/StandardCharsets.java.template b/jdk/src/java.base/share/classes/sun/nio/cs/StandardCharsets.java.template index 63a5dc62139..dd4d3994240 100644 --- a/jdk/src/java.base/share/classes/sun/nio/cs/StandardCharsets.java.template +++ b/jdk/src/java.base/share/classes/sun/nio/cs/StandardCharsets.java.template @@ -156,12 +156,12 @@ public class StandardCharsets extends CharsetProvider { private boolean initialized = false; - /* provider the sun.nio.cs.map property fir sjis/ms932 mapping hack + /* provider the sun.nio.cs.map property fir sjis/ms932 mapping hack */ private void init() { if (initialized) return; - if (!sun.misc.VM.isBooted()) + if (!jdk.internal.misc.VM.isBooted()) return; initialized = true; diff --git a/jdk/src/java.base/share/classes/sun/reflect/Reflection.java b/jdk/src/java.base/share/classes/sun/reflect/Reflection.java index c7c8ded287d..07ff36493d2 100644 --- a/jdk/src/java.base/share/classes/sun/reflect/Reflection.java +++ b/jdk/src/java.base/share/classes/sun/reflect/Reflection.java @@ -29,6 +29,7 @@ import java.lang.reflect.*; import java.util.HashMap; import java.util.Map; import jdk.internal.HotSpotIntrinsicCandidate; +import jdk.internal.misc.VM; /** Common utility routines used by both java.lang and java.lang.reflect */ @@ -335,7 +336,7 @@ public class Reflection { */ public static boolean isCallerSensitive(Method m) { final ClassLoader loader = m.getDeclaringClass().getClassLoader(); - if (sun.misc.VM.isSystemDomainLoader(loader) || isExtClassLoader(loader)) { + if (VM.isSystemDomainLoader(loader) || isExtClassLoader(loader)) { return m.isAnnotationPresent(CallerSensitive.class); } return false; diff --git a/jdk/src/java.base/share/native/libjava/VM.c b/jdk/src/java.base/share/native/libjava/VM.c index 440ed456ada..61bae65f815 100644 --- a/jdk/src/java.base/share/native/libjava/VM.c +++ b/jdk/src/java.base/share/native/libjava/VM.c @@ -28,7 +28,7 @@ #include "jvm.h" #include "jdk_util.h" -#include "sun_misc_VM.h" +#include "jdk_internal_misc_VM.h" /* Only register the performance-critical methods */ static JNINativeMethod methods[] = { @@ -36,12 +36,12 @@ static JNINativeMethod methods[] = { }; JNIEXPORT jobject JNICALL -Java_sun_misc_VM_latestUserDefinedLoader(JNIEnv *env, jclass cls) { +Java_jdk_internal_misc_VM_latestUserDefinedLoader(JNIEnv *env, jclass cls) { return JVM_LatestUserDefinedLoader(env); } JNIEXPORT void JNICALL -Java_sun_misc_VM_initialize(JNIEnv *env, jclass cls) { +Java_jdk_internal_misc_VM_initialize(JNIEnv *env, jclass cls) { if (!JDK_InitJvmHandle()) { JNU_ThrowInternalError(env, "Handle for JVM not found for symbol lookup"); return; @@ -50,8 +50,8 @@ Java_sun_misc_VM_initialize(JNIEnv *env, jclass cls) { // Registers implementations of native methods described in methods[] // above. // In particular, registers JVM_GetNanoTimeAdjustment as the implementation - // of the native sun.misc.VM.getNanoTimeAdjustment - avoiding the cost of - // introducing a Java_sun_misc_VM_getNanoTimeAdjustment wrapper + // of the native VM.getNanoTimeAdjustment - avoiding the cost of + // introducing a Java_jdk_internal_misc_VM_getNanoTimeAdjustment wrapper (*env)->RegisterNatives(env, cls, methods, sizeof(methods)/sizeof(methods[0])); } diff --git a/jdk/src/java.base/unix/classes/sun/misc/OSEnvironment.java b/jdk/src/java.base/unix/classes/jdk/internal/misc/OSEnvironment.java similarity index 92% rename from jdk/src/java.base/unix/classes/sun/misc/OSEnvironment.java rename to jdk/src/java.base/unix/classes/jdk/internal/misc/OSEnvironment.java index 5004fd17739..506273a5762 100644 --- a/jdk/src/java.base/unix/classes/sun/misc/OSEnvironment.java +++ b/jdk/src/java.base/unix/classes/jdk/internal/misc/OSEnvironment.java @@ -23,12 +23,12 @@ * questions. */ -package sun.misc; +package jdk.internal.misc; public class OSEnvironment { /* - * Initialize any miscellenous operating system settings that need to be set + * Initialize any miscellaneous operating system settings that need to be set * for the class libraries. */ public static void initialize() { diff --git a/jdk/src/java.base/unix/native/libjava/VM_md.c b/jdk/src/java.base/unix/native/libjava/VM_md.c index 48a8e4a954b..fc6edf04ce1 100644 --- a/jdk/src/java.base/unix/native/libjava/VM_md.c +++ b/jdk/src/java.base/unix/native/libjava/VM_md.c @@ -28,25 +28,25 @@ JNIEXPORT jlong JNICALL -Java_sun_misc_VM_getuid(JNIEnv *env, jclass thisclass) { +Java_jdk_internal_misc_VM_getuid(JNIEnv *env, jclass thisclass) { return getuid(); } JNIEXPORT jlong JNICALL -Java_sun_misc_VM_geteuid(JNIEnv *env, jclass thisclass) { +Java_jdk_internal_misc_VM_geteuid(JNIEnv *env, jclass thisclass) { return geteuid(); } JNIEXPORT jlong JNICALL -Java_sun_misc_VM_getgid(JNIEnv *env, jclass thisclass) { +Java_jdk_internal_misc_VM_getgid(JNIEnv *env, jclass thisclass) { return getgid(); } JNIEXPORT jlong JNICALL -Java_sun_misc_VM_getegid(JNIEnv *env, jclass thisclass) { +Java_jdk_internal_misc_VM_getegid(JNIEnv *env, jclass thisclass) { return getegid(); } diff --git a/jdk/src/java.base/windows/classes/sun/misc/OSEnvironment.java b/jdk/src/java.base/windows/classes/jdk/internal/misc/OSEnvironment.java similarity index 93% rename from jdk/src/java.base/windows/classes/sun/misc/OSEnvironment.java rename to jdk/src/java.base/windows/classes/jdk/internal/misc/OSEnvironment.java index 0e3cc4f1425..ffc8cf41804 100644 --- a/jdk/src/java.base/windows/classes/sun/misc/OSEnvironment.java +++ b/jdk/src/java.base/windows/classes/jdk/internal/misc/OSEnvironment.java @@ -23,14 +23,14 @@ * questions. */ -package sun.misc; +package jdk.internal.misc; import sun.io.Win32ErrorMode; public class OSEnvironment { /* - * Initialize any miscellenous operating system settings that need to be set + * Initialize any miscellaneous operating system settings that need to be set * for the class libraries. *

* At this time only the process-wide error mode needs to be set. diff --git a/jdk/src/java.base/windows/classes/sun/io/Win32ErrorMode.java b/jdk/src/java.base/windows/classes/sun/io/Win32ErrorMode.java index 18626a76462..324a04db8eb 100644 --- a/jdk/src/java.base/windows/classes/sun/io/Win32ErrorMode.java +++ b/jdk/src/java.base/windows/classes/sun/io/Win32ErrorMode.java @@ -66,7 +66,7 @@ public class Win32ErrorMode { * has completed. */ public static void initialize() { - if (!sun.misc.VM.isBooted()) { + if (!jdk.internal.misc.VM.isBooted()) { String s = System.getProperty("sun.io.allowCriticalErrorMessageBox"); if (s == null || s.equals(Boolean.FALSE.toString())) { long mode = setErrorMode(0); diff --git a/jdk/src/java.base/windows/native/libjava/VM_md.c b/jdk/src/java.base/windows/native/libjava/VM_md.c index 2b13ffc4f37..73011d123dd 100644 --- a/jdk/src/java.base/windows/native/libjava/VM_md.c +++ b/jdk/src/java.base/windows/native/libjava/VM_md.c @@ -27,28 +27,28 @@ JNIEXPORT jlong JNICALL -Java_sun_misc_VM_getuid(JNIEnv *env, jclass thisclass) { +Java_jdk_internal_misc_VM_getuid(JNIEnv *env, jclass thisclass) { /* -1 means function not available. */ return -1; } JNIEXPORT jlong JNICALL -Java_sun_misc_VM_geteuid(JNIEnv *env, jclass thisclass) { +Java_jdk_internal_misc_VM_geteuid(JNIEnv *env, jclass thisclass) { /* -1 means function not available. */ return -1; } JNIEXPORT jlong JNICALL -Java_sun_misc_VM_getgid(JNIEnv *env, jclass thisclass) { +Java_jdk_internal_misc_VM_getgid(JNIEnv *env, jclass thisclass) { /* -1 means function not available. */ return -1; } JNIEXPORT jlong JNICALL -Java_sun_misc_VM_getegid(JNIEnv *env, jclass thisclass) { +Java_jdk_internal_misc_VM_getegid(JNIEnv *env, jclass thisclass) { /* -1 means function not available. */ return -1; diff --git a/jdk/src/java.logging/share/classes/java/util/logging/FileHandler.java b/jdk/src/java.logging/share/classes/java/util/logging/FileHandler.java index 52a2b4e07e6..61b0c817818 100644 --- a/jdk/src/java.logging/share/classes/java/util/logging/FileHandler.java +++ b/jdk/src/java.logging/share/classes/java/util/logging/FileHandler.java @@ -639,7 +639,7 @@ public class FileHandler extends StreamHandler { continue; } else if (ch2 == 'h') { file = new File(System.getProperty("user.home")); - if (sun.misc.VM.isSetUID()) { + if (jdk.internal.misc.VM.isSetUID()) { // Ok, we are in a set UID program. For safety's sake // we disallow attempts to open files relative to %h. throw new IOException("can't use %h in set UID program"); diff --git a/jdk/src/java.management/share/classes/java/lang/management/ManagementFactory.java b/jdk/src/java.management/share/classes/java/lang/management/ManagementFactory.java index 47b244910a4..24c848800fd 100644 --- a/jdk/src/java.management/share/classes/java/lang/management/ManagementFactory.java +++ b/jdk/src/java.management/share/classes/java/lang/management/ManagementFactory.java @@ -583,7 +583,7 @@ public class ManagementFactory { ClassLoader loader = AccessController.doPrivileged( (PrivilegedAction) () -> cls.getClassLoader()); - if (!sun.misc.VM.isSystemDomainLoader(loader)) { + if (!jdk.internal.misc.VM.isSystemDomainLoader(loader)) { throw new IllegalArgumentException(mxbeanName + " is not a platform MXBean"); } diff --git a/jdk/src/java.management/share/classes/sun/management/ManagementFactoryHelper.java b/jdk/src/java.management/share/classes/sun/management/ManagementFactoryHelper.java index 22b69401199..44682b29971 100644 --- a/jdk/src/java.management/share/classes/sun/management/ManagementFactoryHelper.java +++ b/jdk/src/java.management/share/classes/sun/management/ManagementFactoryHelper.java @@ -473,7 +473,7 @@ public class ManagementFactoryHelper { public static Thread.State toThreadState(int state) { // suspended and native bits may be set in state int threadStatus = state & ~JMM_THREAD_STATE_FLAG_MASK; - return sun.misc.VM.toThreadState(threadStatus); + return jdk.internal.misc.VM.toThreadState(threadStatus); } // These values are defined in jmm.h diff --git a/jdk/src/java.management/share/classes/sun/management/MemoryImpl.java b/jdk/src/java.management/share/classes/sun/management/MemoryImpl.java index f64a0a5bcf4..00d68d4a022 100644 --- a/jdk/src/java.management/share/classes/sun/management/MemoryImpl.java +++ b/jdk/src/java.management/share/classes/sun/management/MemoryImpl.java @@ -59,7 +59,7 @@ class MemoryImpl extends NotificationEmitterSupport } public int getObjectPendingFinalizationCount() { - return sun.misc.VM.getFinalRefCount(); + return jdk.internal.misc.VM.getFinalRefCount(); } public void gc() { diff --git a/jdk/src/java.rmi/share/classes/sun/rmi/server/MarshalInputStream.java b/jdk/src/java.rmi/share/classes/sun/rmi/server/MarshalInputStream.java index 20f8874a72a..3453e61f517 100644 --- a/jdk/src/java.rmi/share/classes/sun/rmi/server/MarshalInputStream.java +++ b/jdk/src/java.rmi/share/classes/sun/rmi/server/MarshalInputStream.java @@ -262,7 +262,7 @@ public class MarshalInputStream extends ObjectInputStream { * if only code from the null class loader is on the stack. */ private static ClassLoader latestUserDefinedLoader() { - return sun.misc.VM.latestUserDefinedLoader(); + return jdk.internal.misc.VM.latestUserDefinedLoader(); } /** diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java index 7d0e700d820..f22a1883c0b 100644 --- a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java +++ b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java @@ -397,7 +397,7 @@ public class FileCredentialsCache extends CredentialsCache */ if (osname != null && !osname.startsWith("Windows")) { - long uid = sun.misc.VM.getuid(); + long uid = jdk.internal.misc.VM.getuid(); if (uid != -1) { name = File.separator + "tmp" + File.separator + stdCacheNameComponent + "_" + uid; diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/rcache/DflCache.java b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/rcache/DflCache.java index cbae7026cec..54fa34add04 100644 --- a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/rcache/DflCache.java +++ b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/internal/rcache/DflCache.java @@ -60,7 +60,7 @@ import sun.security.krb5.internal.ReplayCache; * * service_euid * - * in which euid is available as sun.misc.VM.geteuid(). + * in which euid is available as jdk.internal.misc.VM.geteuid(). * * The file has a header: * @@ -107,7 +107,7 @@ public class DflCache extends ReplayCache { private static long uid; static { // Available on Solaris, Linux and Mac. Otherwise, -1 and no _euid suffix - uid = sun.misc.VM.geteuid(); + uid = jdk.internal.misc.VM.geteuid(); } public DflCache (String source) { diff --git a/jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/ExtendedCharsets.java.template b/jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/ExtendedCharsets.java.template index f654c778b81..4bca8abb83d 100644 --- a/jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/ExtendedCharsets.java.template +++ b/jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/ExtendedCharsets.java.template @@ -97,7 +97,7 @@ public class ExtendedCharsets extends AbstractCharsetProvider { protected void init() { if (initialized) return; - if (!sun.misc.VM.isBooted()) + if (!jdk.internal.misc.VM.isBooted()) return; String map = getProperty("sun.nio.cs.map"); diff --git a/jdk/test/java/lang/management/MemoryMXBean/Pending.java b/jdk/test/java/lang/management/MemoryMXBean/Pending.java index 728ff15a5b9..156708249d5 100644 --- a/jdk/test/java/lang/management/MemoryMXBean/Pending.java +++ b/jdk/test/java/lang/management/MemoryMXBean/Pending.java @@ -24,7 +24,7 @@ /* * @test * @bug 4530538 - * @modules java.base/sun.misc + * @modules java.base/jdk.internal.misc * java.management * @summary Basic unit test of * RuntimeMXBean.getObjectPendingFinalizationCount() @@ -50,10 +50,10 @@ public class Pending { private static void printFinalizerInstanceCount() { if (!trace) return; - int count = sun.misc.VM.getFinalRefCount(); + int count = jdk.internal.misc.VM.getFinalRefCount(); System.out.println(INDENT + "Finalizable object Count = " + count); - count = sun.misc.VM.getPeakFinalRefCount(); + count = jdk.internal.misc.VM.getPeakFinalRefCount(); System.out.println(INDENT + "Peak Finalizable object Count = " + count); } diff --git a/jdk/test/sun/misc/VM/GetNanoTimeAdjustment.java b/jdk/test/jdk/internal/misc/VM/GetNanoTimeAdjustment.java similarity index 99% rename from jdk/test/sun/misc/VM/GetNanoTimeAdjustment.java rename to jdk/test/jdk/internal/misc/VM/GetNanoTimeAdjustment.java index d92cba9eaca..964352522a3 100644 --- a/jdk/test/sun/misc/VM/GetNanoTimeAdjustment.java +++ b/jdk/test/jdk/internal/misc/VM/GetNanoTimeAdjustment.java @@ -21,13 +21,13 @@ * questions. */ import java.util.Objects; -import sun.misc.VM; +import jdk.internal.misc.VM; /** * @test * @bug 8068730 * @summary tests that VM.getgetNanoTimeAdjustment() works as expected. - * @modules java.base/sun.misc + * @modules java.base/jdk.internal.misc * @run main GetNanoTimeAdjustment * @author danielfuchs */ diff --git a/jdk/test/sun/security/krb5/auto/ReplayCacheTestProc.java b/jdk/test/sun/security/krb5/auto/ReplayCacheTestProc.java index 5275b69b594..887ae768b32 100644 --- a/jdk/test/sun/security/krb5/auto/ReplayCacheTestProc.java +++ b/jdk/test/sun/security/krb5/auto/ReplayCacheTestProc.java @@ -78,7 +78,7 @@ public class ReplayCacheTestProc { mode = -1; } - uid = sun.misc.VM.geteuid(); + uid = jdk.internal.misc.VM.geteuid(); KDC kdc = KDC.create(OneKDC.REALM, HOST, 0, true); for (int i=0; i