jdk-sandbox: comparison hotspot/src/share/vm/runtime/arguments.cpp

equal deleted inserted replaced

-:f81715dd3f0b
+:57159db35c41
 return true;
 }
 return false;
 }
+void Arguments::set_use_compressed_oops() {
+#ifndef ZERO
+#ifdef _LP64
+// MaxHeapSize is not set up properly at this point, but
+// the only value that can override MaxHeapSize if we are
+// to use UseCompressedOops is InitialHeapSize.
+size_t max_heap_size = MAX2(MaxHeapSize, InitialHeapSize);
+if (max_heap_size <= max_heap_for_compressed_oops()) {
+#if !defined(COMPILER1) || defined(TIERED)
+if (FLAG_IS_DEFAULT(UseCompressedOops)) {
+FLAG_SET_ERGO(bool, UseCompressedOops, true);
+}
+#endif
+#ifdef _WIN64
+if (UseLargePages && UseCompressedOops) {
+// Cannot allocate guard pages for implicit checks in indexed addressing
+// mode, when large pages are specified on windows.
+// This flag could be switched ON if narrow oop base address is set to 0,
+// see code in Universe::initialize_heap().
+Universe::set_narrow_oop_use_implicit_null_checks(false);
+}
+#endif //  _WIN64
+} else {
+if (UseCompressedOops && !FLAG_IS_DEFAULT(UseCompressedOops)) {
+warning("Max heap size too large for Compressed Oops");
+FLAG_SET_DEFAULT(UseCompressedOops, false);
+FLAG_SET_DEFAULT(UseCompressedKlassPointers, false);
+}
+}
+#endif // _LP64
+#endif // ZERO
+}
 void Arguments::set_ergonomics_flags() {
 if (os::is_server_class_machine()) {
 // If no other collector is requested explicitly,
 // let the VM select the collector based on
 }
 }
 #ifndef ZERO
 #ifdef _LP64
