src/share/vm/gc/g1/g1CollectorPolicy.cpp

*** 193,203 ****
  
    // Verify PLAB sizes
    const size_t region_size = HeapRegion::GrainWords;
    if (YoungPLABSize > region_size || OldPLABSize > region_size) {
      char buffer[128];
!     jio_snprintf(buffer, sizeof(buffer), "%sPLABSize should be at most "SIZE_FORMAT,
                   OldPLABSize > region_size ? "Old" : "Young", region_size);
      vm_exit_during_initialization(buffer);
    }
  
    _recent_prev_end_times_for_all_gcs_sec->add(os::elapsedTime());
--- 193,203 ----
  
    // Verify PLAB sizes
    const size_t region_size = HeapRegion::GrainWords;
    if (YoungPLABSize > region_size || OldPLABSize > region_size) {
      char buffer[128];
!     jio_snprintf(buffer, sizeof(buffer), "%sPLABSize should be at most " SIZE_FORMAT,
                   OldPLABSize > region_size ? "Old" : "Young", region_size);
      vm_exit_during_initialization(buffer);
    }
  
    _recent_prev_end_times_for_all_gcs_sec->add(os::elapsedTime());
*** 828,838 ****
    // to the GC we're about to start. so, no point is calculating this
    // every time we calculate / recalculate the target young length.
    update_survivors_policy();
  
    assert(_g1->used() == _g1->recalculate_used(),
!          err_msg("sanity, used: "SIZE_FORMAT" recalculate_used: "SIZE_FORMAT,
                   _g1->used(), _g1->recalculate_used()));
  
    double s_w_t_ms = (start_time_sec - _stop_world_start) * 1000.0;
    _trace_young_gen_time_data.record_start_collection(s_w_t_ms);
    _stop_world_start = 0.0;
--- 828,838 ----
    // to the GC we're about to start. so, no point is calculating this
    // every time we calculate / recalculate the target young length.
    update_survivors_policy();
  
    assert(_g1->used() == _g1->recalculate_used(),
!          err_msg("sanity, used: " SIZE_FORMAT " recalculate_used: " SIZE_FORMAT,
                   _g1->used(), _g1->recalculate_used()));
  
    double s_w_t_ms = (start_time_sec - _stop_world_start) * 1000.0;
    _trace_young_gen_time_data.record_start_collection(s_w_t_ms);
    _stop_world_start = 0.0;
*** 1223,1236 ****
    size_t heap_capacity_bytes_after_gc = _g1->capacity();
    size_t eden_capacity_bytes_after_gc =
      (_young_list_target_length * HeapRegion::GrainBytes) - survivor_used_bytes_after_gc;
  
    gclog_or_tty->print(
!     "   [Eden: "EXT_SIZE_FORMAT"("EXT_SIZE_FORMAT")->"EXT_SIZE_FORMAT"("EXT_SIZE_FORMAT") "
!     "Survivors: "EXT_SIZE_FORMAT"->"EXT_SIZE_FORMAT" "
!     "Heap: "EXT_SIZE_FORMAT"("EXT_SIZE_FORMAT")->"
!     EXT_SIZE_FORMAT"("EXT_SIZE_FORMAT")]",
      EXT_SIZE_PARAMS(_eden_used_bytes_before_gc),
      EXT_SIZE_PARAMS(_eden_capacity_bytes_before_gc),
      EXT_SIZE_PARAMS(eden_used_bytes_after_gc),
      EXT_SIZE_PARAMS(eden_capacity_bytes_after_gc),
      EXT_SIZE_PARAMS(_survivor_used_bytes_before_gc),
--- 1223,1236 ----
    size_t heap_capacity_bytes_after_gc = _g1->capacity();
    size_t eden_capacity_bytes_after_gc =
      (_young_list_target_length * HeapRegion::GrainBytes) - survivor_used_bytes_after_gc;
  
    gclog_or_tty->print(
!     "   [Eden: " EXT_SIZE_FORMAT "(" EXT_SIZE_FORMAT ")->" EXT_SIZE_FORMAT "(" EXT_SIZE_FORMAT ") "
!     "Survivors: " EXT_SIZE_FORMAT "->" EXT_SIZE_FORMAT " "
!     "Heap: " EXT_SIZE_FORMAT "(" EXT_SIZE_FORMAT ")->"
!     EXT_SIZE_FORMAT "(" EXT_SIZE_FORMAT ")]",
      EXT_SIZE_PARAMS(_eden_used_bytes_before_gc),
      EXT_SIZE_PARAMS(_eden_capacity_bytes_before_gc),
      EXT_SIZE_PARAMS(eden_used_bytes_after_gc),
      EXT_SIZE_PARAMS(eden_capacity_bytes_after_gc),
      EXT_SIZE_PARAMS(_survivor_used_bytes_before_gc),
*** 1791,1801 ****
    st->print_cr("\nCollection_set:");
    HeapRegion* csr = list_head;
    while (csr != NULL) {
      HeapRegion* next = csr->next_in_collection_set();
      assert(csr->in_collection_set(), "bad CS");
!     st->print_cr("  "HR_FORMAT", P: "PTR_FORMAT "N: "PTR_FORMAT", age: %4d",
                   HR_FORMAT_PARAMS(csr),
                   p2i(csr->prev_top_at_mark_start()), p2i(csr->next_top_at_mark_start()),
                   csr->age_in_surv_rate_group_cond());
      csr = next;
    }
--- 1791,1801 ----
    st->print_cr("\nCollection_set:");
    HeapRegion* csr = list_head;
    while (csr != NULL) {
      HeapRegion* next = csr->next_in_collection_set();
      assert(csr->in_collection_set(), "bad CS");
!     st->print_cr("  " HR_FORMAT ", P: " PTR_FORMAT "N: " PTR_FORMAT ", age: %4d",
                   HR_FORMAT_PARAMS(csr),
                   p2i(csr->prev_top_at_mark_start()), p2i(csr->next_top_at_mark_start()),
                   csr->age_in_surv_rate_group_cond());
      csr = next;
    }