src/hotspot/share/gc/parallel/parallelScavengeHeap.cpp

rev 49910 : imported patch removeAllGCs.fixIncludes
rev 49911 : imported patch removeAllGCs

*** 29,39 ****
  #include "gc/parallel/gcTaskManager.hpp"
  #include "gc/parallel/generationSizer.hpp"
  #include "gc/parallel/objectStartArray.inline.hpp"
  #include "gc/parallel/parallelScavengeHeap.inline.hpp"
  #include "gc/parallel/psAdaptiveSizePolicy.hpp"
! #include "gc/parallel/psMarkSweep.hpp"
  #include "gc/parallel/psMemoryPool.hpp"
  #include "gc/parallel/psParallelCompact.inline.hpp"
  #include "gc/parallel/psPromotionManager.hpp"
  #include "gc/parallel/psScavenge.hpp"
  #include "gc/parallel/vmPSOperations.hpp"
--- 29,39 ----
  #include "gc/parallel/gcTaskManager.hpp"
  #include "gc/parallel/generationSizer.hpp"
  #include "gc/parallel/objectStartArray.inline.hpp"
  #include "gc/parallel/parallelScavengeHeap.inline.hpp"
  #include "gc/parallel/psAdaptiveSizePolicy.hpp"
! #include "gc/parallel/psMarkSweepProxy.hpp"
  #include "gc/parallel/psMemoryPool.hpp"
  #include "gc/parallel/psParallelCompact.inline.hpp"
  #include "gc/parallel/psPromotionManager.hpp"
  #include "gc/parallel/psScavenge.hpp"
  #include "gc/parallel/vmPSOperations.hpp"
*** 46,55 ****
--- 46,56 ----
  #include "runtime/handles.inline.hpp"
  #include "runtime/java.hpp"
  #include "runtime/vmThread.hpp"
  #include "services/memoryManager.hpp"
  #include "services/memTracker.hpp"
+ #include "utilities/macros.hpp"
  #include "utilities/vmError.hpp"
  
  PSYoungGen*  ParallelScavengeHeap::_young_gen = NULL;
  PSOldGen*    ParallelScavengeHeap::_old_gen = NULL;
  PSAdaptiveSizePolicy* ParallelScavengeHeap::_size_policy = NULL;
*** 153,163 ****
    // Need to init the tenuring threshold
    PSScavenge::initialize();
    if (UseParallelOldGC) {
      PSParallelCompact::post_initialize();
    } else {
!     PSMarkSweep::initialize();
    }
    PSPromotionManager::initialize();
  }
  
  void ParallelScavengeHeap::update_counters() {
--- 154,164 ----
    // Need to init the tenuring threshold
    PSScavenge::initialize();
    if (UseParallelOldGC) {
      PSParallelCompact::post_initialize();
    } else {
!     PSMarkSweepProxy::initialize();
    }
    PSPromotionManager::initialize();
  }
  
  void ParallelScavengeHeap::update_counters() {
*** 404,414 ****
      // is interpreted here as maximum_compaction which will
      // cause SoftRefs to be cleared.
      bool maximum_compaction = clear_all_soft_refs;
      PSParallelCompact::invoke(maximum_compaction);
    } else {
!     PSMarkSweep::invoke(clear_all_soft_refs);
    }
  }
  
  // Failed allocation policy. Must be called from the VM thread, and
  // only at a safepoint! Note that this method has policy for allocation
--- 405,415 ----
      // is interpreted here as maximum_compaction which will
      // cause SoftRefs to be cleared.
      bool maximum_compaction = clear_all_soft_refs;
      PSParallelCompact::invoke(maximum_compaction);
    } else {
!     PSMarkSweepProxy::invoke(clear_all_soft_refs);
    }
  }
  
  // Failed allocation policy. Must be called from the VM thread, and
  // only at a safepoint! Note that this method has policy for allocation
*** 538,548 ****
  }
  
  jlong ParallelScavengeHeap::millis_since_last_gc() {
    return UseParallelOldGC ?
      PSParallelCompact::millis_since_last_gc() :
!     PSMarkSweep::millis_since_last_gc();
  }
  
  void ParallelScavengeHeap::prepare_for_verify() {
    ensure_parsability(false);  // no need to retire TLABs for verification
  }
--- 539,549 ----
  }
  
  jlong ParallelScavengeHeap::millis_since_last_gc() {
    return UseParallelOldGC ?
      PSParallelCompact::millis_since_last_gc() :
!     PSMarkSweepProxy::millis_since_last_gc();
  }
  
  void ParallelScavengeHeap::prepare_for_verify() {
    ensure_parsability(false);  // no need to retire TLABs for verification
  }
*** 595,605 ****
  
  void ParallelScavengeHeap::print_tracing_info() const {
    AdaptiveSizePolicyOutput::print();
    log_debug(gc, heap, exit)("Accumulated young generation GC time %3.7f secs", PSScavenge::accumulated_time()->seconds());
    log_debug(gc, heap, exit)("Accumulated old generation GC time %3.7f secs",
!       UseParallelOldGC ? PSParallelCompact::accumulated_time()->seconds() : PSMarkSweep::accumulated_time()->seconds());
  }
  
  
  void ParallelScavengeHeap::verify(VerifyOption option /* ignored */) {
    // Why do we need the total_collections()-filter below?
--- 596,606 ----
  
  void ParallelScavengeHeap::print_tracing_info() const {
    AdaptiveSizePolicyOutput::print();
    log_debug(gc, heap, exit)("Accumulated young generation GC time %3.7f secs", PSScavenge::accumulated_time()->seconds());
    log_debug(gc, heap, exit)("Accumulated old generation GC time %3.7f secs",
!       UseParallelOldGC ? PSParallelCompact::accumulated_time()->seconds() : PSMarkSweepProxy::accumulated_time()->seconds());
  }
  
  
  void ParallelScavengeHeap::verify(VerifyOption option /* ignored */) {
    // Why do we need the total_collections()-filter below?