-// Check that UseCompressedOops can be set with the max heap size allocated
+set_use_compressed_oops();
-// by ergonomics.
-if (MaxHeapSize <= max_heap_for_compressed_oops()) {
-#if !defined(COMPILER1) || defined(TIERED)
-if (FLAG_IS_DEFAULT(UseCompressedOops)) {
-FLAG_SET_ERGO(bool, UseCompressedOops, true);
-}
-#endif
-#ifdef _WIN64
-if (UseLargePages && UseCompressedOops) {
-// Cannot allocate guard pages for implicit checks in indexed addressing
-// mode, when large pages are specified on windows.
-// This flag could be switched ON if narrow oop base address is set to 0,
-// see code in Universe::initialize_heap().
-Universe::set_narrow_oop_use_implicit_null_checks(false);
-}
-#endif //  _WIN64
-} else {
-if (UseCompressedOops && !FLAG_IS_DEFAULT(UseCompressedOops)) {
-warning("Max heap size too large for Compressed Oops");
-FLAG_SET_DEFAULT(UseCompressedOops, false);
-FLAG_SET_DEFAULT(UseCompressedKlassPointers, false);
-}
-}
 // UseCompressedOops must be on for UseCompressedKlassPointers to be on.
 if (!UseCompressedOops) {
 if (UseCompressedKlassPointers) {
 warning("UseCompressedKlassPointers requires UseCompressedOops");
 }
 "and will likely be removed in a future release");
 }
 if (CMSIncrementalMode) {
 warning("Using incremental CMS is deprecated and will likely be removed in a future release");
+}
+}
+void Arguments::check_deprecated_gc_flags() {
+if (FLAG_IS_CMDLINE(MaxGCMinorPauseMillis)) {
+warning("Using MaxGCMinorPauseMillis as minor pause goal is deprecated"
+"and will likely be removed in future release");
 }
 }
 // Check stack pages settings
 bool Arguments::check_stack_pages()
 size_t len2 = strlen(pos+1) + 1; // options start after ':'.  Final zero must be copied.
 options = (char*)memcpy(NEW_C_HEAP_ARRAY(char, len2, mtInternal), pos+1, len2);
 }
 #if !INCLUDE_JVMTI
 if ((strcmp(name, "hprof") == 0) || (strcmp(name, "jdwp") == 0)) {
-warning("profiling and debugging agents are not supported in this VM");
+jio_fprintf(defaultStream::error_stream(),
-} else
+"Profiling and debugging agents are not supported in this VM\n");
+return JNI_ERR;
+}
 #endif // !INCLUDE_JVMTI
 add_init_library(name, options);
 }
 // -agentlib and -agentpath
 } else if (match_option(option, "-agentlib:", &tail) ||
 (is_absolute_path = match_option(option, "-agentpath:", &tail))) {
 if(tail != NULL) {
 if(pos != NULL) {
 options = strcpy(NEW_C_HEAP_ARRAY(char, strlen(pos + 1) + 1, mtInternal), pos + 1);
 }
 #if !INCLUDE_JVMTI
 if ((strcmp(name, "hprof") == 0) || (strcmp(name, "jdwp") == 0)) {
-warning("profiling and debugging agents are not supported in this VM");
+jio_fprintf(defaultStream::error_stream(),
-} else
+"Profiling and debugging agents are not supported in this VM\n");
+return JNI_ERR;
+}
 #endif // !INCLUDE_JVMTI
 add_init_agent(name, options, is_absolute_path);
 }
 // -javaagent
 } else if (match_option(option, "-javaagent:", &tail)) {
 #if !INCLUDE_JVMTI
-warning("Instrumentation agents are not supported in this VM");
+jio_fprintf(defaultStream::error_stream(),
+"Instrumentation agents are not supported in this VM\n");
+return JNI_ERR;
 #else
 if(tail != NULL) {
 char *options = strcpy(NEW_C_HEAP_ARRAY(char, strlen(tail) + 1, mtInternal), tail);
 add_init_agent("instrument", options, false);
 }
 // -Xprof
 } else if (match_option(option, "-Xprof", &tail)) {
 #if INCLUDE_FPROF
 _has_profile = true;
 #else // INCLUDE_FPROF
-// do we have to exit?
+jio_fprintf(defaultStream::error_stream(),
-warning("Flat profiling is not supported in this VM.");
+"Flat profiling is not supported in this VM.\n");
+return JNI_ERR;
 #endif // INCLUDE_FPROF
 // -Xaprof
 } else if (match_option(option, "-Xaprof", &tail)) {
 _has_alloc_profile = true;
 // -Xconcurrentio
 // Out of the box management support
 if (match_option(option, "-Dcom.sun.management", &tail)) {
 #if INCLUDE_MANAGEMENT
 FLAG_SET_CMDLINE(bool, ManagementServer, true);
 #else
-vm_exit_during_initialization(
+jio_fprintf(defaultStream::output_stream(),
-"-Dcom.sun.management is not supported in this VM.", NULL);
+"-Dcom.sun.management is not supported in this VM.\n");
+return JNI_ERR;
 #endif
 }
 // -Xint
 } else if (match_option(option, "-Xint", &tail)) {
 set_mode_flags(_int);
 set_mode_flags(_mixed);
 // -Xcomp
 } else if (match_option(option, "-Xcomp", &tail)) {
 // for testing the compiler; turn off all flags that inhibit compilation
 set_mode_flags(_comp);
 // -Xshare:dump
 } else if (match_option(option, "-Xshare:dump", &tail)) {
-#if !INCLUDE_CDS
-vm_exit_during_initialization(
-"Dumping a shared archive is not supported in this VM.", NULL);
-#else
 FLAG_SET_CMDLINE(bool, DumpSharedSpaces, true);
 set_mode_flags(_int);     // Prevent compilation, which creates objects
-#endif
 // -Xshare:on
 } else if (match_option(option, "-Xshare:on", &tail)) {
 FLAG_SET_CMDLINE(bool, UseSharedSpaces, true);
 FLAG_SET_CMDLINE(bool, RequireSharedSpaces, true);
 // -Xshare:auto
 FLAG_SET_CMDLINE(bool, RequireSharedSpaces, false);
 // -Xshare:off
 } else if (match_option(option, "-Xshare:off", &tail)) {
 FLAG_SET_CMDLINE(bool, UseSharedSpaces, false);
 FLAG_SET_CMDLINE(bool, RequireSharedSpaces, false);
 // -Xverify
 } else if (match_option(option, "-Xverify", &tail)) {
 if (strcmp(tail, ":all") == 0 || strcmp(tail, "") == 0) {
 FLAG_SET_CMDLINE(bool, BytecodeVerificationLocal, true);
 FLAG_SET_CMDLINE(bool, BytecodeVerificationRemote, true);
 //       away and will cause VM initialization failures!
 warning("-XX:+UseVMInterruptibleIO is obsolete and will be removed in a future release.");
 FLAG_SET_CMDLINE(bool, UseVMInterruptibleIO, true);
 #if !INCLUDE_MANAGEMENT
 } else if (match_option(option, "-XX:+ManagementServer", &tail)) {
-vm_exit_during_initialization(
+jio_fprintf(defaultStream::error_stream(),
-"ManagementServer is not supported in this VM.", NULL);
+"ManagementServer is not supported in this VM.\n");
+return JNI_ERR;
 #endif // INCLUDE_MANAGEMENT
 } else if (match_option(option, "-XX:", &tail)) { // -XX:xxxx
 // Skip -XX:Flags= since that case has already been handled
 if (strncmp(tail, "Flags=", strlen("Flags=")) != 0) {
 if (!process_argument(tail, args->ignoreUnrecognized, origin)) {
 }
 if (match_option(option, "-XX:NativeMemoryTracking", &tail)) {
 #if INCLUDE_NMT
 MemTracker::init_tracking_options(tail);
 #else
-warning("Native Memory Tracking is not supported in this VM");
+jio_fprintf(defaultStream::error_stream(),
+"Native Memory Tracking is not supported in this VM\n");
+return JNI_ERR;
 #endif
 }
 #ifndef PRODUCT
 #if !INCLUDE_ALL_GCS
 force_serial_gc();
 #endif // INCLUDE_ALL_GCS
 #if !INCLUDE_CDS
+if (DumpSharedSpaces || RequireSharedSpaces) {
+jio_fprintf(defaultStream::error_stream(),
+"Shared spaces are not supported in this VM\n");
+return JNI_ERR;
+}
+if ((UseSharedSpaces && FLAG_IS_CMDLINE(UseSharedSpaces)) || PrintSharedSpaces) {
+warning("Shared spaces are not supported in this VM");
+FLAG_SET_DEFAULT(UseSharedSpaces, false);
+FLAG_SET_DEFAULT(PrintSharedSpaces, false);
+}
 no_shared_spaces();
 #endif // INCLUDE_CDS
 // Set flags based on ergonomics.
 set_ergonomics_flags();
 set_parnew_gc_flags();
 } else if (UseG1GC) {
 set_g1_gc_flags();
 }
 check_deprecated_gcs();
+check_deprecated_gc_flags();
 #else // INCLUDE_ALL_GCS
 assert(verify_serial_gc_flags(), "SerialGC unset");
 #endif // INCLUDE_ALL_GCS
 // Set bytecode rewriting flags

changeset 15962	57159db35c41
parent 15922	86a368d3ac8c
parent 15960	674d0586183f
child 16445	cb44d5b3ad89
child 16450	11d5e5944030