src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.cpp

rev 8074 : imported patch heap_statics_remove

*** 47,57 ****
  
  PSYoungGen*  ParallelScavengeHeap::_young_gen = NULL;
  PSOldGen*    ParallelScavengeHeap::_old_gen = NULL;
  PSAdaptiveSizePolicy* ParallelScavengeHeap::_size_policy = NULL;
  PSGCAdaptivePolicyCounters* ParallelScavengeHeap::_gc_policy_counters = NULL;
- ParallelScavengeHeap* ParallelScavengeHeap::_psh = NULL;
  GCTaskManager* ParallelScavengeHeap::_gc_task_manager = NULL;
  
  jint ParallelScavengeHeap::initialize() {
    CollectedHeap::pre_initialize();
  
--- 47,56 ----
*** 87,97 ****
    // size of the generation as the boundaries currently stand.
    // _max_gen_size is still used as that value.
    double max_gc_pause_sec = ((double) MaxGCPauseMillis)/1000.0;
    double max_gc_minor_pause_sec = ((double) MaxGCMinorPauseMillis)/1000.0;
  
-   _psh = this;
    _gens = new AdjoiningGenerations(heap_rs, _collector_policy, generation_alignment());
  
    _old_gen = _gens->old_gen();
    _young_gen = _gens->young_gen();
  
--- 86,95 ----
*** 648,660 ****
    const MetaspaceSummary& metaspace_summary = create_metaspace_summary();
    gc_tracer->report_metaspace_summary(when, metaspace_summary);
  }
  
  ParallelScavengeHeap* ParallelScavengeHeap::heap() {
!   assert(_psh != NULL, "Uninitialized access to ParallelScavengeHeap::heap()");
!   assert(_psh->kind() == CollectedHeap::ParallelScavengeHeap, "not a parallel scavenge heap");
!   return _psh;
  }
  
  // Before delegating the resize to the young generation,
  // the reserved space for the young and old generations
  // may be changed to accommodate the desired resize.
--- 646,659 ----
    const MetaspaceSummary& metaspace_summary = create_metaspace_summary();
    gc_tracer->report_metaspace_summary(when, metaspace_summary);
  }
  
  ParallelScavengeHeap* ParallelScavengeHeap::heap() {
!   ParallelScavengeHeap* heap = (ParallelScavengeHeap*)Universe::heap();
!   assert(heap != NULL, "Uninitialized access to ParallelScavengeHeap::heap()");
!   assert(heap->kind() == CollectedHeap::ParallelScavengeHeap, "Not a ParallelScavengeHeap");
!   return heap;
  }
  
  // Before delegating the resize to the young generation,
  // the reserved space for the young and old generations
  // may be changed to accommodate the desired resize.