src/share/vm/gc/cms/concurrentMarkSweepGeneration.cpp

rev 8362 : [mq]: hotspot

@@ -25,38 +25,39 @@
 #include "precompiled.hpp"
 #include "classfile/classLoaderData.hpp"
 #include "classfile/stringTable.hpp"
 #include "classfile/systemDictionary.hpp"
 #include "code/codeCache.hpp"
-#include "gc_implementation/shared/adaptiveSizePolicy.hpp"
-#include "gc_implementation/concurrentMarkSweep/cmsCollectorPolicy.hpp"
-#include "gc_implementation/concurrentMarkSweep/cmsOopClosures.inline.hpp"
-#include "gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.hpp"
-#include "gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.inline.hpp"
-#include "gc_implementation/concurrentMarkSweep/concurrentMarkSweepThread.hpp"
-#include "gc_implementation/concurrentMarkSweep/vmCMSOperations.hpp"
-#include "gc_implementation/parNew/parNewGeneration.hpp"
-#include "gc_implementation/shared/collectorCounters.hpp"
-#include "gc_implementation/shared/gcTimer.hpp"
-#include "gc_implementation/shared/gcTrace.hpp"
-#include "gc_implementation/shared/gcTraceTime.hpp"
-#include "gc_implementation/shared/isGCActiveMark.hpp"
-#include "gc_interface/collectedHeap.inline.hpp"
+#include "gc/cms/cmsCollectorPolicy.hpp"
+#include "gc/cms/cmsOopClosures.inline.hpp"
+#include "gc/cms/compactibleFreeListSpace.hpp"
+#include "gc/cms/concurrentMarkSweepGeneration.inline.hpp"
+#include "gc/cms/concurrentMarkSweepThread.hpp"
+#include "gc/cms/parNewGeneration.hpp"
+#include "gc/cms/vmCMSOperations.hpp"
+#include "gc/serial/genMarkSweep.hpp"
+#include "gc/serial/tenuredGeneration.hpp"
+#include "gc/shared/adaptiveSizePolicy.hpp"
+#include "gc/shared/cardGeneration.inline.hpp"
+#include "gc/shared/cardTableRS.hpp"
+#include "gc/shared/collectedHeap.inline.hpp"
+#include "gc/shared/collectorCounters.hpp"
+#include "gc/shared/collectorPolicy.hpp"
+#include "gc/shared/gcLocker.inline.hpp"
+#include "gc/shared/gcTimer.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/isGCActiveMark.hpp"
+#include "gc/shared/referencePolicy.hpp"
+#include "gc/shared/strongRootsScope.hpp"
+#include "gc/shared/taskqueue.inline.hpp"
 #include "memory/allocation.hpp"
-#include "memory/cardGeneration.inline.hpp"
-#include "memory/cardTableRS.hpp"
-#include "memory/collectorPolicy.hpp"
-#include "memory/gcLocker.inline.hpp"
-#include "memory/genCollectedHeap.hpp"
-#include "memory/genMarkSweep.hpp"
-#include "memory/genOopClosures.inline.hpp"
 #include "memory/iterator.inline.hpp"
 #include "memory/padded.hpp"
-#include "memory/referencePolicy.hpp"
 #include "memory/resourceArea.hpp"
-#include "memory/strongRootsScope.hpp"
-#include "memory/tenuredGeneration.hpp"
 #include "oops/oop.inline.hpp"
 #include "prims/jvmtiExport.hpp"
 #include "runtime/atomic.inline.hpp"
 #include "runtime/globals_extension.hpp"
 #include "runtime/handles.inline.hpp"

@@ -64,11 +65,10 @@
 #include "runtime/orderAccess.inline.hpp"
 #include "runtime/vmThread.hpp"
 #include "services/memoryService.hpp"
 #include "services/runtimeService.hpp"
 #include "utilities/stack.inline.hpp"
-#include "utilities/taskqueue.inline.hpp"
 
 // statics
 CMSCollector* ConcurrentMarkSweepGeneration::_collector = NULL;
 bool CMSCollector::_full_gc_requested = false;
 GCCause::Cause CMSCollector::_full_gc_cause = GCCause::_no_gc;