--- a/src/hotspot/share/runtime/arguments.cpp Fri Apr 13 10:31:49 2018 +0200
+++ b/src/hotspot/share/runtime/arguments.cpp Wed Apr 18 09:46:53 2018 +0200
@@ -29,11 +29,9 @@
#include "classfile/moduleEntry.hpp"
#include "classfile/stringTable.hpp"
#include "classfile/symbolTable.hpp"
+#include "gc/shared/collectorPolicy.hpp"
#include "gc/shared/gcArguments.hpp"
#include "gc/shared/gcConfig.hpp"
-#include "gc/shared/genCollectedHeap.hpp"
-#include "gc/shared/referenceProcessor.hpp"
-#include "gc/shared/taskqueue.hpp"
#include "logging/log.hpp"
#include "logging/logConfiguration.hpp"
#include "logging/logStream.hpp"
@@ -98,6 +96,8 @@
intx Arguments::_Tier3InvokeNotifyFreqLog = Tier3InvokeNotifyFreqLog;
intx Arguments::_Tier4InvocationThreshold = Tier4InvocationThreshold;
+bool Arguments::_enable_preview = false;
+
char* Arguments::SharedArchivePath = NULL;
AgentLibraryList Arguments::_libraryList;
@@ -1447,35 +1447,23 @@
}
#if INCLUDE_CDS
+const char* unsupported_properties[] = { "jdk.module.limitmods",
+ "jdk.module.upgrade.path",
+ "jdk.module.patch.0" };
+const char* unsupported_options[] = { "--limit-modules",
+ "--upgrade-module-path",
+ "--patch-module"
+ };
void Arguments::check_unsupported_dumping_properties() {
assert(DumpSharedSpaces, "this function is only used with -Xshare:dump");
- const char* unsupported_properties[] = { "jdk.module.main",
- "jdk.module.limitmods",
- "jdk.module.path",
- "jdk.module.upgrade.path",
- "jdk.module.patch.0" };
- const char* unsupported_options[] = { "-m", // cannot use at dump time
- "--limit-modules", // ignored at dump time
- "--module-path", // ignored at dump time
- "--upgrade-module-path", // ignored at dump time
- "--patch-module" // ignored at dump time
- };
assert(ARRAY_SIZE(unsupported_properties) == ARRAY_SIZE(unsupported_options), "must be");
- // If a vm option is found in the unsupported_options array with index less than the info_idx,
- // vm will exit with an error message. Otherwise, it will print an informational message if
- // -Xlog:cds is enabled.
- uint info_idx = 1;
+ // If a vm option is found in the unsupported_options array, vm will exit with an error message.
SystemProperty* sp = system_properties();
while (sp != NULL) {
for (uint i = 0; i < ARRAY_SIZE(unsupported_properties); i++) {
if (strcmp(sp->key(), unsupported_properties[i]) == 0) {
- if (i < info_idx) {
- vm_exit_during_initialization(
- "Cannot use the following option when dumping the shared archive", unsupported_options[i]);
- } else {
- log_info(cds)("Info: the %s option is ignored when dumping the shared archive",
- unsupported_options[i]);
- }
+ vm_exit_during_initialization(
+ "Cannot use the following option when dumping the shared archive", unsupported_options[i]);
}
}
sp = sp->next();
@@ -1486,6 +1474,20 @@
vm_exit_during_initialization("Dumping the shared archive is not supported with an exploded module build");
}
}
+
+bool Arguments::check_unsupported_cds_runtime_properties() {
+ assert(UseSharedSpaces, "this function is only used with -Xshare:{on,auto}");
+ assert(ARRAY_SIZE(unsupported_properties) == ARRAY_SIZE(unsupported_options), "must be");
+ for (uint i = 0; i < ARRAY_SIZE(unsupported_properties); i++) {
+ if (get_property(unsupported_properties[i]) != NULL) {
+ if (RequireSharedSpaces) {
+ warning("CDS is disabled when the %s option is specified.", unsupported_options[i]);
+ }
+ return true;
+ }
+ }
+ return false;
+}
#endif
//===========================================================================================================
@@ -2191,41 +2193,6 @@
status = false;
}
- if (FullGCALot && FLAG_IS_DEFAULT(MarkSweepAlwaysCompactCount)) {
- MarkSweepAlwaysCompactCount = 1; // Move objects every gc.
- }
-
- if (!(UseParallelGC || UseParallelOldGC) && FLAG_IS_DEFAULT(ScavengeBeforeFullGC)) {
- FLAG_SET_DEFAULT(ScavengeBeforeFullGC, false);
- }
-
- if (GCTimeLimit == 100) {
- // Turn off gc-overhead-limit-exceeded checks
- FLAG_SET_DEFAULT(UseGCOverheadLimit, false);
- }
-
- // CMS space iteration, which FLSVerifyAllHeapreferences entails,
- // insists that we hold the requisite locks so that the iteration is
- // MT-safe. For the verification at start-up and shut-down, we don't
- // yet have a good way of acquiring and releasing these locks,
- // which are not visible at the CollectedHeap level. We want to
- // be able to acquire these locks and then do the iteration rather
- // than just disable the lock verification. This will be fixed under
- // bug 4788986.
- if (UseConcMarkSweepGC && FLSVerifyAllHeapReferences) {
- if (VerifyDuringStartup) {
- warning("Heap verification at start-up disabled "
- "(due to current incompatibility with FLSVerifyAllHeapReferences)");
- VerifyDuringStartup = false; // Disable verification at start-up
- }
-
- if (VerifyBeforeExit) {
- warning("Heap verification at shutdown disabled "
- "(due to current incompatibility with FLSVerifyAllHeapReferences)");
- VerifyBeforeExit = false; // Disable verification at shutdown
- }
- }
-
if (PrintNMTStatistics) {
#if INCLUDE_NMT
if (MemTracker::tracking_level() == NMT_off) {
@@ -2777,6 +2744,9 @@
}
}
#endif // !INCLUDE_JVMTI
+ // --enable_preview
+ } else if (match_option(option, "--enable-preview")) {
+ set_enable_preview();
// -Xnoclassgc
} else if (match_option(option, "-Xnoclassgc")) {
if (FLAG_SET_CMDLINE(bool, ClassUnloading, false) != Flag::SUCCESS) {
@@ -3411,6 +3381,9 @@
if (UseSharedSpaces && patch_mod_javabase) {
no_shared_spaces("CDS is disabled when " JAVA_BASE_NAME " module is patched.");
}
+ if (UseSharedSpaces && !DumpSharedSpaces && check_unsupported_cds_runtime_properties()) {
+ FLAG_SET_DEFAULT(UseSharedSpaces, false);
+ }
#endif
#ifndef CAN_SHOW_REGISTERS_ON_ASSERT