src/share/vm/gc/shared/collectorPolicy.cpp

rev 8978 : imported patch remove_err_msg

*** 76,90 ****
  
  void CollectorPolicy::initialize_flags() {
    assert(_space_alignment != 0, "Space alignment not set up properly");
    assert(_heap_alignment != 0, "Heap alignment not set up properly");
    assert(_heap_alignment >= _space_alignment,
!          err_msg("heap_alignment: " SIZE_FORMAT " less than space_alignment: " SIZE_FORMAT,
!                  _heap_alignment, _space_alignment));
    assert(_heap_alignment % _space_alignment == 0,
!          err_msg("heap_alignment: " SIZE_FORMAT " not aligned by space_alignment: " SIZE_FORMAT,
!                  _heap_alignment, _space_alignment));
  
    if (FLAG_IS_CMDLINE(MaxHeapSize)) {
      if (FLAG_IS_CMDLINE(InitialHeapSize) && InitialHeapSize > MaxHeapSize) {
        vm_exit_during_initialization("Initial heap size set to a larger value than the maximum heap size");
      }
--- 76,90 ----
  
  void CollectorPolicy::initialize_flags() {
    assert(_space_alignment != 0, "Space alignment not set up properly");
    assert(_heap_alignment != 0, "Heap alignment not set up properly");
    assert(_heap_alignment >= _space_alignment,
!          "heap_alignment: " SIZE_FORMAT " less than space_alignment: " SIZE_FORMAT,
!          _heap_alignment, _space_alignment);
    assert(_heap_alignment % _space_alignment == 0,
!          "heap_alignment: " SIZE_FORMAT " not aligned by space_alignment: " SIZE_FORMAT,
!          _heap_alignment, _space_alignment);
  
    if (FLAG_IS_CMDLINE(MaxHeapSize)) {
      if (FLAG_IS_CMDLINE(InitialHeapSize) && InitialHeapSize > MaxHeapSize) {
        vm_exit_during_initialization("Initial heap size set to a larger value than the maximum heap size");
      }
*** 273,290 ****
  void GenCollectorPolicy::initialize_flags() {
    CollectorPolicy::initialize_flags();
  
    assert(_gen_alignment != 0, "Generation alignment not set up properly");
    assert(_heap_alignment >= _gen_alignment,
!          err_msg("heap_alignment: " SIZE_FORMAT " less than gen_alignment: " SIZE_FORMAT,
!                  _heap_alignment, _gen_alignment));
    assert(_gen_alignment % _space_alignment == 0,
!          err_msg("gen_alignment: " SIZE_FORMAT " not aligned by space_alignment: " SIZE_FORMAT,
!                  _gen_alignment, _space_alignment));
    assert(_heap_alignment % _gen_alignment == 0,
!          err_msg("heap_alignment: " SIZE_FORMAT " not aligned by gen_alignment: " SIZE_FORMAT,
!                  _heap_alignment, _gen_alignment));
  
    // All generational heaps have a youngest gen; handle those flags here
  
    // Make sure the heap is large enough for two generations
    size_t smallest_new_size = young_gen_size_lower_bound();
--- 273,290 ----
  void GenCollectorPolicy::initialize_flags() {
    CollectorPolicy::initialize_flags();
  
    assert(_gen_alignment != 0, "Generation alignment not set up properly");
    assert(_heap_alignment >= _gen_alignment,
!          "heap_alignment: " SIZE_FORMAT " less than gen_alignment: " SIZE_FORMAT,
!          _heap_alignment, _gen_alignment);
    assert(_gen_alignment % _space_alignment == 0,
!          "gen_alignment: " SIZE_FORMAT " not aligned by space_alignment: " SIZE_FORMAT,
!          _gen_alignment, _space_alignment);
    assert(_heap_alignment % _gen_alignment == 0,
!          "heap_alignment: " SIZE_FORMAT " not aligned by gen_alignment: " SIZE_FORMAT,
!          _heap_alignment, _gen_alignment);
  
    // All generational heaps have a youngest gen; handle those flags here
  
    // Make sure the heap is large enough for two generations
    size_t smallest_new_size = young_gen_size_lower_bound();
*** 1010,1027 ****
  
    static void verify_young_min(size_t expected) {
      MarkSweepPolicy msp;
      msp.initialize_all();
  
!     assert(msp.min_young_size() <= expected, err_msg("%zu  > %zu", msp.min_young_size(), expected));
    }
  
    static void verify_young_initial(size_t expected) {
      MarkSweepPolicy msp;
      msp.initialize_all();
  
!     assert(msp.initial_young_size() == expected, err_msg("%zu != %zu", msp.initial_young_size(), expected));
    }
  
    static void verify_scaled_young_initial(size_t initial_heap_size) {
      MarkSweepPolicy msp;
      msp.initialize_all();
--- 1010,1027 ----
  
    static void verify_young_min(size_t expected) {
      MarkSweepPolicy msp;
      msp.initialize_all();
  
!     assert(msp.min_young_size() <= expected, "%zu  > %zu", msp.min_young_size(), expected);
    }
  
    static void verify_young_initial(size_t expected) {
      MarkSweepPolicy msp;
      msp.initialize_all();
  
!     assert(msp.initial_young_size() == expected, "%zu != %zu", msp.initial_young_size(), expected);
    }
  
    static void verify_scaled_young_initial(size_t initial_heap_size) {
      MarkSweepPolicy msp;
      msp.initialize_all();
*** 1031,1057 ****
        // caused by 64K page size.
        initial_heap_size = InitialHeapSize;
      }
  
      size_t expected = msp.scale_by_NewRatio_aligned(initial_heap_size);
!     assert(msp.initial_young_size() == expected, err_msg("%zu != %zu", msp.initial_young_size(), expected));
      assert(FLAG_IS_ERGO(NewSize) && NewSize == expected,
!         err_msg("NewSize should have been set ergonomically to %zu, but was %zu", expected, NewSize));
    }
  
    static void verify_old_min(size_t expected) {
      MarkSweepPolicy msp;
      msp.initialize_all();
  
!     assert(msp.min_old_size() <= expected, err_msg("%zu  > %zu", msp.min_old_size(), expected));
    }
  
    static void verify_old_initial(size_t expected) {
      MarkSweepPolicy msp;
      msp.initialize_all();
  
!     assert(msp.initial_old_size() == expected, err_msg("%zu != %zu", msp.initial_old_size(), expected));
    }
  
  
  private:
    static size_t original_InitialHeapSize;
--- 1031,1057 ----
        // caused by 64K page size.
        initial_heap_size = InitialHeapSize;
      }
  
      size_t expected = msp.scale_by_NewRatio_aligned(initial_heap_size);
!     assert(msp.initial_young_size() == expected, "%zu != %zu", msp.initial_young_size(), expected);
      assert(FLAG_IS_ERGO(NewSize) && NewSize == expected,
!         "NewSize should have been set ergonomically to %zu, but was %zu", expected, NewSize);
    }
  
    static void verify_old_min(size_t expected) {
      MarkSweepPolicy msp;
      msp.initialize_all();
  
!     assert(msp.min_old_size() <= expected, "%zu  > %zu", msp.min_old_size(), expected);
    }
  
    static void verify_old_initial(size_t expected) {
      MarkSweepPolicy msp;
      msp.initialize_all();
  
!     assert(msp.initial_old_size() == expected, "%zu != %zu", msp.initial_old_size(), expected);
    }
  
  
  private:
    static size_t original_InitialHeapSize;