src/share/vm/runtime/arguments.cpp

rev 7209 : [mq]: inccms

*** 1731,1741 ****
  
  #if !INCLUDE_ALL_GCS
  #ifdef ASSERT
  static bool verify_serial_gc_flags() {
    return (UseSerialGC &&
!         !(UseParNewGC || (UseConcMarkSweepGC || CMSIncrementalMode) || UseG1GC ||
            UseParallelGC || UseParallelOldGC));
  }
  #endif // ASSERT
  #endif // INCLUDE_ALL_GCS
  
--- 1731,1741 ----
  
  #if !INCLUDE_ALL_GCS
  #ifdef ASSERT
  static bool verify_serial_gc_flags() {
    return (UseSerialGC &&
!         !(UseParNewGC || (UseConcMarkSweepGC) || UseG1GC ||
            UseParallelGC || UseParallelOldGC));
  }
  #endif // ASSERT
  #endif // INCLUDE_ALL_GCS
  
*** 2145,2158 ****
      // !UseConcMarkSweepGC means that we are using serial old gc. Unfortunately we don't
      // set up UseSerialGC properly, so that can't be used in the check here.
      warning("Using the ParNew young collector with the Serial old collector is deprecated "
          "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"
--- 2145,2154 ----
*** 2270,2304 ****
    }
  
    status = status && ArgumentsExt::check_gc_consistency_user();
    status = status && check_stack_pages();
  
-   if (CMSIncrementalMode) {
-     if (!UseConcMarkSweepGC) {
-       jio_fprintf(defaultStream::error_stream(),
-                   "error:  invalid argument combination.\n"
-                   "The CMS collector (-XX:+UseConcMarkSweepGC) must be "
-                   "selected in order\nto use CMSIncrementalMode.\n");
-       status = false;
-     } else {
-       status = status && verify_percentage(CMSIncrementalDutyCycle,
-                                   "CMSIncrementalDutyCycle");
-       status = status && verify_percentage(CMSIncrementalDutyCycleMin,
-                                   "CMSIncrementalDutyCycleMin");
        status = status && verify_percentage(CMSIncrementalSafetyFactor,
                                    "CMSIncrementalSafetyFactor");
-       status = status && verify_percentage(CMSIncrementalOffset,
-                                   "CMSIncrementalOffset");
-       status = status && verify_percentage(CMSExpAvgFactor,
-                                   "CMSExpAvgFactor");
-       // If it was not set on the command line, set
-       // CMSInitiatingOccupancyFraction to 1 so icms can initiate cycles early.
-       if (CMSInitiatingOccupancyFraction < 0) {
-         FLAG_SET_DEFAULT(CMSInitiatingOccupancyFraction, 1);
-       }
-     }
-   }
  
    // 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,
--- 2266,2277 ----
*** 2827,2844 ****
        }
  #endif // !INCLUDE_JVMTI
      // -Xnoclassgc
      } else if (match_option(option, "-Xnoclassgc", &tail)) {
        FLAG_SET_CMDLINE(bool, ClassUnloading, false);
-     // -Xincgc: i-CMS
-     } else if (match_option(option, "-Xincgc", &tail)) {
-       FLAG_SET_CMDLINE(bool, UseConcMarkSweepGC, true);
-       FLAG_SET_CMDLINE(bool, CMSIncrementalMode, true);
-     // -Xnoincgc: no i-CMS
-     } else if (match_option(option, "-Xnoincgc", &tail)) {
-       FLAG_SET_CMDLINE(bool, UseConcMarkSweepGC, false);
-       FLAG_SET_CMDLINE(bool, CMSIncrementalMode, false);
      // -Xconcgc
      } else if (match_option(option, "-Xconcgc", &tail)) {
        FLAG_SET_CMDLINE(bool, UseConcMarkSweepGC, true);
      // -Xnoconcgc
      } else if (match_option(option, "-Xnoconcgc", &tail)) {
--- 2800,2809 ----
*** 3662,3672 ****
  }
  
  #if !INCLUDE_ALL_GCS
  static void force_serial_gc() {
    FLAG_SET_DEFAULT(UseSerialGC, true);
-   FLAG_SET_DEFAULT(CMSIncrementalMode, false);  // special CMS suboption
    UNSUPPORTED_GC_OPTION(UseG1GC);
    UNSUPPORTED_GC_OPTION(UseParallelGC);
    UNSUPPORTED_GC_OPTION(UseParallelOldGC);
    UNSUPPORTED_GC_OPTION(UseConcMarkSweepGC);
    UNSUPPORTED_GC_OPTION(UseParNewGC);
--- 3627,3636 ----