src/share/vm/runtime/commandLineFlagConstraintsGC.cpp

rev 12310 : [mq]: gcinterface.patch

*** 371,381 ****
  
  Flag::Error ParGCCardsPerStrideChunkConstraintFunc(intx value, bool verbose) {
  #if INCLUDE_ALL_GCS
    if (UseConcMarkSweepGC) {
      // ParGCCardsPerStrideChunk should be compared with card table size.
!     size_t heap_size = Universe::heap()->reserved_region().word_size();
      CardTableModRefBS* bs = (CardTableModRefBS*)GenCollectedHeap::heap()->rem_set()->bs();
      size_t card_table_size = bs->cards_required(heap_size) - 1; // Valid card table size
  
      if ((size_t)value > card_table_size) {
        CommandLineError::print(verbose,
--- 371,381 ----
  
  Flag::Error ParGCCardsPerStrideChunkConstraintFunc(intx value, bool verbose) {
  #if INCLUDE_ALL_GCS
    if (UseConcMarkSweepGC) {
      // ParGCCardsPerStrideChunk should be compared with card table size.
!     size_t heap_size = GC::gc()->heap()->reserved_region().word_size();
      CardTableModRefBS* bs = (CardTableModRefBS*)GenCollectedHeap::heap()->rem_set()->bs();
      size_t card_table_size = bs->cards_required(heap_size) - 1; // Valid card table size
  
      if ((size_t)value > card_table_size) {
        CommandLineError::print(verbose,
*** 750,765 ****
    return Flag::SUCCESS;
  }
  
  Flag::Error SurvivorRatioConstraintFunc(uintx value, bool verbose) {
    if (FLAG_IS_CMDLINE(SurvivorRatio) &&
!       (value > (MaxHeapSize / Universe::heap()->collector_policy()->space_alignment()))) {
      CommandLineError::print(verbose,
                              "SurvivorRatio (" UINTX_FORMAT ") must be "
                              "less than or equal to ergonomic SurvivorRatio maximum (" SIZE_FORMAT ")\n",
                              value,
!                             (MaxHeapSize / Universe::heap()->collector_policy()->space_alignment()));
      return Flag::VIOLATES_CONSTRAINT;
    } else {
      return Flag::SUCCESS;
    }
  }
--- 750,765 ----
    return Flag::SUCCESS;
  }
  
  Flag::Error SurvivorRatioConstraintFunc(uintx value, bool verbose) {
    if (FLAG_IS_CMDLINE(SurvivorRatio) &&
!       (value > (MaxHeapSize / GC::gc()->heap()->collector_policy()->space_alignment()))) {
      CommandLineError::print(verbose,
                              "SurvivorRatio (" UINTX_FORMAT ") must be "
                              "less than or equal to ergonomic SurvivorRatio maximum (" SIZE_FORMAT ")\n",
                              value,
!                             (MaxHeapSize / GC::gc()->heap()->collector_policy()->space_alignment()));
      return Flag::VIOLATES_CONSTRAINT;
    } else {
      return Flag::SUCCESS;
    }
  }