Mercurial Mercurial > jdk-sandbox / comparison
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
src/hotspot/share/runtime/arguments.cpp
changeset 59053 ba6c248cae19
parent 59016 3b9eeae66fa0
child 59060 fce1fa1bdc91
equal deleted inserted replaced
59051:f0312c7d5b37 59053:ba6c248cae19 
   513 // - All expired options should be removed from the table.
 
   513 // - All expired options should be removed from the table.
 
   514 static SpecialFlag const special_jvm_flags[] = {
 
   514 static SpecialFlag const special_jvm_flags[] = {
 
   515   // -------------- Deprecated Flags --------------
 
   515   // -------------- Deprecated Flags --------------
 
   516   // --- Non-alias flags - sorted by obsolete_in then expired_in:
 
   516   // --- Non-alias flags - sorted by obsolete_in then expired_in:
 
   517   { "MaxGCMinorPauseMillis",        JDK_Version::jdk(8), JDK_Version::undefined(), JDK_Version::undefined() },
 
   517   { "MaxGCMinorPauseMillis",        JDK_Version::jdk(8), JDK_Version::undefined(), JDK_Version::undefined() },
 
   518   { "UseConcMarkSweepGC",           JDK_Version::jdk(9), JDK_Version::undefined(), JDK_Version::undefined() },
 
       
   519   { "MaxRAMFraction",               JDK_Version::jdk(10),  JDK_Version::undefined(), JDK_Version::undefined() },
 
   518   { "MaxRAMFraction",               JDK_Version::jdk(10),  JDK_Version::undefined(), JDK_Version::undefined() },
 
   520   { "MinRAMFraction",               JDK_Version::jdk(10),  JDK_Version::undefined(), JDK_Version::undefined() },
 
   519   { "MinRAMFraction",               JDK_Version::jdk(10),  JDK_Version::undefined(), JDK_Version::undefined() },
 
   521   { "InitialRAMFraction",           JDK_Version::jdk(10),  JDK_Version::undefined(), JDK_Version::undefined() },
 
   520   { "InitialRAMFraction",           JDK_Version::jdk(10),  JDK_Version::undefined(), JDK_Version::undefined() },
 
   522   { "UseMembar",                    JDK_Version::jdk(10), JDK_Version::jdk(12), JDK_Version::undefined() },
 
   521   { "UseMembar",                    JDK_Version::jdk(10), JDK_Version::jdk(12), JDK_Version::undefined() },
 
   523   { "AllowJNIEnvProxy",             JDK_Version::jdk(13), JDK_Version::jdk(14), JDK_Version::jdk(15) },
 
   522   { "AllowJNIEnvProxy",             JDK_Version::jdk(13), JDK_Version::jdk(14), JDK_Version::jdk(15) },
 
   542   { "SharedMiscDataSize",            JDK_Version::undefined(), JDK_Version::jdk(10), JDK_Version::undefined() },
 
   541   { "SharedMiscDataSize",            JDK_Version::undefined(), JDK_Version::jdk(10), JDK_Version::undefined() },
 
   543   { "SharedMiscCodeSize",            JDK_Version::undefined(), JDK_Version::jdk(10), JDK_Version::undefined() },
 
   542   { "SharedMiscCodeSize",            JDK_Version::undefined(), JDK_Version::jdk(10), JDK_Version::undefined() },
 
   544   { "CompilationPolicyChoice",       JDK_Version::jdk(13),     JDK_Version::jdk(14), JDK_Version::jdk(15) },
 
   543   { "CompilationPolicyChoice",       JDK_Version::jdk(13),     JDK_Version::jdk(14), JDK_Version::jdk(15) },
 
   545   { "TraceNMethodInstalls",          JDK_Version::jdk(13),     JDK_Version::jdk(14), JDK_Version::jdk(15) },
 
   544   { "TraceNMethodInstalls",          JDK_Version::jdk(13),     JDK_Version::jdk(14), JDK_Version::jdk(15) },
 
   546   { "FailOverToOldVerifier",         JDK_Version::undefined(), JDK_Version::jdk(14), JDK_Version::jdk(15) },
 
   545   { "FailOverToOldVerifier",         JDK_Version::undefined(), JDK_Version::jdk(14), JDK_Version::jdk(15) },
 
       
   546   { "UseConcMarkSweepGC",            JDK_Version::undefined(), JDK_Version::jdk(14), JDK_Version::jdk(15) },
 
       
   547   { "CMSAbortSemantics",                       JDK_Version::undefined(), JDK_Version::jdk(14), JDK_Version::jdk(15) },
 
       
   548   { "CMSAbortablePrecleanMinWorkPerIteration", JDK_Version::undefined(), JDK_Version::jdk(14), JDK_Version::jdk(15) },
 
       
   549   { "CMSBitMapYieldQuantum",                   JDK_Version::undefined(), JDK_Version::jdk(14), JDK_Version::jdk(15) },
 
       
   550   { "CMSBootstrapOccupancy",                   JDK_Version::undefined(), JDK_Version::jdk(14), JDK_Version::jdk(15) },
 
       
   551   { "CMSClassUnloadingEnabled",                JDK_Version::undefined(), JDK_Version::jdk(14), JDK_Version::jdk(15) },
 
       
   552   { "CMSClassUnloadingMaxInterval",            JDK_Version::undefined(), JDK_Version::jdk(14), JDK_Version::jdk(15) },
 
       
   553   { "CMSCleanOnEnter",                         JDK_Version::undefined(), JDK_Version::jdk(14), JDK_Version::jdk(15) },
 
       
   554   { "CMSConcMarkMultiple",                     JDK_Version::undefined(), JDK_Version::jdk(14), JDK_Version::jdk(15) },
 
       
   555   { "CMSConcurrentMTEnabled",                  JDK_Version::undefined(), JDK_Version::jdk(14), JDK_Version::jdk(15) },
 
       
   556   { "CMSCoordinatorYieldSleepCount",           JDK_Version::undefined(), JDK_Version::jdk(14), JDK_Version::jdk(15) },
 
       
   557   { "CMSEdenChunksRecordAlways",               JDK_Version::undefined(), JDK_Version::jdk(14), JDK_Version::jdk(15) },
 
       
   558   { "CMSExpAvgFactor",                         JDK_Version::undefined(), JDK_Version::jdk(14), JDK_Version::jdk(15) },
 
       
   559   { "CMSExtrapolateSweep",                     JDK_Version::undefined(), JDK_Version::jdk(14), JDK_Version::jdk(15) },
 
       
   560   { "CMSIncrementalSafetyFactor",              JDK_Version::undefined(), JDK_Version::jdk(14), JDK_Version::jdk(15) },
 
       
   561   { "CMSIndexedFreeListReplenish",             JDK_Version::undefined(), JDK_Version::jdk(14), JDK_Version::jdk(15) },
 
       
   562   { "CMSInitiatingOccupancyFraction",          JDK_Version::undefined(), JDK_Version::jdk(14), JDK_Version::jdk(15) },
 
       
   563   { "CMSIsTooFullPercentage",                  JDK_Version::undefined(), JDK_Version::jdk(14), JDK_Version::jdk(15) },
 
       
   564   { "CMSLargeCoalSurplusPercent",              JDK_Version::undefined(), JDK_Version::jdk(14), JDK_Version::jdk(15) },
 
       
   565   { "CMSLargeSplitSurplusPercent",             JDK_Version::undefined(), JDK_Version::jdk(14), JDK_Version::jdk(15) },
 
       
   566   { "CMSLoopWarn",                             JDK_Version::undefined(), JDK_Version::jdk(14), JDK_Version::jdk(15) },
 
       
   567   { "CMSMaxAbortablePrecleanLoops",            JDK_Version::undefined(), JDK_Version::jdk(14), JDK_Version::jdk(15) },
 
       
   568   { "CMSMaxAbortablePrecleanTime",             JDK_Version::undefined(), JDK_Version::jdk(14), JDK_Version::jdk(15) },
 
       
   569   { "CMSOldPLABMax",                           JDK_Version::undefined(), JDK_Version::jdk(14), JDK_Version::jdk(15) },
 
       
   570   { "CMSOldPLABMin",                           JDK_Version::undefined(), JDK_Version::jdk(14), JDK_Version::jdk(15) },
 
       
   571   { "CMSOldPLABNumRefills",                    JDK_Version::undefined(), JDK_Version::jdk(14), JDK_Version::jdk(15) },
 
       
   572   { "CMSOldPLABReactivityFactor",              JDK_Version::undefined(), JDK_Version::jdk(14), JDK_Version::jdk(15) },
 
       
   573   { "CMSOldPLABResizeQuicker",                 JDK_Version::undefined(), JDK_Version::jdk(14), JDK_Version::jdk(15) },
 
       
   574   { "CMSOldPLABToleranceFactor",               JDK_Version::undefined(), JDK_Version::jdk(14), JDK_Version::jdk(15) },
 
       
   575   { "CMSPLABRecordAlways",                     JDK_Version::undefined(), JDK_Version::jdk(14), JDK_Version::jdk(15) },
 
       
   576   { "CMSParallelInitialMarkEnabled",           JDK_Version::undefined(), JDK_Version::jdk(14), JDK_Version::jdk(15) },
 
       
   577   { "CMSParallelRemarkEnabled",                JDK_Version::undefined(), JDK_Version::jdk(14), JDK_Version::jdk(15) },
 
       
   578   { "CMSParallelSurvivorRemarkEnabled",        JDK_Version::undefined(), JDK_Version::jdk(14), JDK_Version::jdk(15) },
 
       
   579   { "CMSPrecleanDenominator",                  JDK_Version::undefined(), JDK_Version::jdk(14), JDK_Version::jdk(15) },
 
       
   580   { "CMSPrecleanIter",                         JDK_Version::undefined(), JDK_Version::jdk(14), JDK_Version::jdk(15) },
 
       
   581   { "CMSPrecleanNumerator",                    JDK_Version::undefined(), JDK_Version::jdk(14), JDK_Version::jdk(15) },
 
       
   582   { "CMSPrecleanRefLists1",                    JDK_Version::undefined(), JDK_Version::jdk(14), JDK_Version::jdk(15) },
 
       
   583   { "CMSPrecleanRefLists2",                    JDK_Version::undefined(), JDK_Version::jdk(14), JDK_Version::jdk(15) },
 
       
   584   { "CMSPrecleanSurvivors1",                   JDK_Version::undefined(), JDK_Version::jdk(14), JDK_Version::jdk(15) },
 
       
   585   { "CMSPrecleanSurvivors2",                   JDK_Version::undefined(), JDK_Version::jdk(14), JDK_Version::jdk(15) },
 
       
   586   { "CMSPrecleanThreshold",                    JDK_Version::undefined(), JDK_Version::jdk(14), JDK_Version::jdk(15) },
 
       
   587   { "CMSPrecleaningEnabled",                   JDK_Version::undefined(), JDK_Version::jdk(14), JDK_Version::jdk(15) },
 
       
   588   { "CMSPrintChunksInDump",                    JDK_Version::undefined(), JDK_Version::jdk(14), JDK_Version::jdk(15) },
 
       
   589   { "CMSPrintObjectsInDump",                   JDK_Version::undefined(), JDK_Version::jdk(14), JDK_Version::jdk(15) },
 
       
   590   { "CMSRemarkVerifyVariant",                  JDK_Version::undefined(), JDK_Version::jdk(14), JDK_Version::jdk(15) },
 
       
   591   { "CMSReplenishIntermediate",                JDK_Version::undefined(), JDK_Version::jdk(14), JDK_Version::jdk(15) },
 
       
   592   { "CMSRescanMultiple",                       JDK_Version::undefined(), JDK_Version::jdk(14), JDK_Version::jdk(15) },
 
       
   593   { "CMSSamplingGrain",                        JDK_Version::undefined(), JDK_Version::jdk(14), JDK_Version::jdk(15) },
 
       
   594   { "CMSScavengeBeforeRemark",                 JDK_Version::undefined(), JDK_Version::jdk(14), JDK_Version::jdk(15) },
 
       
   595   { "CMSScheduleRemarkEdenPenetration",        JDK_Version::undefined(), JDK_Version::jdk(14), JDK_Version::jdk(15) },
 
       
   596   { "CMSScheduleRemarkEdenSizeThreshold",      JDK_Version::undefined(), JDK_Version::jdk(14), JDK_Version::jdk(15) },
 
       
   597   { "CMSScheduleRemarkSamplingRatio",          JDK_Version::undefined(), JDK_Version::jdk(14), JDK_Version::jdk(15) },
 
       
   598   { "CMSSmallCoalSurplusPercent",              JDK_Version::undefined(), JDK_Version::jdk(14), JDK_Version::jdk(15) },
 
       
   599   { "CMSSmallSplitSurplusPercent",             JDK_Version::undefined(), JDK_Version::jdk(14), JDK_Version::jdk(15) },
 
       
   600   { "CMSSplitIndexedFreeListBlocks",           JDK_Version::undefined(), JDK_Version::jdk(14), JDK_Version::jdk(15) },
 
       
   601   { "CMSTriggerRatio",                         JDK_Version::undefined(), JDK_Version::jdk(14), JDK_Version::jdk(15) },
 
       
   602   { "CMSWorkQueueDrainThreshold",              JDK_Version::undefined(), JDK_Version::jdk(14), JDK_Version::jdk(15) },
 
       
   603   { "CMSYield",                                JDK_Version::undefined(), JDK_Version::jdk(14), JDK_Version::jdk(15) },
 
       
   604   { "CMSYieldSleepCount",                      JDK_Version::undefined(), JDK_Version::jdk(14), JDK_Version::jdk(15) },
 
       
   605   { "CMSYoungGenPerWorker",                    JDK_Version::undefined(), JDK_Version::jdk(14), JDK_Version::jdk(15) },
 
       
   606   { "CMS_FLSPadding",                          JDK_Version::undefined(), JDK_Version::jdk(14), JDK_Version::jdk(15) },
 
       
   607   { "CMS_FLSWeight",                           JDK_Version::undefined(), JDK_Version::jdk(14), JDK_Version::jdk(15) },
 
       
   608   { "CMS_SweepPadding",                        JDK_Version::undefined(), JDK_Version::jdk(14), JDK_Version::jdk(15) },
 
       
   609   { "CMS_SweepTimerThresholdMillis",           JDK_Version::undefined(), JDK_Version::jdk(14), JDK_Version::jdk(15) },
 
       
   610   { "CMS_SweepWeight",                         JDK_Version::undefined(), JDK_Version::jdk(14), JDK_Version::jdk(15) },
 
       
   611   { "FLSAlwaysCoalesceLarge",                  JDK_Version::undefined(), JDK_Version::jdk(14), JDK_Version::jdk(15) },
 
       
   612   { "FLSCoalescePolicy",                       JDK_Version::undefined(), JDK_Version::jdk(14), JDK_Version::jdk(15) },
 
       
   613   { "FLSLargestBlockCoalesceProximity",        JDK_Version::undefined(), JDK_Version::jdk(14), JDK_Version::jdk(15) },
 
       
   614   { "OldPLABWeight",                           JDK_Version::undefined(), JDK_Version::jdk(14), JDK_Version::jdk(15) },
 
       
   615   { "ParGCDesiredObjsFromOverflowList",        JDK_Version::undefined(), JDK_Version::jdk(14), JDK_Version::jdk(15) },
 
       
   616   { "ParGCTrimOverflow",                       JDK_Version::undefined(), JDK_Version::jdk(14), JDK_Version::jdk(15) },
 
       
   617   { "ParGCUseLocalOverflow",                   JDK_Version::undefined(), JDK_Version::jdk(14), JDK_Version::jdk(15) },
 
       
   618   { "ResizeOldPLAB",                           JDK_Version::undefined(), JDK_Version::jdk(14), JDK_Version::jdk(15) },
 
       
   619   { "UseCMSBestFit",                           JDK_Version::undefined(), JDK_Version::jdk(14), JDK_Version::jdk(15) },
 
       
   620   { "UseCMSInitiatingOccupancyOnly",           JDK_Version::undefined(), JDK_Version::jdk(14), JDK_Version::jdk(15) },
 
   547   { "BindGCTaskThreadsToCPUs",       JDK_Version::undefined(), JDK_Version::jdk(14), JDK_Version::jdk(16) },
 
   621   { "BindGCTaskThreadsToCPUs",       JDK_Version::undefined(), JDK_Version::jdk(14), JDK_Version::jdk(16) },
 
   548   { "UseGCTaskAffinity",             JDK_Version::undefined(), JDK_Version::jdk(14), JDK_Version::jdk(16) },
 
   622   { "UseGCTaskAffinity",             JDK_Version::undefined(), JDK_Version::jdk(14), JDK_Version::jdk(16) },
 
   549 
   623 
   550 #ifdef TEST_VERIFY_SPECIAL_JVM_FLAGS
 
   624 #ifdef TEST_VERIFY_SPECIAL_JVM_FLAGS
 
   551   // These entries will generate build errors.  Their purpose is to test the macros.
 
   625   // These entries will generate build errors.  Their purpose is to test the macros.
 
  2545       if (FLAG_SET_CMDLINE(ClassUnloading, false) != JVMFlag::SUCCESS) {
 
  2619       if (FLAG_SET_CMDLINE(ClassUnloading, false) != JVMFlag::SUCCESS) {
 
  2546         return JNI_EINVAL;
 
  2620         return JNI_EINVAL;
 
  2547       }
 
  2621       }
 
  2548     // -Xconcgc
 
  2622     // -Xconcgc
 
  2549     } else if (match_option(option, "-Xconcgc")) {
 
  2623     } else if (match_option(option, "-Xconcgc")) {
 
  2550       if (FLAG_SET_CMDLINE(UseConcMarkSweepGC, true) != JVMFlag::SUCCESS) {
 
  2624       warning("-Xconcgc uses UseConcMarkSweepGC; support was removed for both options in 14.0");
 
  2551         return JNI_EINVAL;
 
       
  2552       }
 
       
  2553       handle_extra_cms_flags("-Xconcgc uses UseConcMarkSweepGC");
 
       
  2554     // -Xnoconcgc
 
  2625     // -Xnoconcgc
 
  2555     } else if (match_option(option, "-Xnoconcgc")) {
 
  2626     } else if (match_option(option, "-Xnoconcgc")) {
 
  2556       if (FLAG_SET_CMDLINE(UseConcMarkSweepGC, false) != JVMFlag::SUCCESS) {
 
  2627       warning("-Xnoconcgc uses UseConcMarkSweepGC; support was removed for both options in 14.0");
 
  2557         return JNI_EINVAL;
 
       
  2558       }
 
       
  2559       handle_extra_cms_flags("-Xnoconcgc uses UseConcMarkSweepGC");
 
       
  2560     // -Xbatch
 
  2628     // -Xbatch
 
  2561     } else if (match_option(option, "-Xbatch")) {
 
  2629     } else if (match_option(option, "-Xbatch")) {
 
  2562       if (FLAG_SET_CMDLINE(BackgroundCompilation, false) != JVMFlag::SUCCESS) {
 
  2630       if (FLAG_SET_CMDLINE(BackgroundCompilation, false) != JVMFlag::SUCCESS) {
 
  2563         return JNI_EINVAL;
 
  2631         return JNI_EINVAL;
 
  2564       }
 
  2632       }
 
  3816     LogConfiguration::configure_stdout(LogLevel::Info, !PrintGCDetails, LOG_TAGS(gc));
 
  3884     LogConfiguration::configure_stdout(LogLevel::Info, !PrintGCDetails, LOG_TAGS(gc));
 
  3817   }
 
  3885   }
 
  3818   return true;
 
  3886   return true;
 
  3819 }
 
  3887 }
 
  3820 
  3888 
  3821 void Arguments::handle_extra_cms_flags(const char* msg) {
 
       
  3822   SpecialFlag flag;
 
       
  3823   const char *flag_name = "UseConcMarkSweepGC";
 
       
  3824   if (lookup_special_flag(flag_name, flag)) {
 
       
  3825     handle_aliases_and_deprecation(flag_name, /* print warning */ true);
 
       
  3826     warning("%s", msg);
 
       
  3827   }
 
       
  3828 }
 
       
  3829 
       
  3830 // Parse entry point called from JNI_CreateJavaVM
 
  3889 // Parse entry point called from JNI_CreateJavaVM
 
  3831 
  3890 
  3832 jint Arguments::parse(const JavaVMInitArgs* initial_cmd_args) {
 
  3891 jint Arguments::parse(const JavaVMInitArgs* initial_cmd_args) {
 
  3833   assert(verify_special_jvm_flags(), "deprecated and obsolete flag table inconsistent");
 
  3892   assert(verify_special_jvm_flags(), "deprecated and obsolete flag table inconsistent");
 
  3834 
  3893 
  4163     // UseNUMAInterleaving is set to ON for all collectors and
 
  4222     // UseNUMAInterleaving is set to ON for all collectors and
 
  4164     // platforms when UseNUMA is set to ON. NUMA-aware collectors
 
  4223     // platforms when UseNUMA is set to ON. NUMA-aware collectors
 
  4165     // such as the parallel collector for Linux and Solaris will
 
  4224     // such as the parallel collector for Linux and Solaris will
 
  4166     // interleave old gen and survivor spaces on top of NUMA
 
  4225     // interleave old gen and survivor spaces on top of NUMA
 
  4167     // allocation policy for the eden space.
 
  4226     // allocation policy for the eden space.
 
  4168     // Non NUMA-aware collectors such as CMS, G1 and Serial-GC on
 
  4227     // Non NUMA-aware collectors such as G1 and Serial-GC on
 
  4169     // all platforms and ParallelGC on Windows will interleave all
 
  4228     // all platforms and ParallelGC on Windows will interleave all
 
  4170     // of the heap spaces across NUMA nodes.
 
  4229     // of the heap spaces across NUMA nodes.
 
  4171     if (FLAG_IS_DEFAULT(UseNUMAInterleaving)) {
 
  4230     if (FLAG_IS_DEFAULT(UseNUMAInterleaving)) {
 
  4172       FLAG_SET_ERGO(UseNUMAInterleaving, true);
 
  4231       FLAG_SET_ERGO(UseNUMAInterleaving, true);
 
  4173     }
 
  4232     }
jdk-sandbox