src/hotspot/share/gc/shared/genCollectedHeap.cpp

*** 34,43 ****
--- 34,44 ----
  #include "gc/shared/cardTableRS.hpp"
  #include "gc/shared/collectedHeap.inline.hpp"
  #include "gc/shared/collectorCounters.hpp"
  #include "gc/shared/gcId.hpp"
  #include "gc/shared/gcLocker.inline.hpp"
+ #include "gc/shared/gcPolicyCounters.hpp"
  #include "gc/shared/gcTrace.hpp"
  #include "gc/shared/gcTraceTime.inline.hpp"
  #include "gc/shared/genCollectedHeap.hpp"
  #include "gc/shared/genOopClosures.inline.hpp"
  #include "gc/shared/generationSpec.hpp"
*** 62,72 ****
  #include "utilities/stack.inline.hpp"
  #include "utilities/vmError.hpp"
  
  GenCollectedHeap::GenCollectedHeap(GenCollectorPolicy *policy,
                                     Generation::Name young,
!                                    Generation::Name old) :
    CollectedHeap(),
    _rem_set(NULL),
    _young_gen_spec(new GenerationSpec(young,
                                       policy->initial_young_size(),
                                       policy->max_young_size(),
--- 63,74 ----
  #include "utilities/stack.inline.hpp"
  #include "utilities/vmError.hpp"
  
  GenCollectedHeap::GenCollectedHeap(GenCollectorPolicy *policy,
                                     Generation::Name young,
!                                    Generation::Name old,
!                                    const char* policy_counters_name) :
    CollectedHeap(),
    _rem_set(NULL),
    _young_gen_spec(new GenerationSpec(young,
                                       policy->initial_young_size(),
                                       policy->max_young_size(),
*** 75,84 ****
--- 77,87 ----
                                     policy->initial_old_size(),
                                     policy->max_old_size(),
                                     policy->gen_alignment())),
    _gen_policy(policy),
    _soft_ref_gen_policy(),
+   _gc_policy_counters(new GCPolicyCounters(policy_counters_name, 2, 2)),
    _process_strong_tasks(new SubTasksDone(GCH_PS_NumElements)),
    _full_collections_completed(0) {
  }
  
  jint GenCollectedHeap::initialize() {
*** 173,184 ****
    DefNewGeneration* def_new_gen = (DefNewGeneration*)_young_gen;
  
    initialize_size_policy(def_new_gen->eden()->capacity(),
                           _old_gen->capacity(),
                           def_new_gen->from()->capacity());
- 
-   _gen_policy->initialize_gc_policy_counters();
  }
  
  void GenCollectedHeap::ref_processing_init() {
    _young_gen->ref_processor_init();
    _old_gen->ref_processor_init();
--- 176,185 ----