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

rev 8789 : imported patch 8073052-Rename-and-clean-up-the-allocation-manager-hierarchy-in-g1Allocator
rev 8792 : [mq]: 8003237-no-wait-for-free-list
rev 8793 : 8133043: Clean up code related to termination stats printing
Summary: Reformat termination stats related code to make it look more similar to existing code.
Reviewed-by:
rev 8796 : imported patch 8133047-rename-g1parscanthreadstate-queue-num-to-worker-id

*** 29,45 ****
  #include "gc/g1/g1StringDedup.hpp"
  #include "gc/shared/taskqueue.inline.hpp"
  #include "oops/oop.inline.hpp"
  #include "runtime/prefetch.inline.hpp"
  
! G1ParScanThreadState::G1ParScanThreadState(G1CollectedHeap* g1h, uint queue_num, ReferenceProcessor* rp)
    : _g1h(g1h),
!     _refs(g1h->task_queue(queue_num)),
      _dcq(&g1h->dirty_card_queue_set()),
      _ct_bs(g1h->g1_barrier_set()),
      _g1_rem(g1h->g1_rem_set()),
!     _hash_seed(17), _queue_num(queue_num),
      _term_attempts(0),
      _tenuring_threshold(g1h->g1_policy()->tenuring_threshold()),
      _age_table(false), _scanner(g1h, rp),
      _strong_roots_time(0), _term_time(0),
      _no_more_space_in_old(false)
--- 29,45 ----
  #include "gc/g1/g1StringDedup.hpp"
  #include "gc/shared/taskqueue.inline.hpp"
  #include "oops/oop.inline.hpp"
  #include "runtime/prefetch.inline.hpp"
  
! G1ParScanThreadState::G1ParScanThreadState(G1CollectedHeap* g1h, uint worker_id, ReferenceProcessor* rp)
    : _g1h(g1h),
!     _refs(g1h->task_queue(worker_id)),
      _dcq(&g1h->dirty_card_queue_set()),
      _ct_bs(g1h->g1_barrier_set()),
      _g1_rem(g1h->g1_rem_set()),
!     _hash_seed(17), _worker_id(worker_id),
      _term_attempts(0),
      _tenuring_threshold(g1h->g1_policy()->tenuring_threshold()),
      _age_table(false), _scanner(g1h, rp),
      _strong_roots_time(0), _term_time(0),
      _no_more_space_in_old(false)
*** 93,103 ****
    size_t undo_waste = 0;
    _plab_allocator->waste(alloc_buffer_waste, undo_waste);
    st->print_cr("%3u %9.2f %9.2f %6.2f "
                 "%9.2f %6.2f " SIZE_FORMAT_W(8) " "
                 SIZE_FORMAT_W(7) " " SIZE_FORMAT_W(7) " " SIZE_FORMAT_W(7),
!                _queue_num, elapsed_ms, s_roots_ms, s_roots_ms * 100 / elapsed_ms,
                 term_ms, term_ms * 100 / elapsed_ms, term_attempts(),
                 (alloc_buffer_waste + undo_waste) * HeapWordSize / K,
                 alloc_buffer_waste * HeapWordSize / K,
                 undo_waste * HeapWordSize / K);
  }
--- 93,103 ----
    size_t undo_waste = 0;
    _plab_allocator->waste(alloc_buffer_waste, undo_waste);
    st->print_cr("%3u %9.2f %9.2f %6.2f "
                 "%9.2f %6.2f " SIZE_FORMAT_W(8) " "
                 SIZE_FORMAT_W(7) " " SIZE_FORMAT_W(7) " " SIZE_FORMAT_W(7),
!                _worker_id, elapsed_ms, s_roots_ms, s_roots_ms * 100 / elapsed_ms,
                 term_ms, term_ms * 100 / elapsed_ms, term_attempts(),
                 (alloc_buffer_waste + undo_waste) * HeapWordSize / K,
                 alloc_buffer_waste * HeapWordSize / K,
                 undo_waste * HeapWordSize / K);
  }
*** 285,295 ****
               "sanity");
        assert(is_to_young == _g1h->heap_region_containing_raw(obj)->is_young(),
               "sanity");
        G1StringDedup::enqueue_from_evacuation(is_from_young,
                                               is_to_young,
!                                              queue_num(),
                                               obj);
      }
  
      size_t* const surv_young_words = surviving_young_words();
      surv_young_words[young_index] += word_sz;
--- 285,295 ----
               "sanity");
        assert(is_to_young == _g1h->heap_region_containing_raw(obj)->is_young(),
               "sanity");
        G1StringDedup::enqueue_from_evacuation(is_from_young,
                                               is_to_young,
!                                              _worker_id,
                                               obj);
      }
  
      size_t* const surv_young_words = surviving_young_words();
      surv_young_words[young_index] += word_sz;
*** 325,335 ****
      if (!r->evacuation_failed()) {
        r->set_evacuation_failed(true);
       _g1h->hr_printer()->evac_failure(r);
      }
  
!     _g1h->preserve_mark_during_evac_failure(_queue_num, old, m);
  
      _scanner.set_region(r);
      old->oop_iterate_backwards(&_scanner);
  
      return old;
--- 325,335 ----
      if (!r->evacuation_failed()) {
        r->set_evacuation_failed(true);
       _g1h->hr_printer()->evac_failure(r);
      }
  
!     _g1h->preserve_mark_during_evac_failure(_worker_id, old, m);
  
      _scanner.set_region(r);
      old->oop_iterate_backwards(&_scanner);
  
      return old;