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

rev 8068 : imported patch parallelscavenge_cleanup

*** 42,53 ****
  OopStarTaskQueueSet*           PSPromotionManager::_stack_array_depth = NULL;
  PSOldGen*                      PSPromotionManager::_old_gen = NULL;
  MutableSpace*                  PSPromotionManager::_young_space = NULL;
  
  void PSPromotionManager::initialize() {
!   ParallelScavengeHeap* heap = (ParallelScavengeHeap*)Universe::heap();
!   assert(heap->kind() == CollectedHeap::ParallelScavengeHeap, "Sanity");
  
    _old_gen = heap->old_gen();
    _young_space = heap->young_gen()->to_space();
  
    // To prevent false sharing, we pad the PSPromotionManagers
--- 42,52 ----
  OopStarTaskQueueSet*           PSPromotionManager::_stack_array_depth = NULL;
  PSOldGen*                      PSPromotionManager::_old_gen = NULL;
  MutableSpace*                  PSPromotionManager::_young_space = NULL;
  
  void PSPromotionManager::initialize() {
!   ParallelScavengeHeap* heap = ParallelScavengeHeap::heap();
  
    _old_gen = heap->old_gen();
    _young_space = heap->young_gen()->to_space();
  
    // To prevent false sharing, we pad the PSPromotionManagers
*** 86,97 ****
    assert(_manager_array != NULL, "Sanity");
    return &_manager_array[ParallelGCThreads];
  }
  
  void PSPromotionManager::pre_scavenge() {
!   ParallelScavengeHeap* heap = (ParallelScavengeHeap*)Universe::heap();
!   assert(heap->kind() == CollectedHeap::ParallelScavengeHeap, "Sanity");
  
    _young_space = heap->young_gen()->to_space();
  
    for(uint i=0; i<ParallelGCThreads+1; i++) {
      manager_array(i)->reset();
--- 85,95 ----
    assert(_manager_array != NULL, "Sanity");
    return &_manager_array[ParallelGCThreads];
  }
  
  void PSPromotionManager::pre_scavenge() {
!   ParallelScavengeHeap* heap = ParallelScavengeHeap::heap();
  
    _young_space = heap->young_gen()->to_space();
  
    for(uint i=0; i<ParallelGCThreads+1; i++) {
      manager_array(i)->reset();
*** 130,140 ****
  };
  
  void
  PSPromotionManager::print_taskqueue_stats(outputStream* const out) {
    out->print_cr("== GC Tasks Stats, GC %3d",
!                 Universe::heap()->total_collections());
  
    TaskQueueStats totals;
    out->print("thr "); TaskQueueStats::print_header(1, out); out->cr();
    out->print("--- "); TaskQueueStats::print_header(2, out); out->cr();
    for (uint i = 0; i < ParallelGCThreads + 1; ++i) {
--- 128,138 ----
  };
  
  void
  PSPromotionManager::print_taskqueue_stats(outputStream* const out) {
    out->print_cr("== GC Tasks Stats, GC %3d",
!                 ParallelScavengeHeap::heap()->total_collections());
  
    TaskQueueStats totals;
    out->print("thr "); TaskQueueStats::print_header(1, out); out->cr();
    out->print("--- "); TaskQueueStats::print_header(2, out); out->cr();
    for (uint i = 0; i < ParallelGCThreads + 1; ++i) {
*** 158,169 ****
    _arrays_chunked = _array_chunks_processed = 0;
  }
  #endif // TASKQUEUE_STATS
  
  PSPromotionManager::PSPromotionManager() {
!   ParallelScavengeHeap* heap = (ParallelScavengeHeap*)Universe::heap();
!   assert(heap->kind() == CollectedHeap::ParallelScavengeHeap, "Sanity");
  
    // We set the old lab's start array.
    _old_lab.set_start_array(old_gen()->start_array());
  
    uint queue_size;
--- 156,166 ----
    _arrays_chunked = _array_chunks_processed = 0;
  }
  #endif // TASKQUEUE_STATS
  
  PSPromotionManager::PSPromotionManager() {
!   ParallelScavengeHeap* heap = ParallelScavengeHeap::heap();
  
    // We set the old lab's start array.
    _old_lab.set_start_array(old_gen()->start_array());
  
    uint queue_size;
*** 189,200 ****
  void PSPromotionManager::reset() {
    assert(stacks_empty(), "reset of non-empty stack");
  
    // We need to get an assert in here to make sure the labs are always flushed.
  
!   ParallelScavengeHeap* heap = (ParallelScavengeHeap*)Universe::heap();
!   assert(heap->kind() == CollectedHeap::ParallelScavengeHeap, "Sanity");
  
    // Do not prefill the LAB's, save heap wastage!
    HeapWord* lab_base = young_space()->top();
    _young_lab.initialize(MemRegion(lab_base, (size_t)0));
    _young_gen_is_full = false;
--- 186,196 ----
  void PSPromotionManager::reset() {
    assert(stacks_empty(), "reset of non-empty stack");
  
    // We need to get an assert in here to make sure the labs are always flushed.
  
!   ParallelScavengeHeap* heap = ParallelScavengeHeap::heap();
  
    // Do not prefill the LAB's, save heap wastage!
    HeapWord* lab_base = young_space()->top();
    _young_lab.initialize(MemRegion(lab_base, (size_t)0));
    _young_gen_is_full = false;
*** 211,222 ****
  
  void PSPromotionManager::drain_stacks_depth(bool totally_drain) {
    totally_drain = totally_drain || _totally_drain;
  
  #ifdef ASSERT
!   ParallelScavengeHeap* heap = (ParallelScavengeHeap*)Universe::heap();
!   assert(heap->kind() == CollectedHeap::ParallelScavengeHeap, "Sanity");
    MutableSpace* to_space = heap->young_gen()->to_space();
    MutableSpace* old_space = heap->old_gen()->object_space();
  #endif /* ASSERT */
  
    OopStarTaskQueue* const tq = claimed_stack_depth();
--- 207,217 ----
  
  void PSPromotionManager::drain_stacks_depth(bool totally_drain) {
    totally_drain = totally_drain || _totally_drain;
  
  #ifdef ASSERT
!   ParallelScavengeHeap* heap = ParallelScavengeHeap::heap();
    MutableSpace* to_space = heap->young_gen()->to_space();
    MutableSpace* old_space = heap->old_gen()->object_space();
  #endif /* ASSERT */
  
    OopStarTaskQueue* const tq = claimed_stack_depth();