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

rev 8362 : [mq]: hotspot

*** 26,48 ****
  #include "classfile/symbolTable.hpp"
  #include "classfile/systemDictionary.hpp"
  #include "classfile/vmSymbols.hpp"
  #include "code/codeCache.hpp"
  #include "code/icBuffer.hpp"
! #include "gc_implementation/shared/collectorCounters.hpp"
! #include "gc_implementation/shared/gcTrace.hpp"
! #include "gc_implementation/shared/gcTraceTime.hpp"
! #include "gc_implementation/shared/vmGCOperations.hpp"
! #include "gc_interface/collectedHeap.inline.hpp"
  #include "memory/filemap.hpp"
- #include "memory/gcLocker.inline.hpp"
- #include "memory/genCollectedHeap.hpp"
- #include "memory/genOopClosures.inline.hpp"
- #include "memory/generationSpec.hpp"
  #include "memory/resourceArea.hpp"
- #include "memory/strongRootsScope.hpp"
- #include "memory/space.hpp"
  #include "oops/oop.inline.hpp"
  #include "runtime/biasedLocking.hpp"
  #include "runtime/fprofiler.hpp"
  #include "runtime/handles.hpp"
  #include "runtime/handles.inline.hpp"
--- 26,49 ----
  #include "classfile/symbolTable.hpp"
  #include "classfile/systemDictionary.hpp"
  #include "classfile/vmSymbols.hpp"
  #include "code/codeCache.hpp"
  #include "code/icBuffer.hpp"
! #include "gc/shared/collectedHeap.inline.hpp"
! #include "gc/shared/collectorCounters.hpp"
! #include "gc/shared/gcLocker.inline.hpp"
! #include "gc/shared/gcTrace.hpp"
! #include "gc/shared/gcTraceTime.hpp"
! #include "gc/shared/genCollectedHeap.hpp"
! #include "gc/shared/genOopClosures.inline.hpp"
! #include "gc/shared/generationSpec.hpp"
! #include "gc/shared/space.hpp"
! #include "gc/shared/strongRootsScope.hpp"
! #include "gc/shared/vmGCOperations.hpp"
! #include "gc/shared/workgroup.hpp"
  #include "memory/filemap.hpp"
  #include "memory/resourceArea.hpp"
  #include "oops/oop.inline.hpp"
  #include "runtime/biasedLocking.hpp"
  #include "runtime/fprofiler.hpp"
  #include "runtime/handles.hpp"
  #include "runtime/handles.inline.hpp"
*** 51,64 ****
  #include "services/management.hpp"
  #include "services/memoryService.hpp"
  #include "utilities/macros.hpp"
  #include "utilities/stack.inline.hpp"
  #include "utilities/vmError.hpp"
- #include "utilities/workgroup.hpp"
  #if INCLUDE_ALL_GCS
! #include "gc_implementation/concurrentMarkSweep/concurrentMarkSweepThread.hpp"
! #include "gc_implementation/concurrentMarkSweep/vmCMSOperations.hpp"
  #endif // INCLUDE_ALL_GCS
  
  NOT_PRODUCT(size_t GenCollectedHeap::_skip_header_HeapWords = 0;)
  
  // The set of potentially parallel tasks in root scanning.
--- 52,64 ----
  #include "services/management.hpp"
  #include "services/memoryService.hpp"
  #include "utilities/macros.hpp"
  #include "utilities/stack.inline.hpp"
  #include "utilities/vmError.hpp"
  #if INCLUDE_ALL_GCS
! #include "gc/cms/concurrentMarkSweepThread.hpp"
! #include "gc/cms/vmCMSOperations.hpp"
  #endif // INCLUDE_ALL_GCS
  
  NOT_PRODUCT(size_t GenCollectedHeap::_skip_header_HeapWords = 0;)
  
  // The set of potentially parallel tasks in root scanning.