src/share/vm/runtime/arguments.cpp

*** 304,313 ****
--- 304,316 ----
    { "BackEdgeThreshold",             JDK_Version::jdk(9), JDK_Version::jdk(10) },
    { "UseNewReflection",              JDK_Version::jdk(9), JDK_Version::jdk(10) },
    { "ReflectionWrapResolutionErrors",JDK_Version::jdk(9), JDK_Version::jdk(10) },
    { "VerifyReflectionBytecodes",     JDK_Version::jdk(9), JDK_Version::jdk(10) },
    { "AutoShutdownNMT",               JDK_Version::jdk(9), JDK_Version::jdk(10) },
+   { "NmethodSweepFraction",          JDK_Version::jdk(9), JDK_Version::jdk(10) },
+   { "NmethodSweepCheckInterval",     JDK_Version::jdk(9), JDK_Version::jdk(10) },
+   { "CodeCacheMinimumFreeSpace",     JDK_Version::jdk(9), JDK_Version::jdk(10) },
  #ifndef ZERO
    { "UseFastAccessorMethods",        JDK_Version::jdk(9), JDK_Version::jdk(10) },
    { "UseFastEmptyMethods",           JDK_Version::jdk(9), JDK_Version::jdk(10) },
  #endif // ZERO
    { NULL, JDK_Version(0), JDK_Version(0) }
*** 2478,2488 ****
      status = false;
    }
  
    // Check lower bounds of the code cache
    // Template Interpreter code is approximately 3X larger in debug builds.
!   uint min_code_cache_size = (CodeCacheMinimumUseSpace DEBUG_ONLY(* 3)) + CodeCacheMinimumFreeSpace;
    if (InitialCodeCacheSize < (uintx)os::vm_page_size()) {
      jio_fprintf(defaultStream::error_stream(),
                  "Invalid InitialCodeCacheSize=%dK. Must be at least %dK.\n", InitialCodeCacheSize/K,
                  os::vm_page_size()/K);
      status = false;
--- 2481,2491 ----
      status = false;
    }
  
    // Check lower bounds of the code cache
    // Template Interpreter code is approximately 3X larger in debug builds.
!   uint min_code_cache_size = CodeCacheMinimumUseSpace DEBUG_ONLY(* 3);
    if (InitialCodeCacheSize < (uintx)os::vm_page_size()) {
      jio_fprintf(defaultStream::error_stream(),
                  "Invalid InitialCodeCacheSize=%dK. Must be at least %dK.\n", InitialCodeCacheSize/K,
                  os::vm_page_size()/K);
      status = false;
*** 2514,2527 ****
                  NonNMethodCodeHeapSize/K, ProfiledCodeHeapSize/K, NonProfiledCodeHeapSize/K,
                  (NonNMethodCodeHeapSize + ProfiledCodeHeapSize + NonProfiledCodeHeapSize)/K, ReservedCodeCacheSize/K);
      status = false;
    }
  
-   status &= verify_interval(NmethodSweepFraction, 1, ReservedCodeCacheSize/K, "NmethodSweepFraction");
    status &= verify_interval(NmethodSweepActivity, 0, 2000, "NmethodSweepActivity");
    status &= verify_interval(CodeCacheMinBlockLength, 1, 100, "CodeCacheMinBlockLength");
    status &= verify_interval(CodeCacheSegmentSize, 1, 1024, "CodeCacheSegmentSize");
  
    int min_number_of_compiler_threads = get_min_number_of_compiler_threads();
    // The default CICompilerCount's value is CI_COMPILER_COUNT.
    assert(min_number_of_compiler_threads <= CI_COMPILER_COUNT, "minimum should be less or equal default number");
    // Check the minimum number of compiler threads
--- 2517,2531 ----
                  NonNMethodCodeHeapSize/K, ProfiledCodeHeapSize/K, NonProfiledCodeHeapSize/K,
                  (NonNMethodCodeHeapSize + ProfiledCodeHeapSize + NonProfiledCodeHeapSize)/K, ReservedCodeCacheSize/K);
      status = false;
    }
  
    status &= verify_interval(NmethodSweepActivity, 0, 2000, "NmethodSweepActivity");
    status &= verify_interval(CodeCacheMinBlockLength, 1, 100, "CodeCacheMinBlockLength");
    status &= verify_interval(CodeCacheSegmentSize, 1, 1024, "CodeCacheSegmentSize");
+   status &= verify_interval(StartAggressiveSweepingAt, 0, 100, "StartAggressiveSweepingAt");
+ 
  
    int min_number_of_compiler_threads = get_min_number_of_compiler_threads();
    // The default CICompilerCount's value is CI_COMPILER_COUNT.
    assert(min_number_of_compiler_threads <= CI_COMPILER_COUNT, "minimum should be less or equal default number");
    // Check the minimum number of compiler threads
*** 3913,3927 ****
      if (CompilationPolicyChoice >= 2) {
        vm_exit_during_initialization(
          "Incompatible compilation policy selected", NULL);
      }
    }
-   // Set NmethodSweepFraction after the size of the code cache is adapted (in case of tiered)
-   if (FLAG_IS_DEFAULT(NmethodSweepFraction)) {
-     FLAG_SET_DEFAULT(NmethodSweepFraction, 1 + ReservedCodeCacheSize / (16 * M));
-   }
- 
  
    // Set heap size based on available physical memory
    set_heap_size();
  
    set_gc_specific_flags();
--- 3917,3926 ----
*** 3986,4002 ****
    if (FLAG_IS_CMDLINE(CompressedClassSpaceSize) && !UseCompressedClassPointers) {
      warning("Setting CompressedClassSpaceSize has no effect when compressed class pointers are not used");
    }
  
  #ifndef PRODUCT
-   if (CompileTheWorld) {
-     // Force NmethodSweeper to sweep whole CodeCache each time.
-     if (FLAG_IS_DEFAULT(NmethodSweepFraction)) {
-       NmethodSweepFraction = 1;
-     }
-   }
- 
    if (!LogVMOutput && FLAG_IS_DEFAULT(LogVMOutput)) {
      if (use_vm_log()) {
        LogVMOutput = true;
      }
    }
--- 3985,3994 ----