From 4dc240f785c464c2f28a40b7c183372c2e30f509 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Per=20Lid=C3=A9n?=
Date: Wed, 13 May 2015 15:16:06 +0200
Subject: [PATCH 01/78] 8079792: GC directory structure cleanup
Reviewed-by: brutisso, stefank, david
---
hotspot/agent/make/Makefile | 17 ++-
.../share/classes/sun/jvm/hotspot/HSDB.java | 6 +-
.../g1/G1Allocator.java | 2 +-
.../g1/G1CollectedHeap.java | 8 +-
.../g1/G1HeapRegionTable.java | 4 +-
.../g1/G1MonitoringSupport.java | 4 +-
.../g1/HeapRegion.java | 4 +-
.../g1/HeapRegionManager.java | 4 +-
.../g1/HeapRegionSetBase.java | 4 +-
.../g1/HeapRegionSetCount.java | 4 +-
.../parallel}/PSOldGen.java | 6 +-
.../parallel}/PSYoungGen.java | 6 +-
.../parallel}/ParallelScavengeHeap.java | 6 +-
.../shared}/CollectedHeap.java | 2 +-
.../shared}/CollectedHeapName.java | 2 +-
.../{gc_interface => gc/shared}/G1YCType.java | 4 +-
.../{gc_interface => gc/shared}/GCCause.java | 4 +-
.../{gc_interface => gc/shared}/GCName.java | 4 +-
.../{gc_interface => gc/shared}/GCWhen.java | 4 +-
.../shared/ImmutableSpace.java | 4 +-
.../shared/MutableSpace.java | 4 +-
.../jvm/hotspot/memory/GenCollectedHeap.java | 2 +-
.../ReferenceType.java | 4 +-
.../sun/jvm/hotspot/memory/Universe.java | 6 +-
.../sun/jvm/hotspot/oops/ObjectHeap.java | 8 +-
.../sun/jvm/hotspot/tools/HeapSummary.java | 10 +-
.../hotspot/utilities/LivenessAnalysis.java | 4 +-
.../sun/jvm/hotspot/utilities/MarkBits.java | 4 +-
.../jvm/hotspot/utilities/PointerFinder.java | 4 +-
.../hotspot/utilities/PointerLocation.java | 4 +-
.../utilities/ReversePtrsAnalysis.java | 4 +-
hotspot/make/aix/makefiles/vm.make | 4 +-
hotspot/make/bsd/makefiles/vm.make | 4 +-
hotspot/make/excludeSrc.make | 39 ++----
hotspot/make/linux/makefiles/vm.make | 2 +-
hotspot/make/pic.make | 4 +-
hotspot/make/sa.files | 9 +-
hotspot/make/solaris/makefiles/vm.make | 4 +-
hotspot/make/windows/create_obj_files.sh | 14 +-
hotspot/make/windows/makefiles/vm.make | 39 +++---
hotspot/src/cpu/aarch64/vm/aarch64.ad | 4 +-
.../cpu/aarch64/vm/c1_CodeStubs_aarch64.cpp | 4 +-
.../aarch64/vm/c1_LIRAssembler_aarch64.cpp | 8 +-
.../aarch64/vm/c1_MacroAssembler_aarch64.cpp | 4 +-
.../cpu/aarch64/vm/c1_Runtime1_aarch64.cpp | 4 +-
.../src/cpu/aarch64/vm/icBuffer_aarch64.cpp | 4 +-
.../cpu/aarch64/vm/macroAssembler_aarch64.cpp | 6 +-
hotspot/src/cpu/ppc/vm/assembler_ppc.cpp | 10 +-
hotspot/src/cpu/ppc/vm/icBuffer_ppc.cpp | 2 +-
hotspot/src/cpu/ppc/vm/macroAssembler_ppc.cpp | 10 +-
.../src/cpu/sparc/vm/c1_CodeStubs_sparc.cpp | 2 +-
.../cpu/sparc/vm/c1_LIRAssembler_sparc.cpp | 6 +-
.../cpu/sparc/vm/c1_MacroAssembler_sparc.cpp | 2 +-
.../src/cpu/sparc/vm/c1_Runtime1_sparc.cpp | 2 +-
hotspot/src/cpu/sparc/vm/icBuffer_sparc.cpp | 2 +-
.../src/cpu/sparc/vm/macroAssembler_sparc.cpp | 10 +-
hotspot/src/cpu/x86/vm/assembler_x86.cpp | 12 +-
hotspot/src/cpu/x86/vm/c1_CodeStubs_x86.cpp | 2 +-
.../src/cpu/x86/vm/c1_LIRAssembler_x86.cpp | 6 +-
.../src/cpu/x86/vm/c1_MacroAssembler_x86.cpp | 2 +-
hotspot/src/cpu/x86/vm/c1_Runtime1_x86.cpp | 2 +-
hotspot/src/cpu/x86/vm/icBuffer_x86.cpp | 2 +-
hotspot/src/cpu/x86/vm/macroAssembler_x86.cpp | 10 +-
hotspot/src/cpu/zero/vm/assembler_zero.cpp | 12 +-
hotspot/src/cpu/zero/vm/icBuffer_zero.cpp | 2 +-
.../src/os/bsd/dtrace/generateJvmOffsets.cpp | 2 +-
.../os/solaris/dtrace/generateJvmOffsets.cpp | 2 +-
hotspot/src/share/vm/adlc/main.cpp | 2 +-
hotspot/src/share/vm/asm/codeBuffer.cpp | 2 +-
hotspot/src/share/vm/c1/c1_LIRGenerator.cpp | 6 +-
hotspot/src/share/vm/c1/c1_Runtime1.cpp | 4 +-
hotspot/src/share/vm/ci/ciBaseObject.cpp | 2 +-
hotspot/src/share/vm/ci/ciEnv.cpp | 2 +-
hotspot/src/share/vm/ci/ciField.cpp | 2 +-
hotspot/src/share/vm/ci/ciMetadata.cpp | 2 +-
hotspot/src/share/vm/ci/ciObject.cpp | 2 +-
hotspot/src/share/vm/ci/ciObjectFactory.cpp | 4 +-
.../share/vm/classfile/classFileParser.cpp | 4 +-
.../src/share/vm/classfile/classLoader.cpp | 8 +-
.../share/vm/classfile/classLoaderData.cpp | 2 +-
.../src/share/vm/classfile/stringTable.cpp | 8 +-
.../src/share/vm/classfile/symbolTable.cpp | 4 +-
.../share/vm/classfile/systemDictionary.cpp | 2 +-
hotspot/src/share/vm/classfile/verifier.hpp | 4 +-
hotspot/src/share/vm/code/codeCache.cpp | 6 +-
hotspot/src/share/vm/code/icBuffer.cpp | 2 +-
.../src/share/vm/compiler/disassembler.cpp | 4 +-
hotspot/src/share/vm/compiler/oopMap.cpp | 4 +-
.../cms}/adaptiveFreeList.cpp | 8 +-
.../cms}/adaptiveFreeList.hpp | 8 +-
.../shared => gc/cms}/allocationStats.cpp | 6 +-
.../shared => gc/cms}/allocationStats.hpp | 12 +-
.../cms}/cmsCollectorPolicy.cpp | 22 +--
.../cms}/cmsCollectorPolicy.hpp | 10 +-
.../cms}/cmsLockVerifier.cpp | 6 +-
.../cms}/cmsLockVerifier.hpp | 8 +-
.../cms}/cmsOopClosures.cpp | 4 +-
.../cms}/cmsOopClosures.hpp | 10 +-
.../cms}/cmsOopClosures.inline.hpp | 14 +-
.../cms}/compactibleFreeListSpace.cpp | 20 +--
.../cms}/compactibleFreeListSpace.hpp | 14 +-
.../cms}/concurrentMarkSweepGeneration.cpp | 50 +++----
.../cms}/concurrentMarkSweepGeneration.hpp | 26 ++--
.../concurrentMarkSweepGeneration.inline.hpp | 22 +--
.../cms}/concurrentMarkSweepThread.cpp | 6 +-
.../cms}/concurrentMarkSweepThread.hpp | 12 +-
.../cms}/freeChunk.cpp | 4 +-
.../cms}/freeChunk.hpp | 8 +-
.../shared => gc/cms}/gSpaceCounters.cpp | 10 +-
.../shared => gc/cms}/gSpaceCounters.hpp | 16 +--
.../cms}/parCardTableModRefBS.cpp | 10 +-
.../parNew => gc/cms}/parNewGeneration.cpp | 44 +++---
.../parNew => gc/cms}/parNewGeneration.hpp | 18 +--
.../parNew => gc/cms}/parOopClosures.cpp | 4 +-
.../parNew => gc/cms}/parOopClosures.hpp | 10 +-
.../cms}/parOopClosures.inline.hpp | 16 +--
.../cms}/promotionInfo.cpp | 8 +-
.../cms}/promotionInfo.hpp | 10 +-
.../cms}/vmCMSOperations.cpp | 14 +-
.../cms}/vmCMSOperations.hpp | 12 +-
.../cms}/vmStructs_cms.hpp | 8 +-
.../parNew => gc/cms}/vmStructs_parNew.hpp | 8 +-
.../cms}/yieldingWorkgroup.cpp | 2 +-
.../cms}/yieldingWorkgroup.hpp | 10 +-
.../g1/bufferingOopClosure.cpp | 4 +-
.../g1/bufferingOopClosure.hpp | 8 +-
.../g1/collectionSetChooser.cpp | 12 +-
.../g1/collectionSetChooser.hpp | 10 +-
.../g1/concurrentG1Refine.cpp | 10 +-
.../g1/concurrentG1Refine.hpp | 10 +-
.../g1/concurrentG1RefineThread.cpp | 8 +-
.../g1/concurrentG1RefineThread.hpp | 10 +-
.../g1/concurrentMark.cpp | 44 +++---
.../g1/concurrentMark.hpp | 14 +-
.../g1/concurrentMark.inline.hpp | 12 +-
.../g1/concurrentMarkThread.cpp | 14 +-
.../g1/concurrentMarkThread.hpp | 10 +-
.../g1/concurrentMarkThread.inline.hpp | 12 +-
.../g1/dirtyCardQueue.cpp | 10 +-
.../g1/dirtyCardQueue.hpp | 10 +-
.../g1/evacuationInfo.hpp | 6 +-
.../g1/g1AllocRegion.cpp | 6 +-
.../g1/g1AllocRegion.hpp | 10 +-
.../g1/g1AllocRegion.inline.hpp | 12 +-
.../g1/g1AllocationContext.hpp | 8 +-
.../g1/g1Allocator.cpp | 10 +-
.../g1/g1Allocator.hpp | 16 +--
.../g1/g1Allocator_ext.cpp | 6 +-
.../g1/g1BiasedArray.cpp | 4 +-
.../g1/g1BiasedArray.hpp | 8 +-
.../g1/g1BlockOffsetTable.cpp | 8 +-
.../g1/g1BlockOffsetTable.hpp | 8 +-
.../g1/g1BlockOffsetTable.inline.hpp | 12 +-
.../g1/g1CardCounts.cpp | 10 +-
.../g1/g1CardCounts.hpp | 8 +-
.../g1/g1CodeCacheRemSet.cpp | 6 +-
.../g1/g1CodeCacheRemSet.hpp | 8 +-
.../g1/g1CollectedHeap.cpp | 64 ++++-----
.../g1/g1CollectedHeap.hpp | 38 +++---
.../g1/g1CollectedHeap.inline.hpp | 22 +--
.../g1/g1CollectedHeap_ext.cpp | 4 +-
.../g1/g1CollectorPolicy.cpp | 20 +--
.../g1/g1CollectorPolicy.hpp | 16 +--
.../g1/g1CollectorPolicy_ext.hpp | 10 +-
.../g1/g1ErgoVerbose.cpp | 4 +-
.../g1/g1ErgoVerbose.hpp | 8 +-
.../g1/g1EvacFailure.cpp | 16 +--
.../g1/g1EvacFailure.hpp | 12 +-
.../g1/g1GCPhaseTimes.cpp | 10 +-
.../g1/g1GCPhaseTimes.hpp | 8 +-
.../g1/g1HRPrinter.cpp | 6 +-
.../g1/g1HRPrinter.hpp | 10 +-
.../g1/g1HotCardCache.cpp | 8 +-
.../g1/g1HotCardCache.hpp | 10 +-
.../g1/g1InCSetState.hpp | 12 +-
.../vm/{gc_implementation => gc}/g1/g1Log.cpp | 4 +-
.../vm/{gc_implementation => gc}/g1/g1Log.hpp | 6 +-
.../g1/g1MMUTracker.cpp | 2 +-
.../g1/g1MMUTracker.hpp | 6 +-
.../g1/g1MarkSweep.cpp | 28 ++--
.../g1/g1MarkSweep.hpp | 16 +--
.../g1/g1MarkSweep_ext.cpp | 4 +-
.../g1/g1MonitoringSupport.cpp | 8 +-
.../g1/g1MonitoringSupport.hpp | 10 +-
.../g1/g1OopClosures.cpp | 10 +-
.../g1/g1OopClosures.hpp | 8 +-
.../g1/g1OopClosures.inline.hpp | 20 +--
.../g1/g1PageBasedVirtualSpace.cpp | 2 +-
.../g1/g1PageBasedVirtualSpace.hpp | 6 +-
.../g1/g1ParScanThreadState.cpp | 10 +-
.../g1/g1ParScanThreadState.hpp | 20 +--
.../g1/g1ParScanThreadState.inline.hpp | 10 +-
.../g1/g1RegionToSpaceMapper.cpp | 4 +-
.../g1/g1RegionToSpaceMapper.hpp | 8 +-
.../{gc_implementation => gc}/g1/g1RemSet.cpp | 22 +--
.../{gc_implementation => gc}/g1/g1RemSet.hpp | 10 +-
.../g1/g1RemSet.inline.hpp | 12 +-
.../g1/g1RemSetSummary.cpp | 16 +--
.../g1/g1RemSetSummary.hpp | 8 +-
.../g1/g1RootProcessor.cpp | 12 +-
.../g1/g1RootProcessor.hpp | 8 +-
.../g1/g1SATBCardTableModRefBS.cpp | 8 +-
.../g1/g1SATBCardTableModRefBS.hpp | 10 +-
.../g1/g1StringDedup.cpp | 14 +-
.../g1/g1StringDedup.hpp | 8 +-
.../g1/g1StringDedupQueue.cpp | 8 +-
.../g1/g1StringDedupQueue.hpp | 8 +-
.../g1/g1StringDedupStat.cpp | 4 +-
.../g1/g1StringDedupStat.hpp | 8 +-
.../g1/g1StringDedupTable.cpp | 12 +-
.../g1/g1StringDedupTable.hpp | 10 +-
.../g1/g1StringDedupThread.cpp | 10 +-
.../g1/g1StringDedupThread.hpp | 12 +-
.../g1/g1YCTypes.hpp | 8 +-
.../g1/g1_globals.cpp | 4 +-
.../g1/g1_globals.hpp | 6 +-
.../g1/g1_specialized_oop_closures.hpp | 6 +-
.../shared => gc/g1}/hSpaceCounters.cpp | 6 +-
.../shared => gc/g1}/hSpaceCounters.hpp | 14 +-
.../g1/heapRegion.cpp | 20 +--
.../g1/heapRegion.hpp | 22 +--
.../g1/heapRegion.inline.hpp | 14 +-
.../g1/heapRegionBounds.hpp | 8 +-
.../g1/heapRegionBounds.inline.hpp | 8 +-
.../g1/heapRegionManager.cpp | 10 +-
.../g1/heapRegionManager.hpp | 12 +-
.../g1/heapRegionManager.inline.hpp | 14 +-
.../g1/heapRegionRemSet.cpp | 12 +-
.../g1/heapRegionRemSet.hpp | 12 +-
.../g1/heapRegionSet.cpp | 6 +-
.../g1/heapRegionSet.hpp | 10 +-
.../g1/heapRegionSet.inline.hpp | 10 +-
.../g1/heapRegionType.cpp | 4 +-
.../g1/heapRegionType.hpp | 8 +-
.../{gc_implementation => gc}/g1/ptrQueue.cpp | 2 +-
.../{gc_implementation => gc}/g1/ptrQueue.hpp | 8 +-
.../g1/satbQueue.cpp | 6 +-
.../g1/satbQueue.hpp | 8 +-
.../g1/sparsePRT.cpp | 12 +-
.../g1/sparsePRT.hpp | 14 +-
.../g1/survRateGroup.cpp | 10 +-
.../g1/survRateGroup.hpp | 8 +-
.../shared => gc/g1}/suspendibleThreadSet.cpp | 2 +-
.../shared => gc/g1}/suspendibleThreadSet.hpp | 6 +-
.../g1/vmStructs_g1.hpp | 14 +-
.../g1/vm_operations_g1.cpp | 17 ++-
.../g1/vm_operations_g1.hpp | 10 +-
.../parallel}/adjoiningGenerations.cpp | 10 +-
.../parallel}/adjoiningGenerations.hpp | 16 +--
.../parallel}/adjoiningVirtualSpaces.cpp | 4 +-
.../parallel}/adjoiningVirtualSpaces.hpp | 10 +-
.../parallel}/asPSOldGen.cpp | 10 +-
.../parallel}/asPSOldGen.hpp | 20 +--
.../parallel}/asPSYoungGen.cpp | 14 +-
.../parallel}/asPSYoungGen.hpp | 22 +--
.../parallel}/cardTableExtension.cpp | 14 +-
.../parallel}/cardTableExtension.hpp | 8 +-
.../parallel}/gcAdaptivePolicyCounters.cpp | 4 +-
.../parallel}/gcAdaptivePolicyCounters.hpp | 14 +-
.../parallel}/gcTaskManager.cpp | 8 +-
.../parallel}/gcTaskManager.hpp | 8 +-
.../parallel}/gcTaskThread.cpp | 4 +-
.../parallel}/gcTaskThread.hpp | 8 +-
.../parallel}/generationSizer.cpp | 6 +-
.../parallel}/generationSizer.hpp | 10 +-
.../shared => gc/parallel}/immutableSpace.cpp | 8 +-
.../shared => gc/parallel}/immutableSpace.hpp | 8 +-
.../parallel}/mutableNUMASpace.cpp | 8 +-
.../parallel}/mutableNUMASpace.hpp | 14 +-
.../shared => gc/parallel}/mutableSpace.cpp | 10 +-
.../shared => gc/parallel}/mutableSpace.hpp | 10 +-
.../parallel}/objectStartArray.cpp | 6 +-
.../parallel}/objectStartArray.hpp | 10 +-
.../parallel}/parMarkBitMap.cpp | 8 +-
.../parallel}/parMarkBitMap.hpp | 8 +-
.../parallel}/parallelScavengeHeap.cpp | 30 ++---
.../parallel}/parallelScavengeHeap.hpp | 26 ++--
.../parallel}/parallelScavengeHeap.inline.hpp | 16 +--
.../parallel}/pcTasks.cpp | 14 +-
.../parallel}/pcTasks.hpp | 14 +-
.../parallel}/psAdaptiveSizePolicy.cpp | 16 +--
.../parallel}/psAdaptiveSizePolicy.hpp | 16 +--
.../parallel}/psCompactionManager.cpp | 16 +--
.../parallel}/psCompactionManager.hpp | 8 +-
.../parallel}/psCompactionManager.inline.hpp | 14 +-
.../parallel}/psGCAdaptivePolicyCounters.cpp | 4 +-
.../parallel}/psGCAdaptivePolicyCounters.hpp | 14 +-
.../parallel}/psGenerationCounters.cpp | 4 +-
.../parallel}/psGenerationCounters.hpp | 12 +-
.../parallel}/psMarkSweep.cpp | 36 ++---
.../parallel}/psMarkSweep.hpp | 10 +-
.../parallel}/psMarkSweepDecorator.cpp | 14 +-
.../parallel}/psMarkSweepDecorator.hpp | 10 +-
.../parallel}/psOldGen.cpp | 14 +-
.../parallel}/psOldGen.hpp | 16 +--
.../parallel}/psParallelCompact.cpp | 46 +++----
.../parallel}/psParallelCompact.hpp | 18 +--
.../parallel}/psParallelCompact.inline.hpp | 12 +-
.../parallel}/psPromotionLAB.cpp | 6 +-
.../parallel}/psPromotionLAB.hpp | 10 +-
.../parallel}/psPromotionLAB.inline.hpp | 12 +-
.../parallel}/psPromotionManager.cpp | 14 +-
.../parallel}/psPromotionManager.hpp | 14 +-
.../parallel}/psPromotionManager.inline.hpp | 18 +--
.../parallel}/psScavenge.cpp | 38 +++---
.../parallel}/psScavenge.hpp | 16 +--
.../parallel}/psScavenge.inline.hpp | 14 +-
.../parallel}/psTasks.cpp | 16 +--
.../parallel}/psTasks.hpp | 8 +-
.../parallel}/psVirtualspace.cpp | 2 +-
.../parallel}/psVirtualspace.hpp | 6 +-
.../parallel}/psYoungGen.cpp | 14 +-
.../parallel}/psYoungGen.hpp | 18 +--
.../shared => gc/parallel}/spaceCounters.cpp | 8 +-
.../shared => gc/parallel}/spaceCounters.hpp | 18 ++-
.../parallel}/vmPSOperations.cpp | 10 +-
.../parallel}/vmPSOperations.hpp | 12 +-
.../parallel}/vmStructs_parallelgc.hpp | 6 +-
.../shared => gc/serial}/cSpaceCounters.cpp | 2 +-
.../shared => gc/serial}/cSpaceCounters.hpp | 10 +-
.../serial}/defNewGeneration.cpp | 32 ++---
.../serial}/defNewGeneration.hpp | 16 +--
.../serial}/defNewGeneration.inline.hpp | 16 +--
.../vm/{memory => gc/serial}/genMarkSweep.cpp | 22 +--
.../vm/{memory => gc/serial}/genMarkSweep.hpp | 10 +-
.../shared => gc/serial}/markSweep.cpp | 8 +-
.../shared => gc/serial}/markSweep.hpp | 12 +-
.../shared => gc/serial}/markSweep.inline.hpp | 18 +--
.../serial}/tenuredGeneration.cpp | 20 +--
.../serial}/tenuredGeneration.hpp | 16 +--
.../serial}/tenuredGeneration.inline.hpp | 12 +-
.../shared/adaptiveSizePolicy.cpp | 8 +-
.../shared/adaptiveSizePolicy.hpp | 12 +-
.../shared/ageTable.cpp | 12 +-
.../shared/ageTable.hpp | 10 +-
.../shared}/allocTracer.cpp | 6 +-
.../shared}/allocTracer.hpp | 8 +-
.../vm/{memory => gc/shared}/barrierSet.cpp | 6 +-
.../vm/{memory => gc/shared}/barrierSet.hpp | 6 +-
.../shared}/barrierSet.inline.hpp | 10 +-
.../shared}/blockOffsetTable.cpp | 6 +-
.../shared}/blockOffsetTable.hpp | 6 +-
.../shared}/blockOffsetTable.inline.hpp | 12 +-
.../{memory => gc/shared}/cardGeneration.cpp | 14 +-
.../{memory => gc/shared}/cardGeneration.hpp | 10 +-
.../shared}/cardGeneration.inline.hpp | 12 +-
.../shared}/cardTableModRefBS.cpp | 12 +-
.../shared}/cardTableModRefBS.hpp | 8 +-
.../shared}/cardTableModRefBS.inline.hpp | 8 +-
.../vm/{memory => gc/shared}/cardTableRS.cpp | 8 +-
.../vm/{memory => gc/shared}/cardTableRS.hpp | 12 +-
.../shared}/collectedHeap.cpp | 20 +--
.../shared}/collectedHeap.hpp | 10 +-
.../shared}/collectedHeap.inline.hpp | 14 +-
.../shared/collectorCounters.cpp | 4 +-
.../shared/collectorCounters.hpp | 8 +-
.../{memory => gc/shared}/collectorPolicy.cpp | 18 +--
.../{memory => gc/shared}/collectorPolicy.hpp | 12 +-
.../shared/concurrentGCThread.cpp | 2 +-
.../shared/concurrentGCThread.hpp | 12 +-
.../shared/copyFailedInfo.hpp | 8 +-
.../{gc_interface => gc/shared}/gcCause.cpp | 4 +-
.../{gc_interface => gc/shared}/gcCause.hpp | 8 +-
.../shared/gcHeapSummary.hpp | 8 +-
.../{gc_implementation => gc}/shared/gcId.cpp | 4 +-
.../{gc_implementation => gc}/shared/gcId.hpp | 8 +-
.../vm/{memory => gc/shared}/gcLocker.cpp | 6 +-
.../vm/{memory => gc/shared}/gcLocker.hpp | 12 +-
.../{memory => gc/shared}/gcLocker.inline.hpp | 10 +-
.../vm/{gc_interface => gc/shared}/gcName.hpp | 8 +-
.../shared/gcPolicyCounters.cpp | 4 +-
.../shared/gcPolicyCounters.hpp | 8 +-
.../shared/gcStats.cpp | 6 +-
.../shared/gcStats.hpp | 10 +-
.../shared/gcTimer.cpp | 4 +-
.../shared/gcTimer.hpp | 8 +-
.../shared/gcTrace.cpp | 16 +--
.../shared/gcTrace.hpp | 20 +--
.../shared/gcTraceSend.cpp | 18 +--
.../shared/gcTraceTime.cpp | 8 +-
.../shared/gcTraceTime.hpp | 10 +-
.../shared/gcUtil.cpp | 4 +-
.../shared/gcUtil.hpp | 6 +-
.../shared/gcWhen.hpp | 8 +-
.../shared}/genCollectedHeap.cpp | 28 ++--
.../shared}/genCollectedHeap.hpp | 14 +-
.../{memory => gc/shared}/genOopClosures.cpp | 4 +-
.../{memory => gc/shared}/genOopClosures.hpp | 6 +-
.../shared}/genOopClosures.inline.hpp | 22 +--
.../vm/{memory => gc/shared}/genRemSet.cpp | 6 +-
.../vm/{memory => gc/shared}/genRemSet.hpp | 8 +-
.../vm/{memory => gc/shared}/generation.cpp | 26 ++--
.../vm/{memory => gc/shared}/generation.hpp | 12 +-
.../shared/generationCounters.cpp | 4 +-
.../shared/generationCounters.hpp | 6 +-
.../{memory => gc/shared}/generationSpec.cpp | 14 +-
.../{memory => gc/shared}/generationSpec.hpp | 8 +-
.../shared/isGCActiveMark.hpp | 10 +-
.../shared/liveRange.hpp | 6 +-
.../shared}/modRefBarrierSet.hpp | 8 +-
.../shared/objectCountEventSender.cpp | 6 +-
.../shared/objectCountEventSender.hpp | 8 +-
.../{gc_implementation => gc}/shared/plab.cpp | 6 +-
.../{gc_implementation => gc}/shared/plab.hpp | 8 +-
.../shared/plab.inline.hpp | 10 +-
.../{memory => gc/shared}/referencePolicy.cpp | 4 +-
.../{memory => gc/shared}/referencePolicy.hpp | 8 +-
.../shared}/referenceProcessor.cpp | 12 +-
.../shared}/referenceProcessor.hpp | 12 +-
.../shared}/referenceProcessorStats.hpp | 6 +-
.../share/vm/{memory => gc/shared}/space.cpp | 22 +--
.../share/vm/{memory => gc/shared}/space.hpp | 14 +-
.../vm/{memory => gc/shared}/space.inline.hpp | 18 +--
.../shared/spaceDecorator.cpp | 6 +-
.../shared/spaceDecorator.hpp | 12 +-
.../shared}/specialized_oop_closures.hpp | 10 +-
.../shared}/strongRootsScope.cpp | 2 +-
.../shared}/strongRootsScope.hpp | 6 +-
.../vm/{utilities => gc/shared}/taskqueue.cpp | 2 +-
.../vm/{utilities => gc/shared}/taskqueue.hpp | 6 +-
.../shared}/taskqueue.inline.hpp | 12 +-
.../shared}/threadLocalAllocBuffer.cpp | 6 +-
.../shared}/threadLocalAllocBuffer.hpp | 10 +-
.../shared}/threadLocalAllocBuffer.inline.hpp | 12 +-
.../shared/vmGCOperations.cpp | 10 +-
.../shared/vmGCOperations.hpp | 10 +-
.../vm/{memory => gc/shared}/watermark.hpp | 8 +-
.../vm/{utilities => gc/shared}/workgroup.cpp | 2 +-
.../vm/{utilities => gc/shared}/workgroup.hpp | 8 +-
.../vm/interpreter/bytecodeInterpreter.cpp | 2 +-
.../vm/interpreter/interpreterRuntime.cpp | 2 +-
.../src/share/vm/interpreter/linkResolver.cpp | 2 +-
hotspot/src/share/vm/interpreter/rewriter.cpp | 4 +-
.../share/vm/interpreter/templateTable.cpp | 4 +-
hotspot/src/share/vm/memory/allocation.cpp | 2 +-
.../share/vm/memory/binaryTreeDictionary.cpp | 15 +--
.../share/vm/memory/freeBlockDictionary.cpp | 4 +-
hotspot/src/share/vm/memory/freeList.cpp | 6 +-
hotspot/src/share/vm/memory/freeList.hpp | 4 +-
.../src/share/vm/memory/genRemSet.inline.hpp | 40 ------
.../src/share/vm/memory/heapInspection.cpp | 6 +-
hotspot/src/share/vm/memory/metaspace.cpp | 7 +-
.../src/share/vm/memory/metaspaceShared.cpp | 6 +-
hotspot/src/share/vm/memory/oopFactory.cpp | 4 +-
hotspot/src/share/vm/memory/universe.cpp | 26 ++--
hotspot/src/share/vm/oops/arrayKlass.cpp | 4 +-
hotspot/src/share/vm/oops/constMethod.cpp | 4 +-
.../vm/oops/instanceClassLoaderKlass.hpp | 4 +-
hotspot/src/share/vm/oops/instanceKlass.cpp | 6 +-
hotspot/src/share/vm/oops/instanceKlass.hpp | 4 +-
.../src/share/vm/oops/instanceMirrorKlass.cpp | 4 +-
.../src/share/vm/oops/instanceMirrorKlass.hpp | 4 +-
.../src/share/vm/oops/instanceRefKlass.cpp | 8 +-
.../src/share/vm/oops/instanceRefKlass.hpp | 4 +-
.../share/vm/oops/instanceRefKlass.inline.hpp | 4 +-
hotspot/src/share/vm/oops/klass.cpp | 6 +-
hotspot/src/share/vm/oops/klass.hpp | 2 +-
hotspot/src/share/vm/oops/klassVtable.cpp | 2 +-
hotspot/src/share/vm/oops/method.cpp | 8 +-
hotspot/src/share/vm/oops/objArrayKlass.cpp | 4 +-
hotspot/src/share/vm/oops/objArrayOop.cpp | 4 +-
hotspot/src/share/vm/oops/objArrayOop.hpp | 2 +-
hotspot/src/share/vm/oops/oop.hpp | 2 +-
hotspot/src/share/vm/oops/oop.inline.hpp | 12 +-
hotspot/src/share/vm/oops/oopsHierarchy.cpp | 6 +-
hotspot/src/share/vm/oops/typeArrayKlass.cpp | 6 +-
hotspot/src/share/vm/opto/graphKit.cpp | 10 +-
hotspot/src/share/vm/opto/machnode.cpp | 4 +-
hotspot/src/share/vm/opto/runtime.cpp | 10 +-
hotspot/src/share/vm/opto/type.cpp | 2 +-
.../src/share/vm/precompiled/precompiled.hpp | 125 +++++++++---------
hotspot/src/share/vm/prims/forte.cpp | 4 +-
hotspot/src/share/vm/prims/jni.cpp | 12 +-
hotspot/src/share/vm/prims/jvm.cpp | 6 +-
hotspot/src/share/vm/prims/jvmtiExport.cpp | 4 +-
.../share/vm/prims/jvmtiGetLoadedClasses.cpp | 2 +-
.../share/vm/prims/jvmtiRedefineClasses.cpp | 2 +-
hotspot/src/share/vm/prims/jvmtiTagMap.cpp | 2 +-
hotspot/src/share/vm/prims/jvmtiTagMap.hpp | 6 +-
.../src/share/vm/prims/jvmtiThreadState.cpp | 4 +-
hotspot/src/share/vm/prims/unsafe.cpp | 2 +-
hotspot/src/share/vm/prims/whitebox.cpp | 12 +-
hotspot/src/share/vm/runtime/arguments.cpp | 14 +-
hotspot/src/share/vm/runtime/fprofiler.cpp | 2 +-
hotspot/src/share/vm/runtime/frame.cpp | 4 +-
hotspot/src/share/vm/runtime/globals.cpp | 6 +-
hotspot/src/share/vm/runtime/init.cpp | 4 +-
.../src/share/vm/runtime/interfaceSupport.cpp | 8 +-
.../src/share/vm/runtime/interfaceSupport.hpp | 2 +-
hotspot/src/share/vm/runtime/java.cpp | 6 +-
hotspot/src/share/vm/runtime/memprofiler.cpp | 6 +-
hotspot/src/share/vm/runtime/os.cpp | 4 +-
hotspot/src/share/vm/runtime/safepoint.cpp | 10 +-
.../src/share/vm/runtime/sharedRuntime.cpp | 4 +-
hotspot/src/share/vm/runtime/thread.cpp | 12 +-
hotspot/src/share/vm/runtime/thread.hpp | 6 +-
.../share/vm/runtime/threadLocalStorage.hpp | 4 +-
.../src/share/vm/runtime/unhandledOops.cpp | 6 +-
hotspot/src/share/vm/runtime/vmStructs.cpp | 74 +++++------
hotspot/src/share/vm/runtime/vmThread.cpp | 2 +-
.../src/share/vm/runtime/vm_operations.cpp | 2 +-
.../src/share/vm/services/attachListener.cpp | 4 +-
.../share/vm/services/diagnosticCommand.cpp | 4 +-
.../src/share/vm/services/g1MemoryPool.cpp | 10 +-
.../src/share/vm/services/g1MemoryPool.hpp | 4 +-
hotspot/src/share/vm/services/heapDumper.cpp | 10 +-
hotspot/src/share/vm/services/memoryPool.cpp | 6 +-
.../src/share/vm/services/memoryService.cpp | 26 ++--
.../src/share/vm/services/memoryService.hpp | 4 +-
.../src/share/vm/services/psMemoryPool.hpp | 12 +-
hotspot/src/share/vm/shark/sharkBuilder.hpp | 6 +-
hotspot/src/share/vm/utilities/debug.cpp | 2 +-
hotspot/src/share/vm/utilities/ostream.cpp | 4 +-
hotspot/src/share/vm/utilities/top.hpp | 4 +-
hotspot/src/share/vm/utilities/vmError.cpp | 2 +-
hotspot/test/TEST.groups | 6 +-
.../DisableResizePLAB.java | 2 +-
.../GuardShrinkWarning.java | 0
.../AdaptiveGCBoundary.java | 0
.../TestDynShrinkHeap.java | 0
.../{defnew => serial}/HeapChangeLogging.java | 0
521 files changed, 2481 insertions(+), 2573 deletions(-)
rename hotspot/agent/src/share/classes/sun/jvm/hotspot/{gc_implementation => gc}/g1/G1Allocator.java (95%)
rename hotspot/agent/src/share/classes/sun/jvm/hotspot/{gc_implementation => gc}/g1/G1CollectedHeap.java (95%)
rename hotspot/agent/src/share/classes/sun/jvm/hotspot/{gc_implementation => gc}/g1/G1HeapRegionTable.java (97%)
rename hotspot/agent/src/share/classes/sun/jvm/hotspot/{gc_implementation => gc}/g1/G1MonitoringSupport.java (96%)
rename hotspot/agent/src/share/classes/sun/jvm/hotspot/{gc_implementation => gc}/g1/HeapRegion.java (95%)
rename hotspot/agent/src/share/classes/sun/jvm/hotspot/{gc_implementation => gc}/g1/HeapRegionManager.java (96%)
rename hotspot/agent/src/share/classes/sun/jvm/hotspot/{gc_implementation => gc}/g1/HeapRegionSetBase.java (94%)
rename hotspot/agent/src/share/classes/sun/jvm/hotspot/{gc_implementation => gc}/g1/HeapRegionSetCount.java (95%)
rename hotspot/agent/src/share/classes/sun/jvm/hotspot/{gc_implementation/parallelScavenge => gc/parallel}/PSOldGen.java (92%)
rename hotspot/agent/src/share/classes/sun/jvm/hotspot/{gc_implementation/parallelScavenge => gc/parallel}/PSYoungGen.java (94%)
rename hotspot/agent/src/share/classes/sun/jvm/hotspot/{gc_implementation/parallelScavenge => gc/parallel}/ParallelScavengeHeap.java (94%)
rename hotspot/agent/src/share/classes/sun/jvm/hotspot/{gc_interface => gc/shared}/CollectedHeap.java (98%)
rename hotspot/agent/src/share/classes/sun/jvm/hotspot/{gc_interface => gc/shared}/CollectedHeapName.java (97%)
rename hotspot/agent/src/share/classes/sun/jvm/hotspot/{gc_interface => gc/shared}/G1YCType.java (92%)
rename hotspot/agent/src/share/classes/sun/jvm/hotspot/{gc_interface => gc/shared}/GCCause.java (95%)
rename hotspot/agent/src/share/classes/sun/jvm/hotspot/{gc_interface => gc/shared}/GCName.java (92%)
rename hotspot/agent/src/share/classes/sun/jvm/hotspot/{gc_interface => gc/shared}/GCWhen.java (91%)
rename hotspot/agent/src/share/classes/sun/jvm/hotspot/{gc_implementation => gc}/shared/ImmutableSpace.java (95%)
rename hotspot/agent/src/share/classes/sun/jvm/hotspot/{gc_implementation => gc}/shared/MutableSpace.java (94%)
rename hotspot/agent/src/share/classes/sun/jvm/hotspot/{gc_interface => memory}/ReferenceType.java (93%)
rename hotspot/src/share/vm/{gc_implementation/concurrentMarkSweep => gc/cms}/adaptiveFreeList.cpp (95%)
rename hotspot/src/share/vm/{gc_implementation/concurrentMarkSweep => gc/cms}/adaptiveFreeList.hpp (96%)
rename hotspot/src/share/vm/{gc_implementation/shared => gc/cms}/allocationStats.cpp (88%)
rename hotspot/src/share/vm/{gc_implementation/shared => gc/cms}/allocationStats.hpp (95%)
rename hotspot/src/share/vm/{gc_implementation/concurrentMarkSweep => gc/cms}/cmsCollectorPolicy.cpp (84%)
rename hotspot/src/share/vm/{gc_implementation/concurrentMarkSweep => gc/cms}/cmsCollectorPolicy.hpp (81%)
rename hotspot/src/share/vm/{gc_implementation/concurrentMarkSweep => gc/cms}/cmsLockVerifier.cpp (95%)
rename hotspot/src/share/vm/{gc_implementation/concurrentMarkSweep => gc/cms}/cmsLockVerifier.hpp (85%)
rename hotspot/src/share/vm/{gc_implementation/concurrentMarkSweep => gc/cms}/cmsOopClosures.cpp (91%)
rename hotspot/src/share/vm/{gc_implementation/concurrentMarkSweep => gc/cms}/cmsOopClosures.hpp (97%)
rename hotspot/src/share/vm/{gc_implementation/concurrentMarkSweep => gc/cms}/cmsOopClosures.inline.hpp (81%)
rename hotspot/src/share/vm/{gc_implementation/concurrentMarkSweep => gc/cms}/compactibleFreeListSpace.cpp (99%)
rename hotspot/src/share/vm/{gc_implementation/concurrentMarkSweep => gc/cms}/compactibleFreeListSpace.hpp (98%)
rename hotspot/src/share/vm/{gc_implementation/concurrentMarkSweep => gc/cms}/concurrentMarkSweepGeneration.cpp (99%)
rename hotspot/src/share/vm/{gc_implementation/concurrentMarkSweep => gc/cms}/concurrentMarkSweepGeneration.hpp (98%)
rename hotspot/src/share/vm/{gc_implementation/concurrentMarkSweep => gc/cms}/concurrentMarkSweepGeneration.inline.hpp (94%)
rename hotspot/src/share/vm/{gc_implementation/concurrentMarkSweep => gc/cms}/concurrentMarkSweepThread.cpp (98%)
rename hotspot/src/share/vm/{gc_implementation/concurrentMarkSweep => gc/cms}/concurrentMarkSweepThread.hpp (93%)
rename hotspot/src/share/vm/{gc_implementation/concurrentMarkSweep => gc/cms}/freeChunk.cpp (95%)
rename hotspot/src/share/vm/{gc_implementation/concurrentMarkSweep => gc/cms}/freeChunk.hpp (95%)
rename hotspot/src/share/vm/{gc_implementation/shared => gc/cms}/gSpaceCounters.cpp (93%)
rename hotspot/src/share/vm/{gc_implementation/shared => gc/cms}/gSpaceCounters.hpp (88%)
rename hotspot/src/share/vm/{gc_implementation/parNew => gc/cms}/parCardTableModRefBS.cpp (99%)
rename hotspot/src/share/vm/{gc_implementation/parNew => gc/cms}/parNewGeneration.cpp (98%)
rename hotspot/src/share/vm/{gc_implementation/parNew => gc/cms}/parNewGeneration.hpp (96%)
rename hotspot/src/share/vm/{gc_implementation/parNew => gc/cms}/parOopClosures.cpp (91%)
rename hotspot/src/share/vm/{gc_implementation/parNew => gc/cms}/parOopClosures.hpp (94%)
rename hotspot/src/share/vm/{gc_implementation/parNew => gc/cms}/parOopClosures.inline.hpp (93%)
rename hotspot/src/share/vm/{gc_implementation/concurrentMarkSweep => gc/cms}/promotionInfo.cpp (98%)
rename hotspot/src/share/vm/{gc_implementation/concurrentMarkSweep => gc/cms}/promotionInfo.hpp (95%)
rename hotspot/src/share/vm/{gc_implementation/concurrentMarkSweep => gc/cms}/vmCMSOperations.cpp (95%)
rename hotspot/src/share/vm/{gc_implementation/concurrentMarkSweep => gc/cms}/vmCMSOperations.hpp (92%)
rename hotspot/src/share/vm/{gc_implementation/concurrentMarkSweep => gc/cms}/vmStructs_cms.hpp (94%)
rename hotspot/src/share/vm/{gc_implementation/parNew => gc/cms}/vmStructs_parNew.hpp (83%)
rename hotspot/src/share/vm/{utilities => gc/cms}/yieldingWorkgroup.cpp (99%)
rename hotspot/src/share/vm/{utilities => gc/cms}/yieldingWorkgroup.hpp (96%)
rename hotspot/src/share/vm/{gc_implementation => gc}/g1/bufferingOopClosure.cpp (98%)
rename hotspot/src/share/vm/{gc_implementation => gc}/g1/bufferingOopClosure.hpp (94%)
rename hotspot/src/share/vm/{gc_implementation => gc}/g1/collectionSetChooser.cpp (96%)
rename hotspot/src/share/vm/{gc_implementation => gc}/g1/collectionSetChooser.hpp (95%)
rename hotspot/src/share/vm/{gc_implementation => gc}/g1/concurrentG1Refine.cpp (93%)
rename hotspot/src/share/vm/{gc_implementation => gc}/g1/concurrentG1Refine.hpp (92%)
rename hotspot/src/share/vm/{gc_implementation => gc}/g1/concurrentG1RefineThread.cpp (97%)
rename hotspot/src/share/vm/{gc_implementation => gc}/g1/concurrentG1RefineThread.hpp (89%)
rename hotspot/src/share/vm/{gc_implementation => gc}/g1/concurrentMark.cpp (99%)
rename hotspot/src/share/vm/{gc_implementation => gc}/g1/concurrentMark.hpp (99%)
rename hotspot/src/share/vm/{gc_implementation => gc}/g1/concurrentMark.inline.hpp (97%)
rename hotspot/src/share/vm/{gc_implementation => gc}/g1/concurrentMarkThread.cpp (97%)
rename hotspot/src/share/vm/{gc_implementation => gc}/g1/concurrentMarkThread.hpp (90%)
rename hotspot/src/share/vm/{gc_implementation => gc}/g1/concurrentMarkThread.inline.hpp (77%)
rename hotspot/src/share/vm/{gc_implementation => gc}/g1/dirtyCardQueue.cpp (97%)
rename hotspot/src/share/vm/{gc_implementation => gc}/g1/dirtyCardQueue.hpp (96%)
rename hotspot/src/share/vm/{gc_implementation => gc}/g1/evacuationInfo.hpp (94%)
rename hotspot/src/share/vm/{gc_implementation => gc}/g1/g1AllocRegion.cpp (98%)
rename hotspot/src/share/vm/{gc_implementation => gc}/g1/g1AllocRegion.hpp (97%)
rename hotspot/src/share/vm/{gc_implementation => gc}/g1/g1AllocRegion.inline.hpp (90%)
rename hotspot/src/share/vm/{gc_implementation => gc}/g1/g1AllocationContext.hpp (85%)
rename hotspot/src/share/vm/{gc_implementation => gc}/g1/g1Allocator.cpp (96%)
rename hotspot/src/share/vm/{gc_implementation => gc}/g1/g1Allocator.hpp (95%)
rename hotspot/src/share/vm/{gc_implementation => gc}/g1/g1Allocator_ext.cpp (87%)
rename hotspot/src/share/vm/{gc_implementation => gc}/g1/g1BiasedArray.cpp (98%)
rename hotspot/src/share/vm/{gc_implementation => gc}/g1/g1BiasedArray.hpp (96%)
rename hotspot/src/share/vm/{gc_implementation => gc}/g1/g1BlockOffsetTable.cpp (99%)
rename hotspot/src/share/vm/{gc_implementation => gc}/g1/g1BlockOffsetTable.hpp (98%)
rename hotspot/src/share/vm/{gc_implementation => gc}/g1/g1BlockOffsetTable.inline.hpp (94%)
rename hotspot/src/share/vm/{gc_implementation => gc}/g1/g1CardCounts.cpp (95%)
rename hotspot/src/share/vm/{gc_implementation => gc}/g1/g1CardCounts.hpp (95%)
rename hotspot/src/share/vm/{gc_implementation => gc}/g1/g1CodeCacheRemSet.cpp (98%)
rename hotspot/src/share/vm/{gc_implementation => gc}/g1/g1CodeCacheRemSet.hpp (90%)
rename hotspot/src/share/vm/{gc_implementation => gc}/g1/g1CollectedHeap.cpp (99%)
rename hotspot/src/share/vm/{gc_implementation => gc}/g1/g1CollectedHeap.hpp (98%)
rename hotspot/src/share/vm/{gc_implementation => gc}/g1/g1CollectedHeap.inline.hpp (95%)
rename hotspot/src/share/vm/{gc_implementation => gc}/g1/g1CollectedHeap_ext.cpp (91%)
rename hotspot/src/share/vm/{gc_implementation => gc}/g1/g1CollectorPolicy.cpp (99%)
rename hotspot/src/share/vm/{gc_implementation => gc}/g1/g1CollectorPolicy.hpp (98%)
rename hotspot/src/share/vm/{gc_implementation => gc}/g1/g1CollectorPolicy_ext.hpp (76%)
rename hotspot/src/share/vm/{gc_implementation => gc}/g1/g1ErgoVerbose.cpp (94%)
rename hotspot/src/share/vm/{gc_implementation => gc}/g1/g1ErgoVerbose.hpp (97%)
rename hotspot/src/share/vm/{gc_implementation => gc}/g1/g1EvacFailure.cpp (95%)
rename hotspot/src/share/vm/{gc_implementation => gc}/g1/g1EvacFailure.hpp (82%)
rename hotspot/src/share/vm/{gc_implementation => gc}/g1/g1GCPhaseTimes.cpp (98%)
rename hotspot/src/share/vm/{gc_implementation => gc}/g1/g1GCPhaseTimes.hpp (96%)
rename hotspot/src/share/vm/{gc_implementation => gc}/g1/g1HRPrinter.cpp (96%)
rename hotspot/src/share/vm/{gc_implementation => gc}/g1/g1HRPrinter.hpp (93%)
rename hotspot/src/share/vm/{gc_implementation => gc}/g1/g1HotCardCache.cpp (96%)
rename hotspot/src/share/vm/{gc_implementation => gc}/g1/g1HotCardCache.hpp (94%)
rename hotspot/src/share/vm/{gc_implementation => gc}/g1/g1InCSetState.hpp (94%)
rename hotspot/src/share/vm/{gc_implementation => gc}/g1/g1Log.cpp (96%)
rename hotspot/src/share/vm/{gc_implementation => gc}/g1/g1Log.hpp (91%)
rename hotspot/src/share/vm/{gc_implementation => gc}/g1/g1MMUTracker.cpp (99%)
rename hotspot/src/share/vm/{gc_implementation => gc}/g1/g1MMUTracker.hpp (96%)
rename hotspot/src/share/vm/{gc_implementation => gc}/g1/g1MarkSweep.cpp (95%)
rename hotspot/src/share/vm/{gc_implementation => gc}/g1/g1MarkSweep.hpp (88%)
rename hotspot/src/share/vm/{gc_implementation => gc}/g1/g1MarkSweep_ext.cpp (91%)
rename hotspot/src/share/vm/{gc_implementation => gc}/g1/g1MonitoringSupport.cpp (98%)
rename hotspot/src/share/vm/{gc_implementation => gc}/g1/g1MonitoringSupport.hpp (97%)
rename hotspot/src/share/vm/{gc_implementation => gc}/g1/g1OopClosures.cpp (87%)
rename hotspot/src/share/vm/{gc_implementation => gc}/g1/g1OopClosures.hpp (97%)
rename hotspot/src/share/vm/{gc_implementation => gc}/g1/g1OopClosures.inline.hpp (93%)
rename hotspot/src/share/vm/{gc_implementation => gc}/g1/g1PageBasedVirtualSpace.cpp (99%)
rename hotspot/src/share/vm/{gc_implementation => gc}/g1/g1PageBasedVirtualSpace.hpp (96%)
rename hotspot/src/share/vm/{gc_implementation => gc}/g1/g1ParScanThreadState.cpp (97%)
rename hotspot/src/share/vm/{gc_implementation => gc}/g1/g1ParScanThreadState.hpp (92%)
rename hotspot/src/share/vm/{gc_implementation => gc}/g1/g1ParScanThreadState.inline.hpp (94%)
rename hotspot/src/share/vm/{gc_implementation => gc}/g1/g1RegionToSpaceMapper.cpp (98%)
rename hotspot/src/share/vm/{gc_implementation => gc}/g1/g1RegionToSpaceMapper.hpp (93%)
rename hotspot/src/share/vm/{gc_implementation => gc}/g1/g1RemSet.cpp (97%)
rename hotspot/src/share/vm/{gc_implementation => gc}/g1/g1RemSet.hpp (95%)
rename hotspot/src/share/vm/{gc_implementation => gc}/g1/g1RemSet.inline.hpp (87%)
rename hotspot/src/share/vm/{gc_implementation => gc}/g1/g1RemSetSummary.cpp (96%)
rename hotspot/src/share/vm/{gc_implementation => gc}/g1/g1RemSetSummary.hpp (92%)
rename hotspot/src/share/vm/{gc_implementation => gc}/g1/g1RootProcessor.cpp (97%)
rename hotspot/src/share/vm/{gc_implementation => gc}/g1/g1RootProcessor.hpp (95%)
rename hotspot/src/share/vm/{gc_implementation => gc}/g1/g1SATBCardTableModRefBS.cpp (97%)
rename hotspot/src/share/vm/{gc_implementation => gc}/g1/g1SATBCardTableModRefBS.hpp (95%)
rename hotspot/src/share/vm/{gc_implementation => gc}/g1/g1StringDedup.cpp (95%)
rename hotspot/src/share/vm/{gc_implementation => gc}/g1/g1StringDedup.hpp (96%)
rename hotspot/src/share/vm/{gc_implementation => gc}/g1/g1StringDedupQueue.cpp (96%)
rename hotspot/src/share/vm/{gc_implementation => gc}/g1/g1StringDedupQueue.hpp (93%)
rename hotspot/src/share/vm/{gc_implementation => gc}/g1/g1StringDedupStat.cpp (98%)
rename hotspot/src/share/vm/{gc_implementation => gc}/g1/g1StringDedupStat.hpp (93%)
rename hotspot/src/share/vm/{gc_implementation => gc}/g1/g1StringDedupTable.cpp (98%)
rename hotspot/src/share/vm/{gc_implementation => gc}/g1/g1StringDedupTable.hpp (96%)
rename hotspot/src/share/vm/{gc_implementation => gc}/g1/g1StringDedupThread.cpp (93%)
rename hotspot/src/share/vm/{gc_implementation => gc}/g1/g1StringDedupThread.hpp (83%)
rename hotspot/src/share/vm/{gc_implementation => gc}/g1/g1YCTypes.hpp (86%)
rename hotspot/src/share/vm/{gc_implementation => gc}/g1/g1_globals.cpp (92%)
rename hotspot/src/share/vm/{gc_implementation => gc}/g1/g1_globals.hpp (99%)
rename hotspot/src/share/vm/{gc_implementation => gc}/g1/g1_specialized_oop_closures.hpp (91%)
rename hotspot/src/share/vm/{gc_implementation/shared => gc/g1}/hSpaceCounters.cpp (94%)
rename hotspot/src/share/vm/{gc_implementation/shared => gc/g1}/hSpaceCounters.hpp (87%)
rename hotspot/src/share/vm/{gc_implementation => gc}/g1/heapRegion.cpp (98%)
rename hotspot/src/share/vm/{gc_implementation => gc}/g1/heapRegion.hpp (98%)
rename hotspot/src/share/vm/{gc_implementation => gc}/g1/heapRegion.inline.hpp (94%)
rename hotspot/src/share/vm/{gc_implementation => gc}/g1/heapRegionBounds.hpp (88%)
rename hotspot/src/share/vm/{gc_implementation => gc}/g1/heapRegionBounds.inline.hpp (83%)
rename hotspot/src/share/vm/{gc_implementation => gc}/g1/heapRegionManager.cpp (98%)
rename hotspot/src/share/vm/{gc_implementation => gc}/g1/heapRegionManager.hpp (96%)
rename hotspot/src/share/vm/{gc_implementation => gc}/g1/heapRegionManager.inline.hpp (81%)
rename hotspot/src/share/vm/{gc_implementation => gc}/g1/heapRegionRemSet.cpp (99%)
rename hotspot/src/share/vm/{gc_implementation => gc}/g1/heapRegionRemSet.hpp (97%)
rename hotspot/src/share/vm/{gc_implementation => gc}/g1/heapRegionSet.cpp (98%)
rename hotspot/src/share/vm/{gc_implementation => gc}/g1/heapRegionSet.hpp (97%)
rename hotspot/src/share/vm/{gc_implementation => gc}/g1/heapRegionSet.inline.hpp (92%)
rename hotspot/src/share/vm/{gc_implementation => gc}/g1/heapRegionType.cpp (94%)
rename hotspot/src/share/vm/{gc_implementation => gc}/g1/heapRegionType.hpp (94%)
rename hotspot/src/share/vm/{gc_implementation => gc}/g1/ptrQueue.cpp (99%)
rename hotspot/src/share/vm/{gc_implementation => gc}/g1/ptrQueue.hpp (97%)
rename hotspot/src/share/vm/{gc_implementation => gc}/g1/satbQueue.cpp (98%)
rename hotspot/src/share/vm/{gc_implementation => gc}/g1/satbQueue.hpp (95%)
rename hotspot/src/share/vm/{gc_implementation => gc}/g1/sparsePRT.cpp (98%)
rename hotspot/src/share/vm/{gc_implementation => gc}/g1/sparsePRT.hpp (97%)
rename hotspot/src/share/vm/{gc_implementation => gc}/g1/survRateGroup.cpp (96%)
rename hotspot/src/share/vm/{gc_implementation => gc}/g1/survRateGroup.hpp (92%)
rename hotspot/src/share/vm/{gc_implementation/shared => gc/g1}/suspendibleThreadSet.cpp (98%)
rename hotspot/src/share/vm/{gc_implementation/shared => gc/g1}/suspendibleThreadSet.hpp (94%)
rename hotspot/src/share/vm/{gc_implementation => gc}/g1/vmStructs_g1.hpp (93%)
rename hotspot/src/share/vm/{gc_implementation => gc}/g1/vm_operations_g1.cpp (95%)
rename hotspot/src/share/vm/{gc_implementation => gc}/g1/vm_operations_g1.hpp (93%)
rename hotspot/src/share/vm/{gc_implementation/parallelScavenge => gc/parallel}/adjoiningGenerations.cpp (97%)
rename hotspot/src/share/vm/{gc_implementation/parallelScavenge => gc/parallel}/adjoiningGenerations.hpp (83%)
rename hotspot/src/share/vm/{gc_implementation/parallelScavenge => gc/parallel}/adjoiningVirtualSpaces.cpp (95%)
rename hotspot/src/share/vm/{gc_implementation/parallelScavenge => gc/parallel}/adjoiningVirtualSpaces.hpp (91%)
rename hotspot/src/share/vm/{gc_implementation/parallelScavenge => gc/parallel}/asPSOldGen.cpp (95%)
rename hotspot/src/share/vm/{gc_implementation/parallelScavenge => gc/parallel}/asPSOldGen.hpp (79%)
rename hotspot/src/share/vm/{gc_implementation/parallelScavenge => gc/parallel}/asPSYoungGen.cpp (98%)
rename hotspot/src/share/vm/{gc_implementation/parallelScavenge => gc/parallel}/asPSYoungGen.hpp (76%)
rename hotspot/src/share/vm/{gc_implementation/parallelScavenge => gc/parallel}/cardTableExtension.cpp (98%)
rename hotspot/src/share/vm/{gc_implementation/parallelScavenge => gc/parallel}/cardTableExtension.hpp (94%)
rename hotspot/src/share/vm/{gc_implementation/shared => gc/parallel}/gcAdaptivePolicyCounters.cpp (98%)
rename hotspot/src/share/vm/{gc_implementation/shared => gc/parallel}/gcAdaptivePolicyCounters.hpp (94%)
rename hotspot/src/share/vm/{gc_implementation/parallelScavenge => gc/parallel}/gcTaskManager.cpp (99%)
rename hotspot/src/share/vm/{gc_implementation/parallelScavenge => gc/parallel}/gcTaskManager.hpp (98%)
rename hotspot/src/share/vm/{gc_implementation/parallelScavenge => gc/parallel}/gcTaskThread.cpp (97%)
rename hotspot/src/share/vm/{gc_implementation/parallelScavenge => gc/parallel}/gcTaskThread.hpp (92%)
rename hotspot/src/share/vm/{gc_implementation/parallelScavenge => gc/parallel}/generationSizer.cpp (94%)
rename hotspot/src/share/vm/{gc_implementation/parallelScavenge => gc/parallel}/generationSizer.hpp (82%)
rename hotspot/src/share/vm/{gc_implementation/shared => gc/parallel}/immutableSpace.cpp (93%)
rename hotspot/src/share/vm/{gc_implementation/shared => gc/parallel}/immutableSpace.hpp (90%)
rename hotspot/src/share/vm/{gc_implementation/shared => gc/parallel}/mutableNUMASpace.cpp (99%)
rename hotspot/src/share/vm/{gc_implementation/shared => gc/parallel}/mutableNUMASpace.hpp (96%)
rename hotspot/src/share/vm/{gc_implementation/shared => gc/parallel}/mutableSpace.cpp (98%)
rename hotspot/src/share/vm/{gc_implementation/shared => gc/parallel}/mutableSpace.hpp (95%)
rename hotspot/src/share/vm/{gc_implementation/parallelScavenge => gc/parallel}/objectStartArray.cpp (96%)
rename hotspot/src/share/vm/{gc_implementation/parallelScavenge => gc/parallel}/objectStartArray.hpp (94%)
rename hotspot/src/share/vm/{gc_implementation/parallelScavenge => gc/parallel}/parMarkBitMap.cpp (97%)
rename hotspot/src/share/vm/{gc_implementation/parallelScavenge => gc/parallel}/parMarkBitMap.hpp (97%)
rename hotspot/src/share/vm/{gc_implementation/parallelScavenge => gc/parallel}/parallelScavengeHeap.cpp (96%)
rename hotspot/src/share/vm/{gc_implementation/parallelScavenge => gc/parallel}/parallelScavengeHeap.hpp (91%)
rename hotspot/src/share/vm/{gc_implementation/parallelScavenge => gc/parallel}/parallelScavengeHeap.inline.hpp (75%)
rename hotspot/src/share/vm/{gc_implementation/parallelScavenge => gc/parallel}/pcTasks.cpp (96%)
rename hotspot/src/share/vm/{gc_implementation/parallelScavenge => gc/parallel}/pcTasks.hpp (94%)
rename hotspot/src/share/vm/{gc_implementation/parallelScavenge => gc/parallel}/psAdaptiveSizePolicy.cpp (99%)
rename hotspot/src/share/vm/{gc_implementation/parallelScavenge => gc/parallel}/psAdaptiveSizePolicy.hpp (96%)
rename hotspot/src/share/vm/{gc_implementation/parallelScavenge => gc/parallel}/psCompactionManager.cpp (95%)
rename hotspot/src/share/vm/{gc_implementation/parallelScavenge => gc/parallel}/psCompactionManager.hpp (96%)
rename hotspot/src/share/vm/{gc_implementation/parallelScavenge => gc/parallel}/psCompactionManager.inline.hpp (90%)
rename hotspot/src/share/vm/{gc_implementation/parallelScavenge => gc/parallel}/psGCAdaptivePolicyCounters.cpp (98%)
rename hotspot/src/share/vm/{gc_implementation/parallelScavenge => gc/parallel}/psGCAdaptivePolicyCounters.hpp (93%)
rename hotspot/src/share/vm/{gc_implementation/parallelScavenge => gc/parallel}/psGenerationCounters.cpp (94%)
rename hotspot/src/share/vm/{gc_implementation/parallelScavenge => gc/parallel}/psGenerationCounters.hpp (79%)
rename hotspot/src/share/vm/{gc_implementation/parallelScavenge => gc/parallel}/psMarkSweep.cpp (96%)
rename hotspot/src/share/vm/{gc_implementation/parallelScavenge => gc/parallel}/psMarkSweep.hpp (90%)
rename hotspot/src/share/vm/{gc_implementation/parallelScavenge => gc/parallel}/psMarkSweepDecorator.cpp (97%)
rename hotspot/src/share/vm/{gc_implementation/parallelScavenge => gc/parallel}/psMarkSweepDecorator.hpp (88%)
rename hotspot/src/share/vm/{gc_implementation/parallelScavenge => gc/parallel}/psOldGen.cpp (97%)
rename hotspot/src/share/vm/{gc_implementation/parallelScavenge => gc/parallel}/psOldGen.hpp (94%)
rename hotspot/src/share/vm/{gc_implementation/parallelScavenge => gc/parallel}/psParallelCompact.cpp (99%)
rename hotspot/src/share/vm/{gc_implementation/parallelScavenge => gc/parallel}/psParallelCompact.hpp (98%)
rename hotspot/src/share/vm/{gc_implementation/parallelScavenge => gc/parallel}/psParallelCompact.inline.hpp (83%)
rename hotspot/src/share/vm/{gc_implementation/parallelScavenge => gc/parallel}/psPromotionLAB.cpp (96%)
rename hotspot/src/share/vm/{gc_implementation/parallelScavenge => gc/parallel}/psPromotionLAB.hpp (92%)
rename hotspot/src/share/vm/{gc_implementation/parallelScavenge => gc/parallel}/psPromotionLAB.inline.hpp (79%)
rename hotspot/src/share/vm/{gc_implementation/parallelScavenge => gc/parallel}/psPromotionManager.cpp (97%)
rename hotspot/src/share/vm/{gc_implementation/parallelScavenge => gc/parallel}/psPromotionManager.hpp (94%)
rename hotspot/src/share/vm/{gc_implementation/parallelScavenge => gc/parallel}/psPromotionManager.inline.hpp (95%)
rename hotspot/src/share/vm/{gc_implementation/parallelScavenge => gc/parallel}/psScavenge.cpp (96%)
rename hotspot/src/share/vm/{gc_implementation/parallelScavenge => gc/parallel}/psScavenge.hpp (92%)
rename hotspot/src/share/vm/{gc_implementation/parallelScavenge => gc/parallel}/psScavenge.inline.hpp (91%)
rename hotspot/src/share/vm/{gc_implementation/parallelScavenge => gc/parallel}/psTasks.cpp (91%)
rename hotspot/src/share/vm/{gc_implementation/parallelScavenge => gc/parallel}/psTasks.hpp (95%)
rename hotspot/src/share/vm/{gc_implementation/parallelScavenge => gc/parallel}/psVirtualspace.cpp (99%)
rename hotspot/src/share/vm/{gc_implementation/parallelScavenge => gc/parallel}/psVirtualspace.hpp (96%)
rename hotspot/src/share/vm/{gc_implementation/parallelScavenge => gc/parallel}/psYoungGen.cpp (98%)
rename hotspot/src/share/vm/{gc_implementation/parallelScavenge => gc/parallel}/psYoungGen.hpp (91%)
rename hotspot/src/share/vm/{gc_implementation/shared => gc/parallel}/spaceCounters.cpp (94%)
rename hotspot/src/share/vm/{gc_implementation/shared => gc/parallel}/spaceCounters.hpp (83%)
rename hotspot/src/share/vm/{gc_implementation/parallelScavenge => gc/parallel}/vmPSOperations.cpp (89%)
rename hotspot/src/share/vm/{gc_implementation/parallelScavenge => gc/parallel}/vmPSOperations.hpp (80%)
rename hotspot/src/share/vm/{gc_implementation/parallelScavenge => gc/parallel}/vmStructs_parallelgc.hpp (97%)
rename hotspot/src/share/vm/{gc_implementation/shared => gc/serial}/cSpaceCounters.cpp (98%)
rename hotspot/src/share/vm/{gc_implementation/shared => gc/serial}/cSpaceCounters.hpp (88%)
rename hotspot/src/share/vm/{memory => gc/serial}/defNewGeneration.cpp (98%)
rename hotspot/src/share/vm/{memory => gc/serial}/defNewGeneration.hpp (96%)
rename hotspot/src/share/vm/{memory => gc/serial}/defNewGeneration.inline.hpp (89%)
rename hotspot/src/share/vm/{memory => gc/serial}/genMarkSweep.cpp (96%)
rename hotspot/src/share/vm/{memory => gc/serial}/genMarkSweep.hpp (87%)
rename hotspot/src/share/vm/{gc_implementation/shared => gc/serial}/markSweep.cpp (98%)
rename hotspot/src/share/vm/{gc_implementation/shared => gc/serial}/markSweep.hpp (95%)
rename hotspot/src/share/vm/{gc_implementation/shared => gc/serial}/markSweep.inline.hpp (92%)
rename hotspot/src/share/vm/{memory => gc/serial}/tenuredGeneration.cpp (95%)
rename hotspot/src/share/vm/{memory => gc/serial}/tenuredGeneration.hpp (91%)
rename hotspot/src/share/vm/{memory => gc/serial}/tenuredGeneration.inline.hpp (85%)
rename hotspot/src/share/vm/{gc_implementation => gc}/shared/adaptiveSizePolicy.cpp (99%)
rename hotspot/src/share/vm/{gc_implementation => gc}/shared/adaptiveSizePolicy.hpp (98%)
rename hotspot/src/share/vm/{gc_implementation => gc}/shared/ageTable.cpp (93%)
rename hotspot/src/share/vm/{gc_implementation => gc}/shared/ageTable.hpp (87%)
rename hotspot/src/share/vm/{gc_interface => gc/shared}/allocTracer.cpp (93%)
rename hotspot/src/share/vm/{gc_interface => gc/shared}/allocTracer.hpp (85%)
rename hotspot/src/share/vm/{memory => gc/shared}/barrierSet.cpp (92%)
rename hotspot/src/share/vm/{memory => gc/shared}/barrierSet.hpp (98%)
rename hotspot/src/share/vm/{memory => gc/shared}/barrierSet.inline.hpp (93%)
rename hotspot/src/share/vm/{memory => gc/shared}/blockOffsetTable.cpp (99%)
rename hotspot/src/share/vm/{memory => gc/shared}/blockOffsetTable.hpp (99%)
rename hotspot/src/share/vm/{memory => gc/shared}/blockOffsetTable.inline.hpp (92%)
rename hotspot/src/share/vm/{memory => gc/shared}/cardGeneration.cpp (98%)
rename hotspot/src/share/vm/{memory => gc/shared}/cardGeneration.hpp (92%)
rename hotspot/src/share/vm/{memory => gc/shared}/cardGeneration.inline.hpp (82%)
rename hotspot/src/share/vm/{memory => gc/shared}/cardTableModRefBS.cpp (99%)
rename hotspot/src/share/vm/{memory => gc/shared}/cardTableModRefBS.hpp (98%)
rename hotspot/src/share/vm/{memory => gc/shared}/cardTableModRefBS.inline.hpp (87%)
rename hotspot/src/share/vm/{memory => gc/shared}/cardTableRS.cpp (99%)
rename hotspot/src/share/vm/{memory => gc/shared}/cardTableRS.hpp (95%)
rename hotspot/src/share/vm/{gc_interface => gc/shared}/collectedHeap.cpp (98%)
rename hotspot/src/share/vm/{gc_interface => gc/shared}/collectedHeap.hpp (99%)
rename hotspot/src/share/vm/{gc_interface => gc/shared}/collectedHeap.inline.hpp (96%)
rename hotspot/src/share/vm/{gc_implementation => gc}/shared/collectorCounters.cpp (95%)
rename hotspot/src/share/vm/{gc_implementation => gc}/shared/collectorCounters.hpp (90%)
rename hotspot/src/share/vm/{memory => gc/shared}/collectorPolicy.cpp (99%)
rename hotspot/src/share/vm/{memory => gc/shared}/collectorPolicy.hpp (97%)
rename hotspot/src/share/vm/{gc_implementation => gc}/shared/concurrentGCThread.cpp (99%)
rename hotspot/src/share/vm/{gc_implementation => gc}/shared/concurrentGCThread.hpp (90%)
rename hotspot/src/share/vm/{gc_implementation => gc}/shared/copyFailedInfo.hpp (91%)
rename hotspot/src/share/vm/{gc_interface => gc/shared}/gcCause.cpp (96%)
rename hotspot/src/share/vm/{gc_interface => gc/shared}/gcCause.hpp (95%)
rename hotspot/src/share/vm/{gc_implementation => gc}/shared/gcHeapSummary.hpp (96%)
rename hotspot/src/share/vm/{gc_implementation => gc}/shared/gcId.cpp (91%)
rename hotspot/src/share/vm/{gc_implementation => gc}/shared/gcId.hpp (86%)
rename hotspot/src/share/vm/{memory => gc/shared}/gcLocker.cpp (98%)
rename hotspot/src/share/vm/{memory => gc/shared}/gcLocker.hpp (97%)
rename hotspot/src/share/vm/{memory => gc/shared}/gcLocker.inline.hpp (87%)
rename hotspot/src/share/vm/{gc_interface => gc/shared}/gcName.hpp (90%)
rename hotspot/src/share/vm/{gc_implementation => gc}/shared/gcPolicyCounters.cpp (95%)
rename hotspot/src/share/vm/{gc_implementation => gc}/shared/gcPolicyCounters.hpp (89%)
rename hotspot/src/share/vm/{gc_implementation => gc}/shared/gcStats.cpp (90%)
rename hotspot/src/share/vm/{gc_implementation => gc}/shared/gcStats.hpp (86%)
rename hotspot/src/share/vm/{gc_implementation => gc}/shared/gcTimer.cpp (99%)
rename hotspot/src/share/vm/{gc_implementation => gc}/shared/gcTimer.hpp (95%)
rename hotspot/src/share/vm/{gc_implementation => gc}/shared/gcTrace.cpp (95%)
rename hotspot/src/share/vm/{gc_implementation => gc}/shared/gcTrace.hpp (94%)
rename hotspot/src/share/vm/{gc_implementation => gc}/shared/gcTraceSend.cpp (96%)
rename hotspot/src/share/vm/{gc_implementation => gc}/shared/gcTraceTime.cpp (92%)
rename hotspot/src/share/vm/{gc_implementation => gc}/shared/gcTraceTime.hpp (81%)
rename hotspot/src/share/vm/{gc_implementation => gc}/shared/gcUtil.cpp (98%)
rename hotspot/src/share/vm/{gc_implementation => gc}/shared/gcUtil.hpp (97%)
rename hotspot/src/share/vm/{gc_implementation => gc}/shared/gcWhen.hpp (85%)
rename hotspot/src/share/vm/{memory => gc/shared}/genCollectedHeap.cpp (98%)
rename hotspot/src/share/vm/{memory => gc/shared}/genCollectedHeap.hpp (98%)
rename hotspot/src/share/vm/{memory => gc/shared}/genOopClosures.cpp (92%)
rename hotspot/src/share/vm/{memory => gc/shared}/genOopClosures.hpp (97%)
rename hotspot/src/share/vm/{memory => gc/shared}/genOopClosures.inline.hpp (91%)
rename hotspot/src/share/vm/{memory => gc/shared}/genRemSet.cpp (94%)
rename hotspot/src/share/vm/{memory => gc/shared}/genRemSet.hpp (96%)
rename hotspot/src/share/vm/{memory => gc/shared}/generation.cpp (95%)
rename hotspot/src/share/vm/{memory => gc/shared}/generation.hpp (98%)
rename hotspot/src/share/vm/{gc_implementation => gc}/shared/generationCounters.cpp (96%)
rename hotspot/src/share/vm/{gc_implementation => gc}/shared/generationCounters.hpp (93%)
rename hotspot/src/share/vm/{memory => gc/shared}/generationSpec.cpp (87%)
rename hotspot/src/share/vm/{memory => gc/shared}/generationSpec.hpp (92%)
rename hotspot/src/share/vm/{gc_implementation => gc}/shared/isGCActiveMark.hpp (83%)
rename hotspot/src/share/vm/{gc_implementation => gc}/shared/liveRange.hpp (91%)
rename hotspot/src/share/vm/{memory => gc/shared}/modRefBarrierSet.hpp (95%)
rename hotspot/src/share/vm/{gc_implementation => gc}/shared/objectCountEventSender.cpp (91%)
rename hotspot/src/share/vm/{gc_implementation => gc}/shared/objectCountEventSender.hpp (84%)
rename hotspot/src/share/vm/{gc_implementation => gc}/shared/plab.cpp (97%)
rename hotspot/src/share/vm/{gc_implementation => gc}/shared/plab.hpp (97%)
rename hotspot/src/share/vm/{gc_implementation => gc}/shared/plab.inline.hpp (84%)
rename hotspot/src/share/vm/{memory => gc/shared}/referencePolicy.cpp (96%)
rename hotspot/src/share/vm/{memory => gc/shared}/referencePolicy.hpp (91%)
rename hotspot/src/share/vm/{memory => gc/shared}/referenceProcessor.cpp (99%)
rename hotspot/src/share/vm/{memory => gc/shared}/referenceProcessor.hpp (98%)
rename hotspot/src/share/vm/{memory => gc/shared}/referenceProcessorStats.hpp (92%)
rename hotspot/src/share/vm/{memory => gc/shared}/space.cpp (98%)
rename hotspot/src/share/vm/{memory => gc/shared}/space.hpp (99%)
rename hotspot/src/share/vm/{memory => gc/shared}/space.inline.hpp (96%)
rename hotspot/src/share/vm/{gc_implementation => gc}/shared/spaceDecorator.cpp (96%)
rename hotspot/src/share/vm/{gc_implementation => gc}/shared/spaceDecorator.hpp (94%)
rename hotspot/src/share/vm/{memory => gc/shared}/specialized_oop_closures.hpp (95%)
rename hotspot/src/share/vm/{memory => gc/shared}/strongRootsScope.cpp (97%)
rename hotspot/src/share/vm/{memory => gc/shared}/strongRootsScope.hpp (90%)
rename hotspot/src/share/vm/{utilities => gc/shared}/taskqueue.cpp (99%)
rename hotspot/src/share/vm/{utilities => gc/shared}/taskqueue.hpp (99%)
rename hotspot/src/share/vm/{utilities => gc/shared}/taskqueue.inline.hpp (98%)
rename hotspot/src/share/vm/{memory => gc/shared}/threadLocalAllocBuffer.cpp (98%)
rename hotspot/src/share/vm/{memory => gc/shared}/threadLocalAllocBuffer.hpp (97%)
rename hotspot/src/share/vm/{memory => gc/shared}/threadLocalAllocBuffer.inline.hpp (91%)
rename hotspot/src/share/vm/{gc_implementation => gc}/shared/vmGCOperations.cpp (98%)
rename hotspot/src/share/vm/{gc_implementation => gc}/shared/vmGCOperations.hpp (97%)
rename hotspot/src/share/vm/{memory => gc/shared}/watermark.hpp (90%)
rename hotspot/src/share/vm/{utilities => gc/shared}/workgroup.cpp (99%)
rename hotspot/src/share/vm/{utilities => gc/shared}/workgroup.hpp (99%)
delete mode 100644 hotspot/src/share/vm/memory/genRemSet.inline.hpp
rename hotspot/test/gc/{concurrentMarkSweep => cms}/DisableResizePLAB.java (95%)
rename hotspot/test/gc/{concurrentMarkSweep => cms}/GuardShrinkWarning.java (100%)
rename hotspot/test/gc/{parallelScavenge => parallel}/AdaptiveGCBoundary.java (100%)
rename hotspot/test/gc/{parallelScavenge => parallel}/TestDynShrinkHeap.java (100%)
rename hotspot/test/gc/{defnew => serial}/HeapChangeLogging.java (100%)
diff --git a/hotspot/agent/make/Makefile b/hotspot/agent/make/Makefile
index 8462ef68086..f120c60fa68 100644
--- a/hotspot/agent/make/Makefile
+++ b/hotspot/agent/make/Makefile
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -79,11 +79,10 @@ sun.jvm.hotspot.debugger.windbg \
sun.jvm.hotspot.debugger.windbg.amd64 \
sun.jvm.hotspot.debugger.windbg.x86 \
sun.jvm.hotspot.debugger.x86 \
-sun.jvm.hotspot.gc_implementation \
-sun.jvm.hotspot.gc_implementation.g1 \
-sun.jvm.hotspot.gc_implementation.parallelScavenge \
-sun.jvm.hotspot.gc_implementation.shared \
-sun.jvm.hotspot.gc_interface \
+sun.jvm.hotspot.gc \
+sun.jvm.hotspot.gc.g1 \
+sun.jvm.hotspot.gc.parallel \
+sun.jvm.hotspot.gc.shared \
sun.jvm.hotspot.interpreter \
sun.jvm.hotspot.jdi \
sun.jvm.hotspot.memory \
@@ -168,9 +167,9 @@ sun/jvm/hotspot/debugger/win32/coff/*.java \
sun/jvm/hotspot/debugger/windbg/*.java \
sun/jvm/hotspot/debugger/windbg/x86/*.java \
sun/jvm/hotspot/debugger/x86/*.java \
-sun/jvm/hotspot/gc_implementation/g1/*.java \
-sun/jvm/hotspot/gc_implementation/parallelScavenge/*.java \
-sun/jvm/hotspot/gc_implementation/shared/*.java \
+sun/jvm/hotspot/gc/g1/*.java \
+sun/jvm/hotspot/gc/parallel/*.java \
+sun/jvm/hotspot/gc/shared/*.java \
sun/jvm/hotspot/interpreter/*.java \
sun/jvm/hotspot/jdi/*.java \
sun/jvm/hotspot/memory/*.java \
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/HSDB.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/HSDB.java
index c43c5b1b88e..829780ab1a7 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/HSDB.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/HSDB.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -33,8 +33,8 @@ import java.util.*;
import sun.jvm.hotspot.code.*;
import sun.jvm.hotspot.compiler.*;
import sun.jvm.hotspot.debugger.*;
-import sun.jvm.hotspot.gc_implementation.parallelScavenge.*;
-import sun.jvm.hotspot.gc_interface.*;
+import sun.jvm.hotspot.gc.parallel.*;
+import sun.jvm.hotspot.gc.shared.*;
import sun.jvm.hotspot.interpreter.*;
import sun.jvm.hotspot.memory.*;
import sun.jvm.hotspot.oops.*;
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_implementation/g1/G1Allocator.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/g1/G1Allocator.java
similarity index 95%
rename from hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_implementation/g1/G1Allocator.java
rename to hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/g1/G1Allocator.java
index 1195eed06bb..4307ba24a7d 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_implementation/g1/G1Allocator.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/g1/G1Allocator.java
@@ -1,4 +1,4 @@
-package sun.jvm.hotspot.gc_implementation.g1;
+package sun.jvm.hotspot.gc.g1;
import java.util.Observable;
import java.util.Observer;
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_implementation/g1/G1CollectedHeap.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/g1/G1CollectedHeap.java
similarity index 95%
rename from hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_implementation/g1/G1CollectedHeap.java
rename to hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/g1/G1CollectedHeap.java
index 815a74bc276..516fcf96f79 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_implementation/g1/G1CollectedHeap.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/g1/G1CollectedHeap.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,15 +22,15 @@
*
*/
-package sun.jvm.hotspot.gc_implementation.g1;
+package sun.jvm.hotspot.gc.g1;
import java.util.Iterator;
import java.util.Observable;
import java.util.Observer;
import sun.jvm.hotspot.debugger.Address;
-import sun.jvm.hotspot.gc_interface.CollectedHeap;
-import sun.jvm.hotspot.gc_interface.CollectedHeapName;
+import sun.jvm.hotspot.gc.shared.CollectedHeap;
+import sun.jvm.hotspot.gc.shared.CollectedHeapName;
import sun.jvm.hotspot.memory.MemRegion;
import sun.jvm.hotspot.memory.SpaceClosure;
import sun.jvm.hotspot.runtime.VM;
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_implementation/g1/G1HeapRegionTable.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/g1/G1HeapRegionTable.java
similarity index 97%
rename from hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_implementation/g1/G1HeapRegionTable.java
rename to hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/g1/G1HeapRegionTable.java
index e8bbaaa0553..da8abd80223 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_implementation/g1/G1HeapRegionTable.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/g1/G1HeapRegionTable.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,7 @@
*
*/
-package sun.jvm.hotspot.gc_implementation.g1;
+package sun.jvm.hotspot.gc.g1;
import java.util.Iterator;
import java.util.Observable;
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_implementation/g1/G1MonitoringSupport.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/g1/G1MonitoringSupport.java
similarity index 96%
rename from hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_implementation/g1/G1MonitoringSupport.java
rename to hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/g1/G1MonitoringSupport.java
index a9ced52b635..e59825dca7c 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_implementation/g1/G1MonitoringSupport.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/g1/G1MonitoringSupport.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,7 @@
*
*/
-package sun.jvm.hotspot.gc_implementation.g1;
+package sun.jvm.hotspot.gc.g1;
import java.util.Observable;
import java.util.Observer;
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_implementation/g1/HeapRegion.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/g1/HeapRegion.java
similarity index 95%
rename from hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_implementation/g1/HeapRegion.java
rename to hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/g1/HeapRegion.java
index 8d924973d8f..42e6f8c46ec 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_implementation/g1/HeapRegion.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/g1/HeapRegion.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,7 @@
*
*/
-package sun.jvm.hotspot.gc_implementation.g1;
+package sun.jvm.hotspot.gc.g1;
import java.util.ArrayList;
import java.util.List;
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_implementation/g1/HeapRegionManager.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/g1/HeapRegionManager.java
similarity index 96%
rename from hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_implementation/g1/HeapRegionManager.java
rename to hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/g1/HeapRegionManager.java
index 2a2a26f3947..b80c60350f4 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_implementation/g1/HeapRegionManager.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/g1/HeapRegionManager.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,7 @@
*
*/
-package sun.jvm.hotspot.gc_implementation.g1;
+package sun.jvm.hotspot.gc.g1;
import java.util.Iterator;
import java.util.Observable;
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_implementation/g1/HeapRegionSetBase.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/g1/HeapRegionSetBase.java
similarity index 94%
rename from hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_implementation/g1/HeapRegionSetBase.java
rename to hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/g1/HeapRegionSetBase.java
index 94c3e239990..bd64e0249e4 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_implementation/g1/HeapRegionSetBase.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/g1/HeapRegionSetBase.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,7 @@
*
*/
-package sun.jvm.hotspot.gc_implementation.g1;
+package sun.jvm.hotspot.gc.g1;
import java.util.Iterator;
import java.util.Observable;
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_implementation/g1/HeapRegionSetCount.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/g1/HeapRegionSetCount.java
similarity index 95%
rename from hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_implementation/g1/HeapRegionSetCount.java
rename to hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/g1/HeapRegionSetCount.java
index 2a4483a54c8..2c9fd8280c8 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_implementation/g1/HeapRegionSetCount.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/g1/HeapRegionSetCount.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,7 @@
*
*/
-package sun.jvm.hotspot.gc_implementation.g1;
+package sun.jvm.hotspot.gc.g1;
import java.util.Iterator;
import java.util.Observable;
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_implementation/parallelScavenge/PSOldGen.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/parallel/PSOldGen.java
similarity index 92%
rename from hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_implementation/parallelScavenge/PSOldGen.java
rename to hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/parallel/PSOldGen.java
index 4735ecc3fd8..682cccda6ae 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_implementation/parallelScavenge/PSOldGen.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/parallel/PSOldGen.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,13 +22,13 @@
*
*/
-package sun.jvm.hotspot.gc_implementation.parallelScavenge;
+package sun.jvm.hotspot.gc.parallel;
import java.io.*;
import java.util.*;
import sun.jvm.hotspot.debugger.*;
-import sun.jvm.hotspot.gc_implementation.shared.*;
+import sun.jvm.hotspot.gc.shared.*;
import sun.jvm.hotspot.memory.*;
import sun.jvm.hotspot.runtime.*;
import sun.jvm.hotspot.types.*;
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_implementation/parallelScavenge/PSYoungGen.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/parallel/PSYoungGen.java
similarity index 94%
rename from hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_implementation/parallelScavenge/PSYoungGen.java
rename to hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/parallel/PSYoungGen.java
index b8c36bc1793..11787a56844 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_implementation/parallelScavenge/PSYoungGen.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/parallel/PSYoungGen.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,13 +22,13 @@
*
*/
-package sun.jvm.hotspot.gc_implementation.parallelScavenge;
+package sun.jvm.hotspot.gc.parallel;
import java.io.*;
import java.util.*;
import sun.jvm.hotspot.debugger.*;
-import sun.jvm.hotspot.gc_implementation.shared.*;
+import sun.jvm.hotspot.gc.shared.*;
import sun.jvm.hotspot.memory.*;
import sun.jvm.hotspot.runtime.*;
import sun.jvm.hotspot.types.*;
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_implementation/parallelScavenge/ParallelScavengeHeap.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/parallel/ParallelScavengeHeap.java
similarity index 94%
rename from hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_implementation/parallelScavenge/ParallelScavengeHeap.java
rename to hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/parallel/ParallelScavengeHeap.java
index e99316718ab..9db4b041acd 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_implementation/parallelScavenge/ParallelScavengeHeap.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/parallel/ParallelScavengeHeap.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,13 +22,13 @@
*
*/
-package sun.jvm.hotspot.gc_implementation.parallelScavenge;
+package sun.jvm.hotspot.gc.parallel;
import java.io.*;
import java.util.*;
import sun.jvm.hotspot.debugger.*;
-import sun.jvm.hotspot.gc_interface.*;
+import sun.jvm.hotspot.gc.shared.*;
import sun.jvm.hotspot.runtime.*;
import sun.jvm.hotspot.types.*;
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_interface/CollectedHeap.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/shared/CollectedHeap.java
similarity index 98%
rename from hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_interface/CollectedHeap.java
rename to hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/shared/CollectedHeap.java
index c66a791dfd8..7646a2ced6c 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_interface/CollectedHeap.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/shared/CollectedHeap.java
@@ -22,7 +22,7 @@
*
*/
-package sun.jvm.hotspot.gc_interface;
+package sun.jvm.hotspot.gc.shared;
import java.io.*;
import java.util.*;
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_interface/CollectedHeapName.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/shared/CollectedHeapName.java
similarity index 97%
rename from hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_interface/CollectedHeapName.java
rename to hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/shared/CollectedHeapName.java
index 7e18cfa5075..13419091e18 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_interface/CollectedHeapName.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/shared/CollectedHeapName.java
@@ -22,7 +22,7 @@
*
*/
-package sun.jvm.hotspot.gc_interface;
+package sun.jvm.hotspot.gc.shared;
/** Mimics the enums in the VM under CollectedHeap::Name */
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_interface/G1YCType.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/shared/G1YCType.java
similarity index 92%
rename from hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_interface/G1YCType.java
rename to hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/shared/G1YCType.java
index d3d15512b04..871af8aae9d 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_interface/G1YCType.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/shared/G1YCType.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,7 @@
*
*/
-package sun.jvm.hotspot.gc_interface;
+package sun.jvm.hotspot.gc.shared;
//These definitions should be kept in sync with the definitions in the HotSpot
//code.
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_interface/GCCause.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/shared/GCCause.java
similarity index 95%
rename from hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_interface/GCCause.java
rename to hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/shared/GCCause.java
index fc8f251f919..3b9655b922c 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_interface/GCCause.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/shared/GCCause.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,7 @@
*
*/
-package sun.jvm.hotspot.gc_interface;
+package sun.jvm.hotspot.gc.shared;
//These definitions should be kept in sync with the definitions in the HotSpot code.
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_interface/GCName.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/shared/GCName.java
similarity index 92%
rename from hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_interface/GCName.java
rename to hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/shared/GCName.java
index f8985778d35..9a7a4de3872 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_interface/GCName.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/shared/GCName.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,7 @@
*
*/
-package sun.jvm.hotspot.gc_interface;
+package sun.jvm.hotspot.gc.shared;
//These definitions should be kept in sync with the definitions in the HotSpot code.
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_interface/GCWhen.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/shared/GCWhen.java
similarity index 91%
rename from hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_interface/GCWhen.java
rename to hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/shared/GCWhen.java
index 74d4a83f744..83530d4a502 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_interface/GCWhen.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/shared/GCWhen.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,7 @@
*
*/
-package sun.jvm.hotspot.gc_interface;
+package sun.jvm.hotspot.gc.shared;
//These definitions should be kept in sync with the definitions in the HotSpot code.
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_implementation/shared/ImmutableSpace.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/shared/ImmutableSpace.java
similarity index 95%
rename from hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_implementation/shared/ImmutableSpace.java
rename to hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/shared/ImmutableSpace.java
index 7f173bc3937..c3f6b5c8e3f 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_implementation/shared/ImmutableSpace.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/shared/ImmutableSpace.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,7 @@
*
*/
-package sun.jvm.hotspot.gc_implementation.shared;
+package sun.jvm.hotspot.gc.shared;
import java.io.*;
import java.util.*;
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_implementation/shared/MutableSpace.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/shared/MutableSpace.java
similarity index 94%
rename from hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_implementation/shared/MutableSpace.java
rename to hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/shared/MutableSpace.java
index f0f33245434..dc32b41da0e 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_implementation/shared/MutableSpace.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/shared/MutableSpace.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,7 @@
*
*/
-package sun.jvm.hotspot.gc_implementation.shared;
+package sun.jvm.hotspot.gc.shared;
import java.io.*;
import java.util.*;
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/memory/GenCollectedHeap.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/memory/GenCollectedHeap.java
index 074e7fa286e..6f7b311f105 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/memory/GenCollectedHeap.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/memory/GenCollectedHeap.java
@@ -28,7 +28,7 @@ import java.io.*;
import java.util.*;
import sun.jvm.hotspot.debugger.*;
-import sun.jvm.hotspot.gc_interface.*;
+import sun.jvm.hotspot.gc.shared.*;
import sun.jvm.hotspot.runtime.*;
import sun.jvm.hotspot.types.*;
import sun.jvm.hotspot.utilities.*;
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_interface/ReferenceType.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/memory/ReferenceType.java
similarity index 93%
rename from hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_interface/ReferenceType.java
rename to hotspot/agent/src/share/classes/sun/jvm/hotspot/memory/ReferenceType.java
index e8bb8bc2119..e5c8f5a1d9a 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_interface/ReferenceType.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/memory/ReferenceType.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,7 @@
*
*/
-package sun.jvm.hotspot.gc_interface;
+package sun.jvm.hotspot.memory;
//These definitions should be kept in sync with the definitions in the HotSpot code.
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/memory/Universe.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/memory/Universe.java
index ee4fbb06594..f26fc452c94 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/memory/Universe.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/memory/Universe.java
@@ -27,9 +27,9 @@ package sun.jvm.hotspot.memory;
import java.io.*;
import java.util.*;
import sun.jvm.hotspot.debugger.*;
-import sun.jvm.hotspot.gc_interface.*;
-import sun.jvm.hotspot.gc_implementation.g1.G1CollectedHeap;
-import sun.jvm.hotspot.gc_implementation.parallelScavenge.*;
+import sun.jvm.hotspot.gc.shared.*;
+import sun.jvm.hotspot.gc.g1.G1CollectedHeap;
+import sun.jvm.hotspot.gc.parallel.*;
import sun.jvm.hotspot.oops.*;
import sun.jvm.hotspot.types.*;
import sun.jvm.hotspot.runtime.*;
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/ObjectHeap.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/ObjectHeap.java
index d550a935fa3..297ac14d641 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/ObjectHeap.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/ObjectHeap.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -32,9 +32,9 @@ package sun.jvm.hotspot.oops;
import java.util.*;
import sun.jvm.hotspot.debugger.*;
-import sun.jvm.hotspot.gc_interface.*;
-import sun.jvm.hotspot.gc_implementation.g1.*;
-import sun.jvm.hotspot.gc_implementation.parallelScavenge.*;
+import sun.jvm.hotspot.gc.shared.*;
+import sun.jvm.hotspot.gc.g1.*;
+import sun.jvm.hotspot.gc.parallel.*;
import sun.jvm.hotspot.memory.*;
import sun.jvm.hotspot.runtime.*;
import sun.jvm.hotspot.types.*;
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/tools/HeapSummary.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/tools/HeapSummary.java
index eb090565a9b..3eba45c49b7 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/tools/HeapSummary.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/tools/HeapSummary.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,10 +25,10 @@
package sun.jvm.hotspot.tools;
import java.util.*;
-import sun.jvm.hotspot.gc_interface.*;
-import sun.jvm.hotspot.gc_implementation.g1.*;
-import sun.jvm.hotspot.gc_implementation.parallelScavenge.*;
-import sun.jvm.hotspot.gc_implementation.shared.*;
+import sun.jvm.hotspot.gc.shared.*;
+import sun.jvm.hotspot.gc.g1.*;
+import sun.jvm.hotspot.gc.parallel.*;
+import sun.jvm.hotspot.gc.shared.*;
import sun.jvm.hotspot.debugger.JVMDebugger;
import sun.jvm.hotspot.memory.*;
import sun.jvm.hotspot.oops.*;
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/LivenessAnalysis.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/LivenessAnalysis.java
index 1aa3c8c8815..a69f88f5a3c 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/LivenessAnalysis.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/LivenessAnalysis.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@ package sun.jvm.hotspot.utilities;
import java.io.*;
import java.util.*;
import sun.jvm.hotspot.debugger.*;
-import sun.jvm.hotspot.gc_interface.*;
+import sun.jvm.hotspot.gc.shared.*;
import sun.jvm.hotspot.memory.*;
import sun.jvm.hotspot.oops.*;
import sun.jvm.hotspot.runtime.*;
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/MarkBits.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/MarkBits.java
index a93fc65455e..5b247573749 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/MarkBits.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/MarkBits.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
package sun.jvm.hotspot.utilities;
import sun.jvm.hotspot.debugger.*;
-import sun.jvm.hotspot.gc_interface.*;
+import sun.jvm.hotspot.gc.shared.*;
import sun.jvm.hotspot.memory.*;
import sun.jvm.hotspot.oops.*;
import sun.jvm.hotspot.runtime.*;
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/PointerFinder.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/PointerFinder.java
index a76457f7f5f..35e8fe003e8 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/PointerFinder.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/PointerFinder.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@ package sun.jvm.hotspot.utilities;
import sun.jvm.hotspot.code.*;
import sun.jvm.hotspot.debugger.*;
-import sun.jvm.hotspot.gc_interface.*;
+import sun.jvm.hotspot.gc.shared.*;
import sun.jvm.hotspot.interpreter.*;
import sun.jvm.hotspot.runtime.*;
import sun.jvm.hotspot.memory.*;
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/PointerLocation.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/PointerLocation.java
index 0dd1ea966d5..aa50800de63 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/PointerLocation.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/PointerLocation.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@ package sun.jvm.hotspot.utilities;
import java.io.*;
import sun.jvm.hotspot.code.*;
import sun.jvm.hotspot.debugger.*;
-import sun.jvm.hotspot.gc_interface.*;
+import sun.jvm.hotspot.gc.shared.*;
import sun.jvm.hotspot.interpreter.*;
import sun.jvm.hotspot.runtime.*;
import sun.jvm.hotspot.memory.*;
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/ReversePtrsAnalysis.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/ReversePtrsAnalysis.java
index 35afe78f724..50a8d4d62a8 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/ReversePtrsAnalysis.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/ReversePtrsAnalysis.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@ package sun.jvm.hotspot.utilities;
import java.io.*;
import java.util.*;
import sun.jvm.hotspot.debugger.*;
-import sun.jvm.hotspot.gc_interface.*;
+import sun.jvm.hotspot.gc.shared.*;
import sun.jvm.hotspot.memory.*;
import sun.jvm.hotspot.oops.*;
import sun.jvm.hotspot.runtime.*;
diff --git a/hotspot/make/aix/makefiles/vm.make b/hotspot/make/aix/makefiles/vm.make
index cf10de3e214..ecd46d1c371 100644
--- a/hotspot/make/aix/makefiles/vm.make
+++ b/hotspot/make/aix/makefiles/vm.make
@@ -1,5 +1,5 @@
#
-# Copyright (c) 1999, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved.
# Copyright 2012, 2013 SAP AG. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
@@ -137,7 +137,7 @@ LIBJVM = lib$(JVM).so
LIBJVM_DEBUGINFO = lib$(JVM).debuginfo
LIBJVM_DIZ = lib$(JVM).diz
-SPECIAL_PATHS:=adlc c1 gc_implementation opto shark libadt
+SPECIAL_PATHS:=adlc c1 gc opto shark libadt
SOURCE_PATHS=\
$(shell find $(HS_COMMON_SRC)/share/vm/* -type d \! \
diff --git a/hotspot/make/bsd/makefiles/vm.make b/hotspot/make/bsd/makefiles/vm.make
index 1adcc796719..b27d88fb556 100644
--- a/hotspot/make/bsd/makefiles/vm.make
+++ b/hotspot/make/bsd/makefiles/vm.make
@@ -1,5 +1,5 @@
#
-# Copyright (c) 1999, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -154,7 +154,7 @@ else
LIBJVM_DIZ = lib$(JVM).diz
endif
-SPECIAL_PATHS:=adlc c1 gc_implementation opto shark libadt
+SPECIAL_PATHS:=adlc c1 gc opto shark libadt
SOURCE_PATHS=\
$(shell find $(HS_COMMON_SRC)/share/vm/* -type d \! \
diff --git a/hotspot/make/excludeSrc.make b/hotspot/make/excludeSrc.make
index 5cfdb4d3058..0bc759f25b7 100644
--- a/hotspot/make/excludeSrc.make
+++ b/hotspot/make/excludeSrc.make
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -81,36 +81,15 @@ ifeq ($(INCLUDE_ALL_GCS), false)
CXXFLAGS += -DINCLUDE_ALL_GCS=0
CFLAGS += -DINCLUDE_ALL_GCS=0
- gc_impl := $(HS_COMMON_SRC)/share/vm/gc_implementation
- gc_impl_alt := $(HS_ALT_SRC)/share/vm/gc_implementation
- gc_subdirs := concurrentMarkSweep g1 parallelScavenge parNew
+ gc_dir := $(HS_COMMON_SRC)/share/vm/gc
+ gc_dir_alt := $(HS_ALT_SRC)/share/vm/gc
+ gc_subdirs := cms g1 parallel
gc_exclude := $(foreach gc,$(gc_subdirs), \
- $(notdir $(wildcard $(gc_impl)/$(gc)/*.cpp)) \
- $(notdir $(wildcard $(gc_impl_alt)/$(gc)/*.cpp)))
- Src_Files_EXCLUDE += $(gc_exclude)
-
- # Exclude everything in $(gc_impl)/shared except the files listed
- # in $(gc_shared_keep).
- gc_shared_all := $(notdir $(wildcard $(gc_impl)/shared/*.cpp))
- gc_shared_keep := \
- adaptiveSizePolicy.cpp \
- ageTable.cpp \
- collectorCounters.cpp \
- cSpaceCounters.cpp \
- gcId.cpp \
- gcPolicyCounters.cpp \
- gcStats.cpp \
- gcTimer.cpp \
- gcTrace.cpp \
- gcTraceSend.cpp \
- gcTraceTime.cpp \
- gcUtil.cpp \
- generationCounters.cpp \
- markSweep.cpp \
- objectCountEventSender.cpp \
- spaceDecorator.cpp \
- vmGCOperations.cpp
- Src_Files_EXCLUDE += $(filter-out $(gc_shared_keep),$(gc_shared_all))
+ $(notdir $(wildcard $(gc_dir)/$(gc)/*.cpp)) \
+ $(notdir $(wildcard $(gc_dir_alt)/$(gc)/*.cpp)))
+ Src_Files_EXCLUDE += $(gc_exclude) \
+ concurrentGCThread.cpp \
+ plab.cpp
# src/share/vm/services
Src_Files_EXCLUDE += \
diff --git a/hotspot/make/linux/makefiles/vm.make b/hotspot/make/linux/makefiles/vm.make
index d0737d41c1a..c334309978d 100644
--- a/hotspot/make/linux/makefiles/vm.make
+++ b/hotspot/make/linux/makefiles/vm.make
@@ -142,7 +142,7 @@ LIBJVM = lib$(JVM).so
LIBJVM_DEBUGINFO = lib$(JVM).debuginfo
LIBJVM_DIZ = lib$(JVM).diz
-SPECIAL_PATHS:=adlc c1 gc_implementation opto shark libadt
+SPECIAL_PATHS:=adlc c1 gc opto shark libadt
SOURCE_PATHS=\
$(shell find $(HS_COMMON_SRC)/share/vm/* -type d \! \
diff --git a/hotspot/make/pic.make b/hotspot/make/pic.make
index 0e61ad93127..9211b5b70d6 100644
--- a/hotspot/make/pic.make
+++ b/hotspot/make/pic.make
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -37,7 +37,7 @@ ifneq ($(OSNAME), windows)
PARTIAL_NONPIC=0
endif
ifeq ($(PARTIAL_NONPIC),1)
- NONPIC_DIRS = memory oops gc_implementation gc_interface
+ NONPIC_DIRS = memory oops gc
NONPIC_DIRS := $(foreach dir,$(NONPIC_DIRS), $(GAMMADIR)/src/share/vm/$(dir))
# Look for source files under NONPIC_DIRS
NONPIC_FILES := $(foreach dir,$(NONPIC_DIRS),\
diff --git a/hotspot/make/sa.files b/hotspot/make/sa.files
index dfe1e53a209..1c73c21c465 100644
--- a/hotspot/make/sa.files
+++ b/hotspot/make/sa.files
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -79,10 +79,9 @@ $(AGENT_SRC_DIR)/sun/jvm/hotspot/debugger/windbg/x86/*.java \
$(AGENT_SRC_DIR)/sun/jvm/hotspot/debugger/windows/x86/*.java \
$(AGENT_SRC_DIR)/sun/jvm/hotspot/debugger/windows/amd64/*.java \
$(AGENT_SRC_DIR)/sun/jvm/hotspot/debugger/x86/*.java \
-$(AGENT_SRC_DIR)/sun/jvm/hotspot/gc_implementation/g1/*.java \
-$(AGENT_SRC_DIR)/sun/jvm/hotspot/gc_implementation/parallelScavenge/*.java \
-$(AGENT_SRC_DIR)/sun/jvm/hotspot/gc_implementation/shared/*.java \
-$(AGENT_SRC_DIR)/sun/jvm/hotspot/gc_interface/*.java \
+$(AGENT_SRC_DIR)/sun/jvm/hotspot/gc/g1/*.java \
+$(AGENT_SRC_DIR)/sun/jvm/hotspot/gc/parallel/*.java \
+$(AGENT_SRC_DIR)/sun/jvm/hotspot/gc/shared/*.java \
$(AGENT_SRC_DIR)/sun/jvm/hotspot/interpreter/*.java \
$(AGENT_SRC_DIR)/sun/jvm/hotspot/jdi/*.java \
$(AGENT_SRC_DIR)/sun/jvm/hotspot/memory/*.java \
diff --git a/hotspot/make/solaris/makefiles/vm.make b/hotspot/make/solaris/makefiles/vm.make
index 04a2b608b35..75d974e3de6 100644
--- a/hotspot/make/solaris/makefiles/vm.make
+++ b/hotspot/make/solaris/makefiles/vm.make
@@ -1,5 +1,5 @@
#
-# Copyright (c) 1998, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1998, 2015, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -163,7 +163,7 @@ LIBJVM = lib$(JVM).so
LIBJVM_DEBUGINFO = lib$(JVM).debuginfo
LIBJVM_DIZ = lib$(JVM).diz
-SPECIAL_PATHS:=adlc c1 dist gc_implementation opto shark libadt
+SPECIAL_PATHS:=adlc c1 dist gc opto shark libadt
SOURCE_PATHS=\
$(shell find $(HS_COMMON_SRC)/share/vm/* -type d \! \
diff --git a/hotspot/make/windows/create_obj_files.sh b/hotspot/make/windows/create_obj_files.sh
index c17b0690e17..e99ca829e6d 100644
--- a/hotspot/make/windows/create_obj_files.sh
+++ b/hotspot/make/windows/create_obj_files.sh
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -57,11 +57,11 @@ ALTSRC_REL=src/closed # Change this to pick up alt sources from somewhere else
COMMONSRC=${WorkSpace}/${COMMONSRC_REL}
ALTSRC=${WorkSpace}/${ALTSRC_REL}
-BASE_PATHS="`if [ -d ${ALTSRC}/share/vm ]; then $FIND ${ALTSRC}/share/vm ! -name vm -prune -type d \! \( -name adlc -o -name c1 -o -name gc_implementation -o -name opto -o -name shark -o -name libadt \); fi`"
-BASE_PATHS="${BASE_PATHS} ` $FIND ${COMMONSRC}/share/vm ! -name vm -prune -type d \! \( -name adlc -o -name c1 -o -name gc_implementation -o -name opto -o -name shark -o -name libadt \)`"
+BASE_PATHS="`if [ -d ${ALTSRC}/share/vm ]; then $FIND ${ALTSRC}/share/vm ! -name vm -prune -type d \! \( -name adlc -o -name c1 -o -name gc -o -name opto -o -name shark -o -name libadt \); fi`"
+BASE_PATHS="${BASE_PATHS} ` $FIND ${COMMONSRC}/share/vm ! -name vm -prune -type d \! \( -name adlc -o -name c1 -o -name gc -o -name opto -o -name shark -o -name libadt \)`"
for sd in \
- share/vm/gc_implementation/shared \
+ share/vm/gc/shared \
os/${Platform_os_family}/vm \
cpu/${Platform_arch}/vm \
os_cpu/${Platform_os_arch}/vm; do
@@ -80,10 +80,10 @@ fi
BASE_PATHS="${BASE_PATHS} ${COMMONSRC}/share/vm/prims/wbtestmethods"
# shared is already in BASE_PATHS. Should add vm/memory but that one is also in BASE_PATHS.
-if [ -d "${ALTSRC}/share/vm/gc_implementation" ]; then
- BASE_PATHS="${BASE_PATHS} `$FIND ${ALTSRC}/share/vm/gc_implementation ! -name gc_implementation -prune -type d \! -name shared`"
+if [ -d "${ALTSRC}/share/vm/gc" ]; then
+ BASE_PATHS="${BASE_PATHS} `$FIND ${ALTSRC}/share/vm/gc ! -name gc -prune -type d \! -name shared`"
fi
-BASE_PATHS="${BASE_PATHS} `$FIND ${COMMONSRC}/share/vm/gc_implementation ! -name gc_implementation -prune -type d \! -name shared`"
+BASE_PATHS="${BASE_PATHS} `$FIND ${COMMONSRC}/share/vm/gc ! -name gc -prune -type d \! -name shared`"
if [ -d "${ALTSRC}/share/vm/c1" ]; then
COMPILER1_PATHS="${ALTSRC}/share/vm/c1"
diff --git a/hotspot/make/windows/makefiles/vm.make b/hotspot/make/windows/makefiles/vm.make
index 9267a71aac9..65fbf2a0ae7 100644
--- a/hotspot/make/windows/makefiles/vm.make
+++ b/hotspot/make/windows/makefiles/vm.make
@@ -1,5 +1,5 @@
#
-# Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -157,12 +157,11 @@ VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/code
VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/interpreter
VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/ci
VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/classfile
-VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/gc_implementation/parallelScavenge
-VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/gc_implementation/shared
-VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/gc_implementation/parNew
-VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/gc_implementation/concurrentMarkSweep
-VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/gc_implementation/g1
-VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/gc_interface
+VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/gc/parallel
+VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/gc/shared
+VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/gc/serial
+VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/gc/cms
+VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/gc/g1
VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/asm
VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/memory
VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/oops
@@ -233,22 +232,19 @@ bytecodeInterpreterWithChecks.obj: ..\generated\jvmtifiles\bytecodeInterpreterWi
{$(COMMONSRC)\share\vm\classfile}.cpp.obj::
$(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
-{$(COMMONSRC)\share\vm\gc_implementation\parallelScavenge}.cpp.obj::
+{$(COMMONSRC)\share\vm\gc\parallel}.cpp.obj::
$(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
-{$(COMMONSRC)\share\vm\gc_implementation\shared}.cpp.obj::
+{$(COMMONSRC)\share\vm\gc\shared}.cpp.obj::
$(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
-{$(COMMONSRC)\share\vm\gc_implementation\parNew}.cpp.obj::
+{$(COMMONSRC)\share\vm\gc\serial}.cpp.obj::
$(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
-{$(COMMONSRC)\share\vm\gc_implementation\concurrentMarkSweep}.cpp.obj::
+{$(COMMONSRC)\share\vm\gc\cms}.cpp.obj::
$(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
-{$(COMMONSRC)\share\vm\gc_implementation\g1}.cpp.obj::
- $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
-
-{$(COMMONSRC)\share\vm\gc_interface}.cpp.obj::
+{$(COMMONSRC)\share\vm\gc\g1}.cpp.obj::
$(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
{$(COMMONSRC)\share\vm\asm}.cpp.obj::
@@ -316,22 +312,19 @@ bytecodeInterpreterWithChecks.obj: ..\generated\jvmtifiles\bytecodeInterpreterWi
{$(ALTSRC)\share\vm\classfile}.cpp.obj::
$(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
-{$(ALTSRC)\share\vm\gc_implementation\parallelScavenge}.cpp.obj::
+{$(ALTSRC)\share\vm\gc\parallel}.cpp.obj::
$(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
-{$(ALTSRC)\share\vm\gc_implementation\shared}.cpp.obj::
+{$(ALTSRC)\share\vm\gc\shared}.cpp.obj::
$(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
-{$(ALTSRC)\share\vm\gc_implementation\parNew}.cpp.obj::
+{$(ALTSRC)\share\vm\gc\serial}.cpp.obj::
$(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
-{$(ALTSRC)\share\vm\gc_implementation\concurrentMarkSweep}.cpp.obj::
+{$(ALTSRC)\share\vm\gc\cms}.cpp.obj::
$(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
-{$(ALTSRC)\share\vm\gc_implementation\g1}.cpp.obj::
- $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
-
-{$(ALTSRC)\share\vm\gc_interface}.cpp.obj::
+{$(ALTSRC)\share\vm\gc\g1}.cpp.obj::
$(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
{$(ALTSRC)\share\vm\asm}.cpp.obj::
diff --git a/hotspot/src/cpu/aarch64/vm/aarch64.ad b/hotspot/src/cpu/aarch64/vm/aarch64.ad
index 074e498936f..5428534705b 100644
--- a/hotspot/src/cpu/aarch64/vm/aarch64.ad
+++ b/hotspot/src/cpu/aarch64/vm/aarch64.ad
@@ -1,5 +1,5 @@
//
-// Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
+// Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
// Copyright (c) 2014, Red Hat Inc. All rights reserved.
// DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
//
@@ -758,7 +758,7 @@ definitions %{
source_hpp %{
-#include "memory/cardTableModRefBS.hpp"
+#include "gc/shared/cardTableModRefBS.hpp"
class CallStubImpl {
diff --git a/hotspot/src/cpu/aarch64/vm/c1_CodeStubs_aarch64.cpp b/hotspot/src/cpu/aarch64/vm/c1_CodeStubs_aarch64.cpp
index 4b076fcdc45..5cb78d2055d 100644
--- a/hotspot/src/cpu/aarch64/vm/c1_CodeStubs_aarch64.cpp
+++ b/hotspot/src/cpu/aarch64/vm/c1_CodeStubs_aarch64.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2014, Red Hat Inc. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -33,7 +33,7 @@
#include "runtime/sharedRuntime.hpp"
#include "vmreg_aarch64.inline.hpp"
#if INCLUDE_ALL_GCS
-#include "gc_implementation/g1/g1SATBCardTableModRefBS.hpp"
+#include "gc/g1/g1SATBCardTableModRefBS.hpp"
#endif
diff --git a/hotspot/src/cpu/aarch64/vm/c1_LIRAssembler_aarch64.cpp b/hotspot/src/cpu/aarch64/vm/c1_LIRAssembler_aarch64.cpp
index d5e0184d6ff..353486c402d 100644
--- a/hotspot/src/cpu/aarch64/vm/c1_LIRAssembler_aarch64.cpp
+++ b/hotspot/src/cpu/aarch64/vm/c1_LIRAssembler_aarch64.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2014, Red Hat Inc. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -33,9 +33,9 @@
#include "c1/c1_ValueStack.hpp"
#include "ci/ciArrayKlass.hpp"
#include "ci/ciInstance.hpp"
-#include "gc_interface/collectedHeap.hpp"
-#include "memory/barrierSet.hpp"
-#include "memory/cardTableModRefBS.hpp"
+#include "gc/shared/barrierSet.hpp"
+#include "gc/shared/cardTableModRefBS.hpp"
+#include "gc/shared/collectedHeap.hpp"
#include "nativeInst_aarch64.hpp"
#include "oops/objArrayKlass.hpp"
#include "runtime/sharedRuntime.hpp"
diff --git a/hotspot/src/cpu/aarch64/vm/c1_MacroAssembler_aarch64.cpp b/hotspot/src/cpu/aarch64/vm/c1_MacroAssembler_aarch64.cpp
index 8886eb33964..046be55e4e5 100644
--- a/hotspot/src/cpu/aarch64/vm/c1_MacroAssembler_aarch64.cpp
+++ b/hotspot/src/cpu/aarch64/vm/c1_MacroAssembler_aarch64.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2014, Red Hat Inc. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -27,7 +27,7 @@
#include "c1/c1_MacroAssembler.hpp"
#include "c1/c1_Runtime1.hpp"
#include "classfile/systemDictionary.hpp"
-#include "gc_interface/collectedHeap.hpp"
+#include "gc/shared/collectedHeap.hpp"
#include "interpreter/interpreter.hpp"
#include "oops/arrayOop.hpp"
#include "oops/markOop.hpp"
diff --git a/hotspot/src/cpu/aarch64/vm/c1_Runtime1_aarch64.cpp b/hotspot/src/cpu/aarch64/vm/c1_Runtime1_aarch64.cpp
index a290591ad56..cfe2d299ab7 100644
--- a/hotspot/src/cpu/aarch64/vm/c1_Runtime1_aarch64.cpp
+++ b/hotspot/src/cpu/aarch64/vm/c1_Runtime1_aarch64.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2014, Red Hat Inc. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -42,7 +42,7 @@
#include "runtime/vframeArray.hpp"
#include "vmreg_aarch64.inline.hpp"
#if INCLUDE_ALL_GCS
-#include "gc_implementation/g1/g1SATBCardTableModRefBS.hpp"
+#include "gc/g1/g1SATBCardTableModRefBS.hpp"
#endif
diff --git a/hotspot/src/cpu/aarch64/vm/icBuffer_aarch64.cpp b/hotspot/src/cpu/aarch64/vm/icBuffer_aarch64.cpp
index fc0fc8820fd..21c2a3cc770 100644
--- a/hotspot/src/cpu/aarch64/vm/icBuffer_aarch64.cpp
+++ b/hotspot/src/cpu/aarch64/vm/icBuffer_aarch64.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2014, Red Hat Inc. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -27,7 +27,7 @@
#include "asm/macroAssembler.hpp"
#include "asm/macroAssembler.inline.hpp"
#include "code/icBuffer.hpp"
-#include "gc_interface/collectedHeap.inline.hpp"
+#include "gc/shared/collectedHeap.inline.hpp"
#include "interpreter/bytecodes.hpp"
#include "memory/resourceArea.hpp"
#include "nativeInst_aarch64.hpp"
diff --git a/hotspot/src/cpu/aarch64/vm/macroAssembler_aarch64.cpp b/hotspot/src/cpu/aarch64/vm/macroAssembler_aarch64.cpp
index bf307e55932..264e54bbe63 100644
--- a/hotspot/src/cpu/aarch64/vm/macroAssembler_aarch64.cpp
+++ b/hotspot/src/cpu/aarch64/vm/macroAssembler_aarch64.cpp
@@ -41,9 +41,9 @@
#include "runtime/sharedRuntime.hpp"
#if INCLUDE_ALL_GCS
-#include "gc_implementation/g1/g1CollectedHeap.inline.hpp"
-#include "gc_implementation/g1/g1SATBCardTableModRefBS.hpp"
-#include "gc_implementation/g1/heapRegion.hpp"
+#include "gc/g1/g1CollectedHeap.inline.hpp"
+#include "gc/g1/g1SATBCardTableModRefBS.hpp"
+#include "gc/g1/heapRegion.hpp"
#endif
#ifdef PRODUCT
diff --git a/hotspot/src/cpu/ppc/vm/assembler_ppc.cpp b/hotspot/src/cpu/ppc/vm/assembler_ppc.cpp
index 7b19ddb0018..56564ac7ea7 100644
--- a/hotspot/src/cpu/ppc/vm/assembler_ppc.cpp
+++ b/hotspot/src/cpu/ppc/vm/assembler_ppc.cpp
@@ -25,9 +25,9 @@
#include "precompiled.hpp"
#include "asm/assembler.inline.hpp"
-#include "gc_interface/collectedHeap.inline.hpp"
+#include "gc/shared/cardTableModRefBS.hpp"
+#include "gc/shared/collectedHeap.inline.hpp"
#include "interpreter/interpreter.hpp"
-#include "memory/cardTableModRefBS.hpp"
#include "memory/resourceArea.hpp"
#include "prims/methodHandles.hpp"
#include "runtime/biasedLocking.hpp"
@@ -38,9 +38,9 @@
#include "runtime/stubRoutines.hpp"
#include "utilities/macros.hpp"
#if INCLUDE_ALL_GCS
-#include "gc_implementation/g1/g1CollectedHeap.inline.hpp"
-#include "gc_implementation/g1/g1SATBCardTableModRefBS.hpp"
-#include "gc_implementation/g1/heapRegion.hpp"
+#include "gc/g1/g1CollectedHeap.inline.hpp"
+#include "gc/g1/g1SATBCardTableModRefBS.hpp"
+#include "gc/g1/heapRegion.hpp"
#endif // INCLUDE_ALL_GCS
#ifdef PRODUCT
diff --git a/hotspot/src/cpu/ppc/vm/icBuffer_ppc.cpp b/hotspot/src/cpu/ppc/vm/icBuffer_ppc.cpp
index 536e5728bc1..8e16078b3d7 100644
--- a/hotspot/src/cpu/ppc/vm/icBuffer_ppc.cpp
+++ b/hotspot/src/cpu/ppc/vm/icBuffer_ppc.cpp
@@ -27,7 +27,7 @@
#include "asm/assembler.hpp"
#include "assembler_ppc.inline.hpp"
#include "code/icBuffer.hpp"
-#include "gc_interface/collectedHeap.inline.hpp"
+#include "gc/shared/collectedHeap.inline.hpp"
#include "interpreter/bytecodes.hpp"
#include "memory/resourceArea.hpp"
#include "nativeInst_ppc.hpp"
diff --git a/hotspot/src/cpu/ppc/vm/macroAssembler_ppc.cpp b/hotspot/src/cpu/ppc/vm/macroAssembler_ppc.cpp
index 4d0e6df26b5..587000b963f 100644
--- a/hotspot/src/cpu/ppc/vm/macroAssembler_ppc.cpp
+++ b/hotspot/src/cpu/ppc/vm/macroAssembler_ppc.cpp
@@ -26,9 +26,9 @@
#include "precompiled.hpp"
#include "asm/macroAssembler.inline.hpp"
#include "compiler/disassembler.hpp"
-#include "gc_interface/collectedHeap.inline.hpp"
+#include "gc/shared/cardTableModRefBS.hpp"
+#include "gc/shared/collectedHeap.inline.hpp"
#include "interpreter/interpreter.hpp"
-#include "memory/cardTableModRefBS.hpp"
#include "memory/resourceArea.hpp"
#include "prims/methodHandles.hpp"
#include "runtime/biasedLocking.hpp"
@@ -40,9 +40,9 @@
#include "runtime/stubRoutines.hpp"
#include "utilities/macros.hpp"
#if INCLUDE_ALL_GCS
-#include "gc_implementation/g1/g1CollectedHeap.inline.hpp"
-#include "gc_implementation/g1/g1SATBCardTableModRefBS.hpp"
-#include "gc_implementation/g1/heapRegion.hpp"
+#include "gc/g1/g1CollectedHeap.inline.hpp"
+#include "gc/g1/g1SATBCardTableModRefBS.hpp"
+#include "gc/g1/heapRegion.hpp"
#endif // INCLUDE_ALL_GCS
#ifdef PRODUCT
diff --git a/hotspot/src/cpu/sparc/vm/c1_CodeStubs_sparc.cpp b/hotspot/src/cpu/sparc/vm/c1_CodeStubs_sparc.cpp
index 1187443000d..f998a9c3a12 100644
--- a/hotspot/src/cpu/sparc/vm/c1_CodeStubs_sparc.cpp
+++ b/hotspot/src/cpu/sparc/vm/c1_CodeStubs_sparc.cpp
@@ -33,7 +33,7 @@
#include "utilities/macros.hpp"
#include "vmreg_sparc.inline.hpp"
#if INCLUDE_ALL_GCS
-#include "gc_implementation/g1/g1SATBCardTableModRefBS.hpp"
+#include "gc/g1/g1SATBCardTableModRefBS.hpp"
#endif // INCLUDE_ALL_GCS
#define __ ce->masm()->
diff --git a/hotspot/src/cpu/sparc/vm/c1_LIRAssembler_sparc.cpp b/hotspot/src/cpu/sparc/vm/c1_LIRAssembler_sparc.cpp
index 69d5987a40d..6efec095dcc 100644
--- a/hotspot/src/cpu/sparc/vm/c1_LIRAssembler_sparc.cpp
+++ b/hotspot/src/cpu/sparc/vm/c1_LIRAssembler_sparc.cpp
@@ -30,9 +30,9 @@
#include "c1/c1_ValueStack.hpp"
#include "ci/ciArrayKlass.hpp"
#include "ci/ciInstance.hpp"
-#include "gc_interface/collectedHeap.hpp"
-#include "memory/barrierSet.hpp"
-#include "memory/cardTableModRefBS.hpp"
+#include "gc/shared/barrierSet.hpp"
+#include "gc/shared/cardTableModRefBS.hpp"
+#include "gc/shared/collectedHeap.hpp"
#include "nativeInst_sparc.hpp"
#include "oops/objArrayKlass.hpp"
#include "runtime/sharedRuntime.hpp"
diff --git a/hotspot/src/cpu/sparc/vm/c1_MacroAssembler_sparc.cpp b/hotspot/src/cpu/sparc/vm/c1_MacroAssembler_sparc.cpp
index ca72c6bdc00..2e4bb6bac7d 100644
--- a/hotspot/src/cpu/sparc/vm/c1_MacroAssembler_sparc.cpp
+++ b/hotspot/src/cpu/sparc/vm/c1_MacroAssembler_sparc.cpp
@@ -26,7 +26,7 @@
#include "c1/c1_MacroAssembler.hpp"
#include "c1/c1_Runtime1.hpp"
#include "classfile/systemDictionary.hpp"
-#include "gc_interface/collectedHeap.hpp"
+#include "gc/shared/collectedHeap.hpp"
#include "interpreter/interpreter.hpp"
#include "oops/arrayOop.hpp"
#include "oops/markOop.hpp"
diff --git a/hotspot/src/cpu/sparc/vm/c1_Runtime1_sparc.cpp b/hotspot/src/cpu/sparc/vm/c1_Runtime1_sparc.cpp
index c27f81abd6d..766b00a6bd8 100644
--- a/hotspot/src/cpu/sparc/vm/c1_Runtime1_sparc.cpp
+++ b/hotspot/src/cpu/sparc/vm/c1_Runtime1_sparc.cpp
@@ -37,7 +37,7 @@
#include "utilities/macros.hpp"
#include "vmreg_sparc.inline.hpp"
#if INCLUDE_ALL_GCS
-#include "gc_implementation/g1/g1SATBCardTableModRefBS.hpp"
+#include "gc/g1/g1SATBCardTableModRefBS.hpp"
#endif
// Implementation of StubAssembler
diff --git a/hotspot/src/cpu/sparc/vm/icBuffer_sparc.cpp b/hotspot/src/cpu/sparc/vm/icBuffer_sparc.cpp
index 21565fb44f5..641da12ab76 100644
--- a/hotspot/src/cpu/sparc/vm/icBuffer_sparc.cpp
+++ b/hotspot/src/cpu/sparc/vm/icBuffer_sparc.cpp
@@ -25,7 +25,7 @@
#include "precompiled.hpp"
#include "asm/macroAssembler.inline.hpp"
#include "code/icBuffer.hpp"
-#include "gc_interface/collectedHeap.inline.hpp"
+#include "gc/shared/collectedHeap.inline.hpp"
#include "interpreter/bytecodes.hpp"
#include "memory/resourceArea.hpp"
#include "nativeInst_sparc.hpp"
diff --git a/hotspot/src/cpu/sparc/vm/macroAssembler_sparc.cpp b/hotspot/src/cpu/sparc/vm/macroAssembler_sparc.cpp
index fa90497fb76..d4507cf04b0 100644
--- a/hotspot/src/cpu/sparc/vm/macroAssembler_sparc.cpp
+++ b/hotspot/src/cpu/sparc/vm/macroAssembler_sparc.cpp
@@ -25,9 +25,9 @@
#include "precompiled.hpp"
#include "asm/macroAssembler.inline.hpp"
#include "compiler/disassembler.hpp"
-#include "gc_interface/collectedHeap.inline.hpp"
+#include "gc/shared/cardTableModRefBS.hpp"
+#include "gc/shared/collectedHeap.inline.hpp"
#include "interpreter/interpreter.hpp"
-#include "memory/cardTableModRefBS.hpp"
#include "memory/resourceArea.hpp"
#include "memory/universe.hpp"
#include "prims/methodHandles.hpp"
@@ -39,9 +39,9 @@
#include "runtime/stubRoutines.hpp"
#include "utilities/macros.hpp"
#if INCLUDE_ALL_GCS
-#include "gc_implementation/g1/g1CollectedHeap.inline.hpp"
-#include "gc_implementation/g1/g1SATBCardTableModRefBS.hpp"
-#include "gc_implementation/g1/heapRegion.hpp"
+#include "gc/g1/g1CollectedHeap.inline.hpp"
+#include "gc/g1/g1SATBCardTableModRefBS.hpp"
+#include "gc/g1/heapRegion.hpp"
#endif // INCLUDE_ALL_GCS
#ifdef PRODUCT
diff --git a/hotspot/src/cpu/x86/vm/assembler_x86.cpp b/hotspot/src/cpu/x86/vm/assembler_x86.cpp
index 2d06abb0086..e2217287b32 100644
--- a/hotspot/src/cpu/x86/vm/assembler_x86.cpp
+++ b/hotspot/src/cpu/x86/vm/assembler_x86.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,9 +25,9 @@
#include "precompiled.hpp"
#include "asm/assembler.hpp"
#include "asm/assembler.inline.hpp"
-#include "gc_interface/collectedHeap.inline.hpp"
+#include "gc/shared/cardTableModRefBS.hpp"
+#include "gc/shared/collectedHeap.inline.hpp"
#include "interpreter/interpreter.hpp"
-#include "memory/cardTableModRefBS.hpp"
#include "memory/resourceArea.hpp"
#include "prims/methodHandles.hpp"
#include "runtime/biasedLocking.hpp"
@@ -38,9 +38,9 @@
#include "runtime/stubRoutines.hpp"
#include "utilities/macros.hpp"
#if INCLUDE_ALL_GCS
-#include "gc_implementation/g1/g1CollectedHeap.inline.hpp"
-#include "gc_implementation/g1/g1SATBCardTableModRefBS.hpp"
-#include "gc_implementation/g1/heapRegion.hpp"
+#include "gc/g1/g1CollectedHeap.inline.hpp"
+#include "gc/g1/g1SATBCardTableModRefBS.hpp"
+#include "gc/g1/heapRegion.hpp"
#endif // INCLUDE_ALL_GCS
#ifdef PRODUCT
diff --git a/hotspot/src/cpu/x86/vm/c1_CodeStubs_x86.cpp b/hotspot/src/cpu/x86/vm/c1_CodeStubs_x86.cpp
index 919c2a6df9c..71684561223 100644
--- a/hotspot/src/cpu/x86/vm/c1_CodeStubs_x86.cpp
+++ b/hotspot/src/cpu/x86/vm/c1_CodeStubs_x86.cpp
@@ -33,7 +33,7 @@
#include "utilities/macros.hpp"
#include "vmreg_x86.inline.hpp"
#if INCLUDE_ALL_GCS
-#include "gc_implementation/g1/g1SATBCardTableModRefBS.hpp"
+#include "gc/g1/g1SATBCardTableModRefBS.hpp"
#endif // INCLUDE_ALL_GCS
diff --git a/hotspot/src/cpu/x86/vm/c1_LIRAssembler_x86.cpp b/hotspot/src/cpu/x86/vm/c1_LIRAssembler_x86.cpp
index c76408f6af7..d8e9f412d79 100644
--- a/hotspot/src/cpu/x86/vm/c1_LIRAssembler_x86.cpp
+++ b/hotspot/src/cpu/x86/vm/c1_LIRAssembler_x86.cpp
@@ -32,9 +32,9 @@
#include "c1/c1_ValueStack.hpp"
#include "ci/ciArrayKlass.hpp"
#include "ci/ciInstance.hpp"
-#include "gc_interface/collectedHeap.hpp"
-#include "memory/barrierSet.hpp"
-#include "memory/cardTableModRefBS.hpp"
+#include "gc/shared/barrierSet.hpp"
+#include "gc/shared/cardTableModRefBS.hpp"
+#include "gc/shared/collectedHeap.hpp"
#include "nativeInst_x86.hpp"
#include "oops/objArrayKlass.hpp"
#include "runtime/sharedRuntime.hpp"
diff --git a/hotspot/src/cpu/x86/vm/c1_MacroAssembler_x86.cpp b/hotspot/src/cpu/x86/vm/c1_MacroAssembler_x86.cpp
index cf1a59a30b3..76d160ac113 100644
--- a/hotspot/src/cpu/x86/vm/c1_MacroAssembler_x86.cpp
+++ b/hotspot/src/cpu/x86/vm/c1_MacroAssembler_x86.cpp
@@ -26,7 +26,7 @@
#include "c1/c1_MacroAssembler.hpp"
#include "c1/c1_Runtime1.hpp"
#include "classfile/systemDictionary.hpp"
-#include "gc_interface/collectedHeap.hpp"
+#include "gc/shared/collectedHeap.hpp"
#include "interpreter/interpreter.hpp"
#include "oops/arrayOop.hpp"
#include "oops/markOop.hpp"
diff --git a/hotspot/src/cpu/x86/vm/c1_Runtime1_x86.cpp b/hotspot/src/cpu/x86/vm/c1_Runtime1_x86.cpp
index 9d0643eeb8d..af41077f40a 100644
--- a/hotspot/src/cpu/x86/vm/c1_Runtime1_x86.cpp
+++ b/hotspot/src/cpu/x86/vm/c1_Runtime1_x86.cpp
@@ -39,7 +39,7 @@
#include "utilities/macros.hpp"
#include "vmreg_x86.inline.hpp"
#if INCLUDE_ALL_GCS
-#include "gc_implementation/g1/g1SATBCardTableModRefBS.hpp"
+#include "gc/g1/g1SATBCardTableModRefBS.hpp"
#endif
diff --git a/hotspot/src/cpu/x86/vm/icBuffer_x86.cpp b/hotspot/src/cpu/x86/vm/icBuffer_x86.cpp
index 6d10865c32f..dc45fa7f65c 100644
--- a/hotspot/src/cpu/x86/vm/icBuffer_x86.cpp
+++ b/hotspot/src/cpu/x86/vm/icBuffer_x86.cpp
@@ -26,7 +26,7 @@
#include "asm/macroAssembler.hpp"
#include "asm/macroAssembler.inline.hpp"
#include "code/icBuffer.hpp"
-#include "gc_interface/collectedHeap.inline.hpp"
+#include "gc/shared/collectedHeap.inline.hpp"
#include "interpreter/bytecodes.hpp"
#include "memory/resourceArea.hpp"
#include "nativeInst_x86.hpp"
diff --git a/hotspot/src/cpu/x86/vm/macroAssembler_x86.cpp b/hotspot/src/cpu/x86/vm/macroAssembler_x86.cpp
index ec36f2beaaf..29c67a7e944 100644
--- a/hotspot/src/cpu/x86/vm/macroAssembler_x86.cpp
+++ b/hotspot/src/cpu/x86/vm/macroAssembler_x86.cpp
@@ -26,9 +26,9 @@
#include "asm/assembler.hpp"
#include "asm/assembler.inline.hpp"
#include "compiler/disassembler.hpp"
-#include "gc_interface/collectedHeap.inline.hpp"
+#include "gc/shared/cardTableModRefBS.hpp"
+#include "gc/shared/collectedHeap.inline.hpp"
#include "interpreter/interpreter.hpp"
-#include "memory/cardTableModRefBS.hpp"
#include "memory/resourceArea.hpp"
#include "memory/universe.hpp"
#include "prims/methodHandles.hpp"
@@ -40,9 +40,9 @@
#include "runtime/stubRoutines.hpp"
#include "utilities/macros.hpp"
#if INCLUDE_ALL_GCS
-#include "gc_implementation/g1/g1CollectedHeap.inline.hpp"
-#include "gc_implementation/g1/g1SATBCardTableModRefBS.hpp"
-#include "gc_implementation/g1/heapRegion.hpp"
+#include "gc/g1/g1CollectedHeap.inline.hpp"
+#include "gc/g1/g1SATBCardTableModRefBS.hpp"
+#include "gc/g1/heapRegion.hpp"
#endif // INCLUDE_ALL_GCS
#ifdef PRODUCT
diff --git a/hotspot/src/cpu/zero/vm/assembler_zero.cpp b/hotspot/src/cpu/zero/vm/assembler_zero.cpp
index 4a60af98fd4..669273d955d 100644
--- a/hotspot/src/cpu/zero/vm/assembler_zero.cpp
+++ b/hotspot/src/cpu/zero/vm/assembler_zero.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
* Copyright 2007, 2008, 2009 Red Hat, Inc.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -25,9 +25,9 @@
#include "precompiled.hpp"
#include "assembler_zero.inline.hpp"
-#include "gc_interface/collectedHeap.inline.hpp"
+#include "gc/shared/cardTableModRefBS.hpp"
+#include "gc/shared/collectedHeap.inline.hpp"
#include "interpreter/interpreter.hpp"
-#include "memory/cardTableModRefBS.hpp"
#include "memory/resourceArea.hpp"
#include "prims/methodHandles.hpp"
#include "runtime/biasedLocking.hpp"
@@ -38,9 +38,9 @@
#include "runtime/stubRoutines.hpp"
#include "utilities/macros.hpp"
#if INCLUDE_ALL_GCS
-#include "gc_implementation/g1/g1CollectedHeap.inline.hpp"
-#include "gc_implementation/g1/g1SATBCardTableModRefBS.hpp"
-#include "gc_implementation/g1/heapRegion.hpp"
+#include "gc/g1/g1CollectedHeap.inline.hpp"
+#include "gc/g1/g1SATBCardTableModRefBS.hpp"
+#include "gc/g1/heapRegion.hpp"
#endif // INCLUDE_ALL_GCS
int AbstractAssembler::code_fill_byte() {
diff --git a/hotspot/src/cpu/zero/vm/icBuffer_zero.cpp b/hotspot/src/cpu/zero/vm/icBuffer_zero.cpp
index 924e0836067..8e28fa6eacc 100644
--- a/hotspot/src/cpu/zero/vm/icBuffer_zero.cpp
+++ b/hotspot/src/cpu/zero/vm/icBuffer_zero.cpp
@@ -27,7 +27,7 @@
#include "asm/assembler.hpp"
#include "assembler_zero.inline.hpp"
#include "code/icBuffer.hpp"
-#include "gc_interface/collectedHeap.inline.hpp"
+#include "gc/shared/collectedHeap.inline.hpp"
#include "interpreter/bytecodes.hpp"
#include "memory/resourceArea.hpp"
#include "nativeInst_zero.hpp"
diff --git a/hotspot/src/os/bsd/dtrace/generateJvmOffsets.cpp b/hotspot/src/os/bsd/dtrace/generateJvmOffsets.cpp
index a4fa0d560c7..8fd9e727b17 100644
--- a/hotspot/src/os/bsd/dtrace/generateJvmOffsets.cpp
+++ b/hotspot/src/os/bsd/dtrace/generateJvmOffsets.cpp
@@ -41,7 +41,7 @@
#include "code/codeBlob.hpp"
#include "code/nmethod.hpp"
#include "code/pcDesc.hpp"
-#include "gc_interface/collectedHeap.hpp"
+#include "gc/shared/collectedHeap.hpp"
#include "memory/heap.hpp"
#include "memory/memRegion.hpp"
#include "memory/universe.hpp"
diff --git a/hotspot/src/os/solaris/dtrace/generateJvmOffsets.cpp b/hotspot/src/os/solaris/dtrace/generateJvmOffsets.cpp
index c23810915e1..ac66ccba240 100644
--- a/hotspot/src/os/solaris/dtrace/generateJvmOffsets.cpp
+++ b/hotspot/src/os/solaris/dtrace/generateJvmOffsets.cpp
@@ -41,7 +41,7 @@
#include "code/codeBlob.hpp"
#include "code/nmethod.hpp"
#include "code/pcDesc.hpp"
-#include "gc_interface/collectedHeap.hpp"
+#include "gc/shared/collectedHeap.hpp"
#include "memory/heap.hpp"
#include "memory/memRegion.hpp"
#include "memory/universe.hpp"
diff --git a/hotspot/src/share/vm/adlc/main.cpp b/hotspot/src/share/vm/adlc/main.cpp
index 6dfbba3e4d2..ef0a71fef25 100644
--- a/hotspot/src/share/vm/adlc/main.cpp
+++ b/hotspot/src/share/vm/adlc/main.cpp
@@ -215,7 +215,7 @@ int main(int argc, char *argv[])
AD.addInclude(AD._CPP_file, "code/compiledIC.hpp");
AD.addInclude(AD._CPP_file, "code/nativeInst.hpp");
AD.addInclude(AD._CPP_file, "code/vmreg.inline.hpp");
- AD.addInclude(AD._CPP_file, "gc_interface/collectedHeap.inline.hpp");
+ AD.addInclude(AD._CPP_file, "gc/shared/collectedHeap.inline.hpp");
AD.addInclude(AD._CPP_file, "oops/compiledICHolder.hpp");
AD.addInclude(AD._CPP_file, "oops/markOop.hpp");
AD.addInclude(AD._CPP_file, "oops/method.hpp");
diff --git a/hotspot/src/share/vm/asm/codeBuffer.cpp b/hotspot/src/share/vm/asm/codeBuffer.cpp
index 974a48156f8..c24e0adb1df 100644
--- a/hotspot/src/share/vm/asm/codeBuffer.cpp
+++ b/hotspot/src/share/vm/asm/codeBuffer.cpp
@@ -25,7 +25,7 @@
#include "precompiled.hpp"
#include "asm/codeBuffer.hpp"
#include "compiler/disassembler.hpp"
-#include "memory/gcLocker.hpp"
+#include "gc/shared/gcLocker.hpp"
#include "oops/methodData.hpp"
#include "oops/oop.inline.hpp"
#include "runtime/icache.hpp"
diff --git a/hotspot/src/share/vm/c1/c1_LIRGenerator.cpp b/hotspot/src/share/vm/c1/c1_LIRGenerator.cpp
index cc35fc3ae30..c8db5f824b0 100644
--- a/hotspot/src/share/vm/c1/c1_LIRGenerator.cpp
+++ b/hotspot/src/share/vm/c1/c1_LIRGenerator.cpp
@@ -23,8 +23,8 @@
*/
#include "precompiled.hpp"
-#include "c1/c1_Defs.hpp"
#include "c1/c1_Compilation.hpp"
+#include "c1/c1_Defs.hpp"
#include "c1/c1_FrameMap.hpp"
#include "c1/c1_Instruction.hpp"
#include "c1/c1_LIRAssembler.hpp"
@@ -33,7 +33,7 @@
#include "ci/ciArrayKlass.hpp"
#include "ci/ciInstance.hpp"
#include "ci/ciObjArray.hpp"
-#include "memory/cardTableModRefBS.hpp"
+#include "gc/shared/cardTableModRefBS.hpp"
#include "runtime/arguments.hpp"
#include "runtime/sharedRuntime.hpp"
#include "runtime/stubRoutines.hpp"
@@ -41,7 +41,7 @@
#include "utilities/bitMap.inline.hpp"
#include "utilities/macros.hpp"
#if INCLUDE_ALL_GCS
-#include "gc_implementation/g1/heapRegion.hpp"
+#include "gc/g1/heapRegion.hpp"
#endif // INCLUDE_ALL_GCS
#ifdef ASSERT
diff --git a/hotspot/src/share/vm/c1/c1_Runtime1.cpp b/hotspot/src/share/vm/c1/c1_Runtime1.cpp
index cb9539ee34f..74d394d0a06 100644
--- a/hotspot/src/share/vm/c1/c1_Runtime1.cpp
+++ b/hotspot/src/share/vm/c1/c1_Runtime1.cpp
@@ -38,11 +38,11 @@
#include "code/scopeDesc.hpp"
#include "code/vtableStubs.hpp"
#include "compiler/disassembler.hpp"
-#include "gc_interface/collectedHeap.hpp"
+#include "gc/shared/barrierSet.hpp"
+#include "gc/shared/collectedHeap.hpp"
#include "interpreter/bytecode.hpp"
#include "interpreter/interpreter.hpp"
#include "memory/allocation.inline.hpp"
-#include "memory/barrierSet.hpp"
#include "memory/oopFactory.hpp"
#include "memory/resourceArea.hpp"
#include "oops/objArrayKlass.hpp"
diff --git a/hotspot/src/share/vm/ci/ciBaseObject.cpp b/hotspot/src/share/vm/ci/ciBaseObject.cpp
index 2d1fe71e2d8..8cef3daf72e 100644
--- a/hotspot/src/share/vm/ci/ciBaseObject.cpp
+++ b/hotspot/src/share/vm/ci/ciBaseObject.cpp
@@ -25,7 +25,7 @@
#include "precompiled.hpp"
#include "ci/ciBaseObject.hpp"
#include "ci/ciUtilities.hpp"
-#include "gc_interface/collectedHeap.inline.hpp"
+#include "gc/shared/collectedHeap.inline.hpp"
// ------------------------------------------------------------------
// ciBaseObject::set_ident
diff --git a/hotspot/src/share/vm/ci/ciEnv.cpp b/hotspot/src/share/vm/ci/ciEnv.cpp
index 9ba708320b1..b95ca80d6dc 100644
--- a/hotspot/src/share/vm/ci/ciEnv.cpp
+++ b/hotspot/src/share/vm/ci/ciEnv.cpp
@@ -39,7 +39,7 @@
#include "compiler/compileBroker.hpp"
#include "compiler/compileLog.hpp"
#include "compiler/compilerOracle.hpp"
-#include "gc_interface/collectedHeap.inline.hpp"
+#include "gc/shared/collectedHeap.inline.hpp"
#include "interpreter/linkResolver.hpp"
#include "memory/allocation.inline.hpp"
#include "memory/oopFactory.hpp"
diff --git a/hotspot/src/share/vm/ci/ciField.cpp b/hotspot/src/share/vm/ci/ciField.cpp
index 57da3a5d628..ba3d07157aa 100644
--- a/hotspot/src/share/vm/ci/ciField.cpp
+++ b/hotspot/src/share/vm/ci/ciField.cpp
@@ -27,7 +27,7 @@
#include "ci/ciInstanceKlass.hpp"
#include "ci/ciUtilities.hpp"
#include "classfile/systemDictionary.hpp"
-#include "gc_interface/collectedHeap.inline.hpp"
+#include "gc/shared/collectedHeap.inline.hpp"
#include "interpreter/linkResolver.hpp"
#include "memory/universe.inline.hpp"
#include "oops/oop.inline.hpp"
diff --git a/hotspot/src/share/vm/ci/ciMetadata.cpp b/hotspot/src/share/vm/ci/ciMetadata.cpp
index f7354c40869..a991d406e02 100644
--- a/hotspot/src/share/vm/ci/ciMetadata.cpp
+++ b/hotspot/src/share/vm/ci/ciMetadata.cpp
@@ -25,7 +25,7 @@
#include "precompiled.hpp"
#include "ci/ciObject.hpp"
#include "ci/ciUtilities.hpp"
-#include "gc_interface/collectedHeap.inline.hpp"
+#include "gc/shared/collectedHeap.inline.hpp"
// ------------------------------------------------------------------
// ciMetadata::print
diff --git a/hotspot/src/share/vm/ci/ciObject.cpp b/hotspot/src/share/vm/ci/ciObject.cpp
index ae852e68938..2b09567cfca 100644
--- a/hotspot/src/share/vm/ci/ciObject.cpp
+++ b/hotspot/src/share/vm/ci/ciObject.cpp
@@ -25,7 +25,7 @@
#include "precompiled.hpp"
#include "ci/ciObject.hpp"
#include "ci/ciUtilities.hpp"
-#include "gc_interface/collectedHeap.inline.hpp"
+#include "gc/shared/collectedHeap.inline.hpp"
#include "oops/oop.inline.hpp"
// ciObject
diff --git a/hotspot/src/share/vm/ci/ciObjectFactory.cpp b/hotspot/src/share/vm/ci/ciObjectFactory.cpp
index 1b15be7a101..295b7c9282e 100644
--- a/hotspot/src/share/vm/ci/ciObjectFactory.cpp
+++ b/hotspot/src/share/vm/ci/ciObjectFactory.cpp
@@ -42,13 +42,13 @@
#include "ci/ciUtilities.hpp"
#include "classfile/javaClasses.inline.hpp"
#include "classfile/systemDictionary.hpp"
-#include "gc_interface/collectedHeap.inline.hpp"
+#include "gc/shared/collectedHeap.inline.hpp"
#include "memory/allocation.inline.hpp"
#include "oops/oop.inline.hpp"
#include "runtime/fieldType.hpp"
#include "utilities/macros.hpp"
#if INCLUDE_ALL_GCS
-# include "gc_implementation/g1/g1SATBCardTableModRefBS.hpp"
+# include "gc/g1/g1SATBCardTableModRefBS.hpp"
#endif
// ciObjectFactory
diff --git a/hotspot/src/share/vm/classfile/classFileParser.cpp b/hotspot/src/share/vm/classfile/classFileParser.cpp
index 52532918aeb..c42a7d2dcb0 100644
--- a/hotspot/src/share/vm/classfile/classFileParser.cpp
+++ b/hotspot/src/share/vm/classfile/classFileParser.cpp
@@ -33,8 +33,8 @@
#include "classfile/verificationType.hpp"
#include "classfile/verifier.hpp"
#include "classfile/vmSymbols.hpp"
+#include "gc/shared/gcLocker.hpp"
#include "memory/allocation.hpp"
-#include "memory/gcLocker.hpp"
#include "memory/metadataFactory.hpp"
#include "memory/oopFactory.hpp"
#include "memory/referenceType.hpp"
@@ -59,8 +59,8 @@
#include "services/classLoadingService.hpp"
#include "services/threadService.hpp"
#include "utilities/array.hpp"
-#include "utilities/globalDefinitions.hpp"
#include "utilities/exceptions.hpp"
+#include "utilities/globalDefinitions.hpp"
#include "utilities/macros.hpp"
#include "utilities/ostream.hpp"
#include "utilities/resourceHash.hpp"
diff --git a/hotspot/src/share/vm/classfile/classLoader.cpp b/hotspot/src/share/vm/classfile/classLoader.cpp
index a325344ec94..d8c29b3fd90 100644
--- a/hotspot/src/share/vm/classfile/classLoader.cpp
+++ b/hotspot/src/share/vm/classfile/classLoader.cpp
@@ -26,19 +26,19 @@
#include "classfile/classFileParser.hpp"
#include "classfile/classFileStream.hpp"
#include "classfile/classLoader.hpp"
-#include "classfile/classLoaderExt.hpp"
#include "classfile/classLoaderData.inline.hpp"
+#include "classfile/classLoaderExt.hpp"
#include "classfile/imageFile.hpp"
#include "classfile/javaClasses.hpp"
#include "classfile/systemDictionary.hpp"
#include "classfile/vmSymbols.hpp"
#include "compiler/compileBroker.hpp"
-#include "gc_interface/collectedHeap.inline.hpp"
+#include "gc/shared/collectedHeap.inline.hpp"
+#include "gc/shared/generation.hpp"
#include "interpreter/bytecodeStream.hpp"
#include "interpreter/oopMapCache.hpp"
#include "memory/allocation.inline.hpp"
#include "memory/filemap.hpp"
-#include "memory/generation.hpp"
#include "memory/oopFactory.hpp"
#include "memory/universe.inline.hpp"
#include "oops/instanceKlass.hpp"
@@ -64,8 +64,8 @@
#include "utilities/hashtable.inline.hpp"
#include "utilities/macros.hpp"
#if INCLUDE_CDS
-#include "classfile/sharedPathsMiscInfo.hpp"
#include "classfile/sharedClassUtil.hpp"
+#include "classfile/sharedPathsMiscInfo.hpp"
#endif
diff --git a/hotspot/src/share/vm/classfile/classLoaderData.cpp b/hotspot/src/share/vm/classfile/classLoaderData.cpp
index a5ed19ffb06..ea2286acc8e 100644
--- a/hotspot/src/share/vm/classfile/classLoaderData.cpp
+++ b/hotspot/src/share/vm/classfile/classLoaderData.cpp
@@ -53,7 +53,7 @@
#include "classfile/metadataOnStackMark.hpp"
#include "classfile/systemDictionary.hpp"
#include "code/codeCache.hpp"
-#include "memory/gcLocker.hpp"
+#include "gc/shared/gcLocker.hpp"
#include "memory/metadataFactory.hpp"
#include "memory/metaspaceShared.hpp"
#include "memory/oopFactory.hpp"
diff --git a/hotspot/src/share/vm/classfile/stringTable.cpp b/hotspot/src/share/vm/classfile/stringTable.cpp
index ac5e1ce1f8f..feff0b80b60 100644
--- a/hotspot/src/share/vm/classfile/stringTable.cpp
+++ b/hotspot/src/share/vm/classfile/stringTable.cpp
@@ -28,18 +28,18 @@
#include "classfile/javaClasses.hpp"
#include "classfile/stringTable.hpp"
#include "classfile/systemDictionary.hpp"
-#include "gc_interface/collectedHeap.inline.hpp"
+#include "gc/shared/collectedHeap.inline.hpp"
+#include "gc/shared/gcLocker.inline.hpp"
#include "memory/allocation.inline.hpp"
#include "memory/filemap.hpp"
-#include "memory/gcLocker.inline.hpp"
#include "oops/oop.inline.hpp"
#include "runtime/atomic.inline.hpp"
#include "runtime/mutexLocker.hpp"
#include "utilities/hashtable.inline.hpp"
#include "utilities/macros.hpp"
#if INCLUDE_ALL_GCS
-#include "gc_implementation/g1/g1SATBCardTableModRefBS.hpp"
-#include "gc_implementation/g1/g1StringDedup.hpp"
+#include "gc/g1/g1SATBCardTableModRefBS.hpp"
+#include "gc/g1/g1StringDedup.hpp"
#endif
PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
diff --git a/hotspot/src/share/vm/classfile/symbolTable.cpp b/hotspot/src/share/vm/classfile/symbolTable.cpp
index ec111a6d4e3..d5788136a35 100644
--- a/hotspot/src/share/vm/classfile/symbolTable.cpp
+++ b/hotspot/src/share/vm/classfile/symbolTable.cpp
@@ -28,10 +28,10 @@
#include "classfile/javaClasses.hpp"
#include "classfile/symbolTable.hpp"
#include "classfile/systemDictionary.hpp"
-#include "gc_interface/collectedHeap.inline.hpp"
+#include "gc/shared/collectedHeap.inline.hpp"
+#include "gc/shared/gcLocker.inline.hpp"
#include "memory/allocation.inline.hpp"
#include "memory/filemap.hpp"
-#include "memory/gcLocker.inline.hpp"
#include "oops/oop.inline.hpp"
#include "runtime/atomic.inline.hpp"
#include "runtime/mutexLocker.hpp"
diff --git a/hotspot/src/share/vm/classfile/systemDictionary.cpp b/hotspot/src/share/vm/classfile/systemDictionary.cpp
index 4095681b1ce..c7ba983de31 100644
--- a/hotspot/src/share/vm/classfile/systemDictionary.cpp
+++ b/hotspot/src/share/vm/classfile/systemDictionary.cpp
@@ -34,10 +34,10 @@
#include "classfile/vmSymbols.hpp"
#include "code/codeCache.hpp"
#include "compiler/compileBroker.hpp"
+#include "gc/shared/gcLocker.hpp"
#include "interpreter/bytecodeStream.hpp"
#include "interpreter/interpreter.hpp"
#include "memory/filemap.hpp"
-#include "memory/gcLocker.hpp"
#include "memory/oopFactory.hpp"
#include "oops/instanceKlass.hpp"
#include "oops/instanceRefKlass.hpp"
diff --git a/hotspot/src/share/vm/classfile/verifier.hpp b/hotspot/src/share/vm/classfile/verifier.hpp
index 012418abe0f..32cc626a536 100644
--- a/hotspot/src/share/vm/classfile/verifier.hpp
+++ b/hotspot/src/share/vm/classfile/verifier.hpp
@@ -26,12 +26,12 @@
#define SHARE_VM_CLASSFILE_VERIFIER_HPP
#include "classfile/verificationType.hpp"
-#include "memory/gcLocker.hpp"
+#include "gc/shared/gcLocker.hpp"
#include "oops/klass.hpp"
#include "oops/method.hpp"
#include "runtime/handles.hpp"
-#include "utilities/growableArray.hpp"
#include "utilities/exceptions.hpp"
+#include "utilities/growableArray.hpp"
// The verifier class
class Verifier : AllStatic {
diff --git a/hotspot/src/share/vm/code/codeCache.cpp b/hotspot/src/share/vm/code/codeCache.cpp
index e3eb0545194..fb3bb83902e 100644
--- a/hotspot/src/share/vm/code/codeCache.cpp
+++ b/hotspot/src/share/vm/code/codeCache.cpp
@@ -31,22 +31,22 @@
#include "code/nmethod.hpp"
#include "code/pcDesc.hpp"
#include "compiler/compileBroker.hpp"
+#include "gc/shared/gcLocker.hpp"
#include "memory/allocation.inline.hpp"
-#include "memory/gcLocker.hpp"
#include "memory/iterator.hpp"
#include "memory/resourceArea.hpp"
#include "oops/method.hpp"
#include "oops/objArrayOop.hpp"
#include "oops/oop.inline.hpp"
#include "oops/verifyOopClosure.hpp"
-#include "runtime/handles.inline.hpp"
#include "runtime/arguments.hpp"
+#include "runtime/compilationPolicy.hpp"
#include "runtime/deoptimization.hpp"
+#include "runtime/handles.inline.hpp"
#include "runtime/icache.hpp"
#include "runtime/java.hpp"
#include "runtime/mutexLocker.hpp"
#include "runtime/sweeper.hpp"
-#include "runtime/compilationPolicy.hpp"
#include "services/memoryService.hpp"
#include "trace/tracing.hpp"
#include "utilities/xmlstream.hpp"
diff --git a/hotspot/src/share/vm/code/icBuffer.cpp b/hotspot/src/share/vm/code/icBuffer.cpp
index f0cccc9a8d9..a08e2e616ae 100644
--- a/hotspot/src/share/vm/code/icBuffer.cpp
+++ b/hotspot/src/share/vm/code/icBuffer.cpp
@@ -28,7 +28,7 @@
#include "code/icBuffer.hpp"
#include "code/nmethod.hpp"
#include "code/scopeDesc.hpp"
-#include "gc_interface/collectedHeap.inline.hpp"
+#include "gc/shared/collectedHeap.inline.hpp"
#include "interpreter/interpreter.hpp"
#include "interpreter/linkResolver.hpp"
#include "memory/resourceArea.hpp"
diff --git a/hotspot/src/share/vm/compiler/disassembler.cpp b/hotspot/src/share/vm/compiler/disassembler.cpp
index fc8758a3b00..49228e592b2 100644
--- a/hotspot/src/share/vm/compiler/disassembler.cpp
+++ b/hotspot/src/share/vm/compiler/disassembler.cpp
@@ -26,8 +26,8 @@
#include "classfile/javaClasses.hpp"
#include "code/codeCache.hpp"
#include "compiler/disassembler.hpp"
-#include "gc_interface/collectedHeap.hpp"
-#include "memory/cardTableModRefBS.hpp"
+#include "gc/shared/cardTableModRefBS.hpp"
+#include "gc/shared/collectedHeap.hpp"
#include "oops/oop.inline.hpp"
#include "runtime/fprofiler.hpp"
#include "runtime/handles.inline.hpp"
diff --git a/hotspot/src/share/vm/compiler/oopMap.cpp b/hotspot/src/share/vm/compiler/oopMap.cpp
index fe54ba8211e..a6c74dcb38d 100644
--- a/hotspot/src/share/vm/compiler/oopMap.cpp
+++ b/hotspot/src/share/vm/compiler/oopMap.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,7 @@
#include "code/nmethod.hpp"
#include "code/scopeDesc.hpp"
#include "compiler/oopMap.hpp"
-#include "gc_interface/collectedHeap.hpp"
+#include "gc/shared/collectedHeap.hpp"
#include "memory/allocation.inline.hpp"
#include "memory/resourceArea.hpp"
#include "runtime/frame.inline.hpp"
diff --git a/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/adaptiveFreeList.cpp b/hotspot/src/share/vm/gc/cms/adaptiveFreeList.cpp
similarity index 95%
rename from hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/adaptiveFreeList.cpp
rename to hotspot/src/share/vm/gc/cms/adaptiveFreeList.cpp
index 47b90ff5a40..6a37dd01f8b 100644
--- a/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/adaptiveFreeList.cpp
+++ b/hotspot/src/share/vm/gc/cms/adaptiveFreeList.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -23,9 +23,9 @@
*/
#include "precompiled.hpp"
-#include "gc_implementation/concurrentMarkSweep/adaptiveFreeList.hpp"
-#include "gc_implementation/concurrentMarkSweep/freeChunk.hpp"
-#include "gc_interface/collectedHeap.hpp"
+#include "gc/cms/adaptiveFreeList.hpp"
+#include "gc/cms/freeChunk.hpp"
+#include "gc/shared/collectedHeap.hpp"
#include "memory/freeBlockDictionary.hpp"
#include "runtime/globals.hpp"
#include "runtime/mutex.hpp"
diff --git a/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/adaptiveFreeList.hpp b/hotspot/src/share/vm/gc/cms/adaptiveFreeList.hpp
similarity index 96%
rename from hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/adaptiveFreeList.hpp
rename to hotspot/src/share/vm/gc/cms/adaptiveFreeList.hpp
index 337040b9cd4..d4757eb0c15 100644
--- a/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/adaptiveFreeList.hpp
+++ b/hotspot/src/share/vm/gc/cms/adaptiveFreeList.hpp
@@ -22,11 +22,11 @@
*
*/
-#ifndef SHARE_VM_GC_IMPLEMENTATION_CONCURRENTMARKSWEEP_ADAPTIVEFREELIST_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_CONCURRENTMARKSWEEP_ADAPTIVEFREELIST_HPP
+#ifndef SHARE_VM_GC_CMS_ADAPTIVEFREELIST_HPP
+#define SHARE_VM_GC_CMS_ADAPTIVEFREELIST_HPP
+#include "gc/cms/allocationStats.hpp"
#include "memory/freeList.hpp"
-#include "gc_implementation/shared/allocationStats.hpp"
class CompactibleFreeListSpace;
@@ -226,4 +226,4 @@ class AdaptiveFreeList : public FreeList {
#endif // NOT PRODUCT
};
-#endif // SHARE_VM_GC_IMPLEMENTATION_CONCURRENTMARKSWEEP_ADAPTIVEFREELIST_HPP
+#endif // SHARE_VM_GC_CMS_ADAPTIVEFREELIST_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/shared/allocationStats.cpp b/hotspot/src/share/vm/gc/cms/allocationStats.cpp
similarity index 88%
rename from hotspot/src/share/vm/gc_implementation/shared/allocationStats.cpp
rename to hotspot/src/share/vm/gc/cms/allocationStats.cpp
index 1cbfb120aa4..f23fa37c313 100644
--- a/hotspot/src/share/vm/gc_implementation/shared/allocationStats.cpp
+++ b/hotspot/src/share/vm/gc/cms/allocationStats.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -23,11 +23,9 @@
*/
#include "precompiled.hpp"
+#include "gc/cms/allocationStats.hpp"
#include "utilities/macros.hpp"
-#if INCLUDE_ALL_GCS
-#include "gc_implementation/shared/allocationStats.hpp"
#include "utilities/ostream.hpp"
-#endif // INCLUDE_ALL_GCS
// Technically this should be derived from machine speed, and
// ideally it would be dynamically adjusted.
diff --git a/hotspot/src/share/vm/gc_implementation/shared/allocationStats.hpp b/hotspot/src/share/vm/gc/cms/allocationStats.hpp
similarity index 95%
rename from hotspot/src/share/vm/gc_implementation/shared/allocationStats.hpp
rename to hotspot/src/share/vm/gc/cms/allocationStats.hpp
index 9459efbdefd..71ba6149144 100644
--- a/hotspot/src/share/vm/gc_implementation/shared/allocationStats.hpp
+++ b/hotspot/src/share/vm/gc/cms/allocationStats.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,13 +22,13 @@
*
*/
-#ifndef SHARE_VM_GC_IMPLEMENTATION_SHARED_ALLOCATIONSTATS_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_SHARED_ALLOCATIONSTATS_HPP
+#ifndef SHARE_VM_GC_CMS_ALLOCATIONSTATS_HPP
+#define SHARE_VM_GC_CMS_ALLOCATIONSTATS_HPP
-#include "utilities/macros.hpp"
+#include "gc/shared/gcUtil.hpp"
#include "memory/allocation.hpp"
#include "utilities/globalDefinitions.hpp"
-#include "gc_implementation/shared/gcUtil.hpp"
+#include "utilities/macros.hpp"
class AllocationStats VALUE_OBJ_CLASS_SPEC {
// A duration threshold (in ms) used to filter
@@ -167,4 +167,4 @@ class AllocationStats VALUE_OBJ_CLASS_SPEC {
)
};
-#endif // SHARE_VM_GC_IMPLEMENTATION_SHARED_ALLOCATIONSTATS_HPP
+#endif // SHARE_VM_GC_CMS_ALLOCATIONSTATS_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsCollectorPolicy.cpp b/hotspot/src/share/vm/gc/cms/cmsCollectorPolicy.cpp
similarity index 84%
rename from hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsCollectorPolicy.cpp
rename to hotspot/src/share/vm/gc/cms/cmsCollectorPolicy.cpp
index a4960ad4f72..6e49af09f71 100644
--- a/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsCollectorPolicy.cpp
+++ b/hotspot/src/share/vm/gc/cms/cmsCollectorPolicy.cpp
@@ -23,17 +23,17 @@
*/
#include "precompiled.hpp"
-#include "gc_implementation/shared/adaptiveSizePolicy.hpp"
-#include "gc_implementation/concurrentMarkSweep/cmsCollectorPolicy.hpp"
-#include "gc_implementation/parNew/parNewGeneration.hpp"
-#include "gc_implementation/shared/gcPolicyCounters.hpp"
-#include "gc_implementation/shared/vmGCOperations.hpp"
-#include "memory/cardTableRS.hpp"
-#include "memory/collectorPolicy.hpp"
-#include "memory/gcLocker.inline.hpp"
-#include "memory/genCollectedHeap.hpp"
-#include "memory/generationSpec.hpp"
-#include "memory/space.hpp"
+#include "gc/cms/cmsCollectorPolicy.hpp"
+#include "gc/cms/parNewGeneration.hpp"
+#include "gc/shared/adaptiveSizePolicy.hpp"
+#include "gc/shared/cardTableRS.hpp"
+#include "gc/shared/collectorPolicy.hpp"
+#include "gc/shared/gcLocker.inline.hpp"
+#include "gc/shared/gcPolicyCounters.hpp"
+#include "gc/shared/genCollectedHeap.hpp"
+#include "gc/shared/generationSpec.hpp"
+#include "gc/shared/space.hpp"
+#include "gc/shared/vmGCOperations.hpp"
#include "memory/universe.hpp"
#include "runtime/arguments.hpp"
#include "runtime/globals_extension.hpp"
diff --git a/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsCollectorPolicy.hpp b/hotspot/src/share/vm/gc/cms/cmsCollectorPolicy.hpp
similarity index 81%
rename from hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsCollectorPolicy.hpp
rename to hotspot/src/share/vm/gc/cms/cmsCollectorPolicy.hpp
index 0f09d0cf6ac..30d1fc68884 100644
--- a/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsCollectorPolicy.hpp
+++ b/hotspot/src/share/vm/gc/cms/cmsCollectorPolicy.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,10 +22,10 @@
*
*/
-#ifndef SHARE_VM_GC_IMPLEMENTATION_CONCURRENTMARKSWEEP_CMSCOLLECTORPOLICY_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_CONCURRENTMARKSWEEP_CMSCOLLECTORPOLICY_HPP
+#ifndef SHARE_VM_GC_CMS_CMSCOLLECTORPOLICY_HPP
+#define SHARE_VM_GC_CMS_CMSCOLLECTORPOLICY_HPP
-#include "memory/collectorPolicy.hpp"
+#include "gc/shared/collectorPolicy.hpp"
class ConcurrentMarkSweepPolicy : public GenCollectorPolicy {
protected:
@@ -44,4 +44,4 @@ class ConcurrentMarkSweepPolicy : public GenCollectorPolicy {
size_t init_survivor_size);
};
-#endif // SHARE_VM_GC_IMPLEMENTATION_CONCURRENTMARKSWEEP_CMSCOLLECTORPOLICY_HPP
+#endif // SHARE_VM_GC_CMS_CMSCOLLECTORPOLICY_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsLockVerifier.cpp b/hotspot/src/share/vm/gc/cms/cmsLockVerifier.cpp
similarity index 95%
rename from hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsLockVerifier.cpp
rename to hotspot/src/share/vm/gc/cms/cmsLockVerifier.cpp
index b6243b73724..11a0fb576a8 100644
--- a/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsLockVerifier.cpp
+++ b/hotspot/src/share/vm/gc/cms/cmsLockVerifier.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -23,8 +23,8 @@
*/
#include "precompiled.hpp"
-#include "gc_implementation/concurrentMarkSweep/cmsLockVerifier.hpp"
-#include "gc_implementation/concurrentMarkSweep/concurrentMarkSweepThread.hpp"
+#include "gc/cms/cmsLockVerifier.hpp"
+#include "gc/cms/concurrentMarkSweepThread.hpp"
#include "runtime/vmThread.hpp"
///////////// Locking verification specific to CMS //////////////
diff --git a/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsLockVerifier.hpp b/hotspot/src/share/vm/gc/cms/cmsLockVerifier.hpp
similarity index 85%
rename from hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsLockVerifier.hpp
rename to hotspot/src/share/vm/gc/cms/cmsLockVerifier.hpp
index 632ecc2636a..10825aab999 100644
--- a/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsLockVerifier.hpp
+++ b/hotspot/src/share/vm/gc/cms/cmsLockVerifier.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_IMPLEMENTATION_CONCURRENTMARKSWEEP_CMSLOCKVERIFIER_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_CONCURRENTMARKSWEEP_CMSLOCKVERIFIER_HPP
+#ifndef SHARE_VM_GC_CMS_CMSLOCKVERIFIER_HPP
+#define SHARE_VM_GC_CMS_CMSLOCKVERIFIER_HPP
#include "runtime/mutex.hpp"
@@ -44,4 +44,4 @@ class CMSLockVerifier: AllStatic {
}
};
-#endif // SHARE_VM_GC_IMPLEMENTATION_CONCURRENTMARKSWEEP_CMSLOCKVERIFIER_HPP
+#endif // SHARE_VM_GC_CMS_CMSLOCKVERIFIER_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsOopClosures.cpp b/hotspot/src/share/vm/gc/cms/cmsOopClosures.cpp
similarity index 91%
rename from hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsOopClosures.cpp
rename to hotspot/src/share/vm/gc/cms/cmsOopClosures.cpp
index 7cacb77aaf1..43f7d7d3323 100644
--- a/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsOopClosures.cpp
+++ b/hotspot/src/share/vm/gc/cms/cmsOopClosures.cpp
@@ -23,9 +23,9 @@
*/
#include "precompiled.hpp"
-#include "gc_implementation/concurrentMarkSweep/cmsOopClosures.inline.hpp"
+#include "gc/cms/cmsOopClosures.inline.hpp"
+#include "gc/shared/specialized_oop_closures.hpp"
#include "memory/iterator.inline.hpp"
-#include "memory/specialized_oop_closures.hpp"
// Generate CMS specialized oop_oop_iterate functions.
SPECIALIZED_OOP_OOP_ITERATE_CLOSURES_CMS(ALL_KLASS_OOP_OOP_ITERATE_DEFN)
diff --git a/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsOopClosures.hpp b/hotspot/src/share/vm/gc/cms/cmsOopClosures.hpp
similarity index 97%
rename from hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsOopClosures.hpp
rename to hotspot/src/share/vm/gc/cms/cmsOopClosures.hpp
index 5f2b6a6b523..434fc34dd6b 100644
--- a/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsOopClosures.hpp
+++ b/hotspot/src/share/vm/gc/cms/cmsOopClosures.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,10 +22,10 @@
*
*/
-#ifndef SHARE_VM_GC_IMPLEMENTATION_CONCURRENTMARKSWEEP_CMSOOPCLOSURES_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_CONCURRENTMARKSWEEP_CMSOOPCLOSURES_HPP
+#ifndef SHARE_VM_GC_CMS_CMSOOPCLOSURES_HPP
+#define SHARE_VM_GC_CMS_CMSOOPCLOSURES_HPP
-#include "memory/genOopClosures.hpp"
+#include "gc/shared/genOopClosures.hpp"
#include "memory/iterator.hpp"
/////////////////////////////////////////////////////////////////
@@ -359,4 +359,4 @@ class CMSParKeepAliveClosure: public MetadataAwareOopClosure {
virtual void do_oop(narrowOop* p);
};
-#endif // SHARE_VM_GC_IMPLEMENTATION_CONCURRENTMARKSWEEP_CMSOOPCLOSURES_HPP
+#endif // SHARE_VM_GC_CMS_CMSOOPCLOSURES_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsOopClosures.inline.hpp b/hotspot/src/share/vm/gc/cms/cmsOopClosures.inline.hpp
similarity index 81%
rename from hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsOopClosures.inline.hpp
rename to hotspot/src/share/vm/gc/cms/cmsOopClosures.inline.hpp
index bc8a6107ccf..6b2214dfce3 100644
--- a/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsOopClosures.inline.hpp
+++ b/hotspot/src/share/vm/gc/cms/cmsOopClosures.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,13 +22,13 @@
*
*/
-#ifndef SHARE_VM_GC_IMPLEMENTATION_CONCURRENTMARKSWEEP_CMSOOPCLOSURES_INLINE_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_CONCURRENTMARKSWEEP_CMSOOPCLOSURES_INLINE_HPP
+#ifndef SHARE_VM_GC_CMS_CMSOOPCLOSURES_INLINE_HPP
+#define SHARE_VM_GC_CMS_CMSOOPCLOSURES_INLINE_HPP
-#include "gc_implementation/concurrentMarkSweep/cmsOopClosures.hpp"
-#include "gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.hpp"
+#include "gc/cms/cmsOopClosures.hpp"
+#include "gc/cms/concurrentMarkSweepGeneration.hpp"
+#include "gc/shared/taskqueue.inline.hpp"
#include "oops/oop.inline.hpp"
-#include "utilities/taskqueue.inline.hpp"
// Trim our work_queue so its length is below max at return
inline void Par_MarkRefsIntoAndScanClosure::trim_queue(uint max) {
@@ -61,4 +61,4 @@ inline void MetadataAwareOopsInGenClosure::do_class_loader_data(ClassLoaderData*
cld->oops_do(_klass_closure._oop_closure, &_klass_closure, claim);
}
-#endif // SHARE_VM_GC_IMPLEMENTATION_CONCURRENTMARKSWEEP_CMSOOPCLOSURES_INLINE_HPP
+#endif // SHARE_VM_GC_CMS_CMSOOPCLOSURES_INLINE_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp b/hotspot/src/share/vm/gc/cms/compactibleFreeListSpace.cpp
similarity index 99%
rename from hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp
rename to hotspot/src/share/vm/gc/cms/compactibleFreeListSpace.cpp
index 3076397f64c..628feb99d64 100644
--- a/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp
+++ b/hotspot/src/share/vm/gc/cms/compactibleFreeListSpace.cpp
@@ -23,18 +23,18 @@
*/
#include "precompiled.hpp"
-#include "gc_implementation/concurrentMarkSweep/cmsLockVerifier.hpp"
-#include "gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.hpp"
-#include "gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.inline.hpp"
-#include "gc_implementation/concurrentMarkSweep/concurrentMarkSweepThread.hpp"
-#include "gc_implementation/shared/liveRange.hpp"
-#include "gc_implementation/shared/spaceDecorator.hpp"
-#include "gc_interface/collectedHeap.inline.hpp"
+#include "gc/cms/cmsLockVerifier.hpp"
+#include "gc/cms/compactibleFreeListSpace.hpp"
+#include "gc/cms/concurrentMarkSweepGeneration.inline.hpp"
+#include "gc/cms/concurrentMarkSweepThread.hpp"
+#include "gc/shared/blockOffsetTable.inline.hpp"
+#include "gc/shared/collectedHeap.inline.hpp"
+#include "gc/shared/genCollectedHeap.hpp"
+#include "gc/shared/liveRange.hpp"
+#include "gc/shared/space.inline.hpp"
+#include "gc/shared/spaceDecorator.hpp"
#include "memory/allocation.inline.hpp"
-#include "memory/blockOffsetTable.inline.hpp"
-#include "memory/genCollectedHeap.hpp"
#include "memory/resourceArea.hpp"
-#include "memory/space.inline.hpp"
#include "memory/universe.inline.hpp"
#include "oops/oop.inline.hpp"
#include "runtime/globals.hpp"
diff --git a/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.hpp b/hotspot/src/share/vm/gc/cms/compactibleFreeListSpace.hpp
similarity index 98%
rename from hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.hpp
rename to hotspot/src/share/vm/gc/cms/compactibleFreeListSpace.hpp
index 72b0e9e8564..0e4bf630e65 100644
--- a/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.hpp
+++ b/hotspot/src/share/vm/gc/cms/compactibleFreeListSpace.hpp
@@ -22,15 +22,15 @@
*
*/
-#ifndef SHARE_VM_GC_IMPLEMENTATION_CONCURRENTMARKSWEEP_COMPACTIBLEFREELISTSPACE_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_CONCURRENTMARKSWEEP_COMPACTIBLEFREELISTSPACE_HPP
+#ifndef SHARE_VM_GC_CMS_COMPACTIBLEFREELISTSPACE_HPP
+#define SHARE_VM_GC_CMS_COMPACTIBLEFREELISTSPACE_HPP
-#include "gc_implementation/concurrentMarkSweep/adaptiveFreeList.hpp"
-#include "gc_implementation/concurrentMarkSweep/promotionInfo.hpp"
+#include "gc/cms/adaptiveFreeList.hpp"
+#include "gc/cms/promotionInfo.hpp"
+#include "gc/shared/blockOffsetTable.hpp"
+#include "gc/shared/space.hpp"
#include "memory/binaryTreeDictionary.hpp"
-#include "memory/blockOffsetTable.hpp"
#include "memory/freeList.hpp"
-#include "memory/space.hpp"
// Classes in support of keeping track of promotions into a non-Contiguous
// space, in this case a CompactibleFreeListSpace.
@@ -720,4 +720,4 @@ size_t PromotionInfo::refillSize() const {
return CompactibleFreeListSpace::adjustObjectSize(sz);
}
-#endif // SHARE_VM_GC_IMPLEMENTATION_CONCURRENTMARKSWEEP_COMPACTIBLEFREELISTSPACE_HPP
+#endif // SHARE_VM_GC_CMS_COMPACTIBLEFREELISTSPACE_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp b/hotspot/src/share/vm/gc/cms/concurrentMarkSweepGeneration.cpp
similarity index 99%
rename from hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp
rename to hotspot/src/share/vm/gc/cms/concurrentMarkSweepGeneration.cpp
index 5c056b07361..64d188375ba 100644
--- a/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp
+++ b/hotspot/src/share/vm/gc/cms/concurrentMarkSweepGeneration.cpp
@@ -27,34 +27,35 @@
#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"
@@ -66,7 +67,6 @@
#include "services/memoryService.hpp"
#include "services/runtimeService.hpp"
#include "utilities/stack.inline.hpp"
-#include "utilities/taskqueue.inline.hpp"
// statics
CMSCollector* ConcurrentMarkSweepGeneration::_collector = NULL;
diff --git a/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.hpp b/hotspot/src/share/vm/gc/cms/concurrentMarkSweepGeneration.hpp
similarity index 98%
rename from hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.hpp
rename to hotspot/src/share/vm/gc/cms/concurrentMarkSweepGeneration.hpp
index 0aa8b7f4dce..2f0191252ef 100644
--- a/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.hpp
+++ b/hotspot/src/share/vm/gc/cms/concurrentMarkSweepGeneration.hpp
@@ -22,26 +22,26 @@
*
*/
-#ifndef SHARE_VM_GC_IMPLEMENTATION_CONCURRENTMARKSWEEP_CONCURRENTMARKSWEEPGENERATION_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_CONCURRENTMARKSWEEP_CONCURRENTMARKSWEEPGENERATION_HPP
+#ifndef SHARE_VM_GC_CMS_CONCURRENTMARKSWEEPGENERATION_HPP
+#define SHARE_VM_GC_CMS_CONCURRENTMARKSWEEPGENERATION_HPP
-#include "gc_implementation/concurrentMarkSweep/cmsOopClosures.hpp"
-#include "gc_implementation/shared/gcHeapSummary.hpp"
-#include "gc_implementation/shared/gSpaceCounters.hpp"
-#include "gc_implementation/shared/gcStats.hpp"
-#include "gc_implementation/shared/gcWhen.hpp"
-#include "gc_implementation/shared/generationCounters.hpp"
-#include "memory/cardGeneration.hpp"
+#include "gc/cms/cmsOopClosures.hpp"
+#include "gc/cms/gSpaceCounters.hpp"
+#include "gc/cms/yieldingWorkgroup.hpp"
+#include "gc/shared/cardGeneration.hpp"
+#include "gc/shared/gcHeapSummary.hpp"
+#include "gc/shared/gcStats.hpp"
+#include "gc/shared/gcWhen.hpp"
+#include "gc/shared/generationCounters.hpp"
+#include "gc/shared/space.hpp"
+#include "gc/shared/taskqueue.hpp"
#include "memory/freeBlockDictionary.hpp"
#include "memory/iterator.hpp"
-#include "memory/space.hpp"
#include "memory/virtualspace.hpp"
#include "runtime/mutexLocker.hpp"
#include "services/memoryService.hpp"
#include "utilities/bitMap.hpp"
#include "utilities/stack.hpp"
-#include "utilities/taskqueue.hpp"
-#include "utilities/yieldingWorkgroup.hpp"
// ConcurrentMarkSweepGeneration is in support of a concurrent
// mark-sweep old generation in the Detlefs-Printezis--Boehm-Demers-Schenker
@@ -1813,4 +1813,4 @@ class TraceCMSMemoryManagerStats : public TraceMemoryManagerStats {
};
-#endif // SHARE_VM_GC_IMPLEMENTATION_CONCURRENTMARKSWEEP_CONCURRENTMARKSWEEPGENERATION_HPP
+#endif // SHARE_VM_GC_CMS_CONCURRENTMARKSWEEPGENERATION_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.inline.hpp b/hotspot/src/share/vm/gc/cms/concurrentMarkSweepGeneration.inline.hpp
similarity index 94%
rename from hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.inline.hpp
rename to hotspot/src/share/vm/gc/cms/concurrentMarkSweepGeneration.inline.hpp
index bc552f78420..e703c1a75b2 100644
--- a/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.inline.hpp
+++ b/hotspot/src/share/vm/gc/cms/concurrentMarkSweepGeneration.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,16 +22,16 @@
*
*/
-#ifndef SHARE_VM_GC_IMPLEMENTATION_CONCURRENTMARKSWEEP_CONCURRENTMARKSWEEPGENERATION_INLINE_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_CONCURRENTMARKSWEEP_CONCURRENTMARKSWEEPGENERATION_INLINE_HPP
+#ifndef SHARE_VM_GC_CMS_CONCURRENTMARKSWEEPGENERATION_INLINE_HPP
+#define SHARE_VM_GC_CMS_CONCURRENTMARKSWEEPGENERATION_INLINE_HPP
-#include "gc_implementation/concurrentMarkSweep/cmsLockVerifier.hpp"
-#include "gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.hpp"
-#include "gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.hpp"
-#include "gc_implementation/concurrentMarkSweep/concurrentMarkSweepThread.hpp"
-#include "gc_implementation/parNew/parNewGeneration.hpp"
-#include "gc_implementation/shared/gcUtil.hpp"
-#include "memory/genCollectedHeap.hpp"
+#include "gc/cms/cmsLockVerifier.hpp"
+#include "gc/cms/compactibleFreeListSpace.hpp"
+#include "gc/cms/concurrentMarkSweepGeneration.hpp"
+#include "gc/cms/concurrentMarkSweepThread.hpp"
+#include "gc/cms/parNewGeneration.hpp"
+#include "gc/shared/gcUtil.hpp"
+#include "gc/shared/genCollectedHeap.hpp"
inline void CMSBitMap::clear_all() {
assert_locked();
@@ -459,4 +459,4 @@ inline void ModUnionClosurePar::do_MemRegion(MemRegion mr) {
_t->par_mark_range(mr2);
}
-#endif // SHARE_VM_GC_IMPLEMENTATION_CONCURRENTMARKSWEEP_CONCURRENTMARKSWEEPGENERATION_INLINE_HPP
+#endif // SHARE_VM_GC_CMS_CONCURRENTMARKSWEEPGENERATION_INLINE_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepThread.cpp b/hotspot/src/share/vm/gc/cms/concurrentMarkSweepThread.cpp
similarity index 98%
rename from hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepThread.cpp
rename to hotspot/src/share/vm/gc/cms/concurrentMarkSweepThread.cpp
index 41b9e377453..8dc834dddb3 100644
--- a/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepThread.cpp
+++ b/hotspot/src/share/vm/gc/cms/concurrentMarkSweepThread.cpp
@@ -24,9 +24,9 @@
#include "precompiled.hpp"
#include "classfile/systemDictionary.hpp"
-#include "gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.inline.hpp"
-#include "gc_implementation/concurrentMarkSweep/concurrentMarkSweepThread.hpp"
-#include "memory/genCollectedHeap.hpp"
+#include "gc/cms/concurrentMarkSweepGeneration.inline.hpp"
+#include "gc/cms/concurrentMarkSweepThread.hpp"
+#include "gc/shared/genCollectedHeap.hpp"
#include "oops/instanceRefKlass.hpp"
#include "oops/oop.inline.hpp"
#include "runtime/init.hpp"
diff --git a/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepThread.hpp b/hotspot/src/share/vm/gc/cms/concurrentMarkSweepThread.hpp
similarity index 93%
rename from hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepThread.hpp
rename to hotspot/src/share/vm/gc/cms/concurrentMarkSweepThread.hpp
index 2c41ffeba7f..807284c0edc 100644
--- a/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepThread.hpp
+++ b/hotspot/src/share/vm/gc/cms/concurrentMarkSweepThread.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,11 +22,11 @@
*
*/
-#ifndef SHARE_VM_GC_IMPLEMENTATION_CONCURRENTMARKSWEEP_CONCURRENTMARKSWEEPTHREAD_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_CONCURRENTMARKSWEEP_CONCURRENTMARKSWEEPTHREAD_HPP
+#ifndef SHARE_VM_GC_CMS_CONCURRENTMARKSWEEPTHREAD_HPP
+#define SHARE_VM_GC_CMS_CONCURRENTMARKSWEEPTHREAD_HPP
-#include "gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.hpp"
-#include "gc_implementation/shared/concurrentGCThread.hpp"
+#include "gc/cms/concurrentMarkSweepGeneration.hpp"
+#include "gc/shared/concurrentGCThread.hpp"
#include "runtime/thread.hpp"
class ConcurrentMarkSweepGeneration;
@@ -178,4 +178,4 @@ class CMSLoopCountWarn: public StackObj {
}
};
-#endif // SHARE_VM_GC_IMPLEMENTATION_CONCURRENTMARKSWEEP_CONCURRENTMARKSWEEPTHREAD_HPP
+#endif // SHARE_VM_GC_CMS_CONCURRENTMARKSWEEPTHREAD_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/freeChunk.cpp b/hotspot/src/share/vm/gc/cms/freeChunk.cpp
similarity index 95%
rename from hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/freeChunk.cpp
rename to hotspot/src/share/vm/gc/cms/freeChunk.cpp
index e58391acfae..bed57245a5a 100644
--- a/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/freeChunk.cpp
+++ b/hotspot/src/share/vm/gc/cms/freeChunk.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
*/
#include "precompiled.hpp"
-#include "gc_implementation/concurrentMarkSweep/freeChunk.hpp"
+#include "gc/cms/freeChunk.hpp"
#include "memory/freeBlockDictionary.hpp"
#include "utilities/copy.hpp"
diff --git a/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/freeChunk.hpp b/hotspot/src/share/vm/gc/cms/freeChunk.hpp
similarity index 95%
rename from hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/freeChunk.hpp
rename to hotspot/src/share/vm/gc/cms/freeChunk.hpp
index bfabe4bc2cd..96405475489 100644
--- a/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/freeChunk.hpp
+++ b/hotspot/src/share/vm/gc/cms/freeChunk.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_IMPLEMENTATION_CONCURRENTMARKSWEEP_FREECHUNK_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_CONCURRENTMARKSWEEP_FREECHUNK_HPP
+#ifndef SHARE_VM_GC_CMS_FREECHUNK_HPP
+#define SHARE_VM_GC_CMS_FREECHUNK_HPP
#include "memory/allocation.hpp"
#include "memory/memRegion.hpp"
@@ -148,4 +148,4 @@ class FreeChunk VALUE_OBJ_CLASS_SPEC {
extern size_t MinChunkSize;
-#endif // SHARE_VM_GC_IMPLEMENTATION_CONCURRENTMARKSWEEP_FREECHUNK_HPP
+#endif // SHARE_VM_GC_CMS_FREECHUNK_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/shared/gSpaceCounters.cpp b/hotspot/src/share/vm/gc/cms/gSpaceCounters.cpp
similarity index 93%
rename from hotspot/src/share/vm/gc_implementation/shared/gSpaceCounters.cpp
rename to hotspot/src/share/vm/gc/cms/gSpaceCounters.cpp
index b1ae78d3087..dce1f39f6d5 100644
--- a/hotspot/src/share/vm/gc_implementation/shared/gSpaceCounters.cpp
+++ b/hotspot/src/share/vm/gc/cms/gSpaceCounters.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -23,12 +23,10 @@
*/
#include "precompiled.hpp"
-#include "utilities/macros.hpp"
-#if INCLUDE_ALL_GCS
-#include "gc_implementation/shared/gSpaceCounters.hpp"
-#include "memory/generation.hpp"
+#include "gc/cms/gSpaceCounters.hpp"
+#include "gc/shared/generation.hpp"
#include "memory/resourceArea.hpp"
-#endif // INCLUDE_ALL_GCS
+#include "utilities/macros.hpp"
GSpaceCounters::GSpaceCounters(const char* name, int ordinal, size_t max_size,
Generation* g, GenerationCounters* gc,
diff --git a/hotspot/src/share/vm/gc_implementation/shared/gSpaceCounters.hpp b/hotspot/src/share/vm/gc/cms/gSpaceCounters.hpp
similarity index 88%
rename from hotspot/src/share/vm/gc_implementation/shared/gSpaceCounters.hpp
rename to hotspot/src/share/vm/gc/cms/gSpaceCounters.hpp
index 3e138b3a41a..64ae6c60b26 100644
--- a/hotspot/src/share/vm/gc_implementation/shared/gSpaceCounters.hpp
+++ b/hotspot/src/share/vm/gc/cms/gSpaceCounters.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,15 +22,13 @@
*
*/
-#ifndef SHARE_VM_GC_IMPLEMENTATION_SHARED_GSPACECOUNTERS_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_SHARED_GSPACECOUNTERS_HPP
+#ifndef SHARE_VM_GC_CMS_GSPACECOUNTERS_HPP
+#define SHARE_VM_GC_CMS_GSPACECOUNTERS_HPP
-#include "utilities/macros.hpp"
-#if INCLUDE_ALL_GCS
-#include "gc_implementation/shared/generationCounters.hpp"
-#include "memory/generation.hpp"
+#include "gc/shared/generation.hpp"
+#include "gc/shared/generationCounters.hpp"
#include "runtime/perfData.hpp"
-#endif // INCLUDE_ALL_GCS
+#include "utilities/macros.hpp"
// A GSpaceCounter is a holder class for performance counters
// that track a space;
@@ -111,4 +109,4 @@ class GenerationUsedHelper : public PerfLongSampleHelper {
}
};
-#endif // SHARE_VM_GC_IMPLEMENTATION_SHARED_GSPACECOUNTERS_HPP
+#endif // SHARE_VM_GC_CMS_GSPACECOUNTERS_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/parNew/parCardTableModRefBS.cpp b/hotspot/src/share/vm/gc/cms/parCardTableModRefBS.cpp
similarity index 99%
rename from hotspot/src/share/vm/gc_implementation/parNew/parCardTableModRefBS.cpp
rename to hotspot/src/share/vm/gc/cms/parCardTableModRefBS.cpp
index 24e7564d941..6d838b28816 100644
--- a/hotspot/src/share/vm/gc_implementation/parNew/parCardTableModRefBS.cpp
+++ b/hotspot/src/share/vm/gc/cms/parCardTableModRefBS.cpp
@@ -23,12 +23,12 @@
*/
#include "precompiled.hpp"
-#include "gc_interface/collectedHeap.hpp"
+#include "gc/shared/cardTableModRefBS.hpp"
+#include "gc/shared/cardTableRS.hpp"
+#include "gc/shared/collectedHeap.hpp"
+#include "gc/shared/genCollectedHeap.hpp"
+#include "gc/shared/space.inline.hpp"
#include "memory/allocation.inline.hpp"
-#include "memory/cardTableModRefBS.hpp"
-#include "memory/cardTableRS.hpp"
-#include "memory/genCollectedHeap.hpp"
-#include "memory/space.inline.hpp"
#include "memory/virtualspace.hpp"
#include "oops/oop.inline.hpp"
#include "runtime/java.hpp"
diff --git a/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp b/hotspot/src/share/vm/gc/cms/parNewGeneration.cpp
similarity index 98%
rename from hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp
rename to hotspot/src/share/vm/gc/cms/parNewGeneration.cpp
index 6c72f4c2d2f..3bed483338b 100644
--- a/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp
+++ b/hotspot/src/share/vm/gc/cms/parNewGeneration.cpp
@@ -23,27 +23,29 @@
*/
#include "precompiled.hpp"
-#include "gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.hpp"
-#include "gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.hpp"
-#include "gc_implementation/parNew/parNewGeneration.hpp"
-#include "gc_implementation/parNew/parOopClosures.inline.hpp"
-#include "gc_implementation/shared/adaptiveSizePolicy.hpp"
-#include "gc_implementation/shared/ageTable.hpp"
-#include "gc_implementation/shared/copyFailedInfo.hpp"
-#include "gc_implementation/shared/gcHeapSummary.hpp"
-#include "gc_implementation/shared/gcTimer.hpp"
-#include "gc_implementation/shared/gcTrace.hpp"
-#include "gc_implementation/shared/gcTraceTime.hpp"
-#include "gc_implementation/shared/plab.inline.hpp"
-#include "gc_implementation/shared/spaceDecorator.hpp"
-#include "memory/defNewGeneration.inline.hpp"
-#include "memory/genCollectedHeap.hpp"
-#include "memory/genOopClosures.inline.hpp"
-#include "memory/generation.hpp"
-#include "memory/referencePolicy.hpp"
+#include "gc/cms/compactibleFreeListSpace.hpp"
+#include "gc/cms/concurrentMarkSweepGeneration.hpp"
+#include "gc/cms/parNewGeneration.hpp"
+#include "gc/cms/parOopClosures.inline.hpp"
+#include "gc/serial/defNewGeneration.inline.hpp"
+#include "gc/shared/adaptiveSizePolicy.hpp"
+#include "gc/shared/ageTable.hpp"
+#include "gc/shared/copyFailedInfo.hpp"
+#include "gc/shared/gcHeapSummary.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/generation.hpp"
+#include "gc/shared/plab.inline.hpp"
+#include "gc/shared/referencePolicy.hpp"
+#include "gc/shared/space.hpp"
+#include "gc/shared/spaceDecorator.hpp"
+#include "gc/shared/strongRootsScope.hpp"
+#include "gc/shared/taskqueue.inline.hpp"
+#include "gc/shared/workgroup.hpp"
#include "memory/resourceArea.hpp"
-#include "memory/strongRootsScope.hpp"
-#include "memory/space.hpp"
#include "oops/objArrayOop.hpp"
#include "oops/oop.inline.hpp"
#include "runtime/atomic.inline.hpp"
@@ -54,8 +56,6 @@
#include "utilities/copy.hpp"
#include "utilities/globalDefinitions.hpp"
#include "utilities/stack.inline.hpp"
-#include "utilities/taskqueue.inline.hpp"
-#include "utilities/workgroup.hpp"
#ifdef _MSC_VER
#pragma warning( push )
diff --git a/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.hpp b/hotspot/src/share/vm/gc/cms/parNewGeneration.hpp
similarity index 96%
rename from hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.hpp
rename to hotspot/src/share/vm/gc/cms/parNewGeneration.hpp
index 572d48ed5e6..560d91f7c85 100644
--- a/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.hpp
+++ b/hotspot/src/share/vm/gc/cms/parNewGeneration.hpp
@@ -22,16 +22,16 @@
*
*/
-#ifndef SHARE_VM_GC_IMPLEMENTATION_PARNEW_PARNEWGENERATION_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_PARNEW_PARNEWGENERATION_HPP
+#ifndef SHARE_VM_GC_CMS_PARNEWGENERATION_HPP
+#define SHARE_VM_GC_CMS_PARNEWGENERATION_HPP
-#include "gc_implementation/parNew/parOopClosures.hpp"
-#include "gc_implementation/shared/gcTrace.hpp"
-#include "gc_implementation/shared/plab.hpp"
-#include "gc_implementation/shared/copyFailedInfo.hpp"
-#include "memory/defNewGeneration.hpp"
+#include "gc/cms/parOopClosures.hpp"
+#include "gc/serial/defNewGeneration.hpp"
+#include "gc/shared/copyFailedInfo.hpp"
+#include "gc/shared/gcTrace.hpp"
+#include "gc/shared/plab.hpp"
+#include "gc/shared/taskqueue.hpp"
#include "memory/padded.hpp"
-#include "utilities/taskqueue.hpp"
class ChunkArray;
class ParScanWithoutBarrierClosure;
@@ -422,4 +422,4 @@ class ParNewGeneration: public DefNewGeneration {
static oop real_forwardee(oop obj);
};
-#endif // SHARE_VM_GC_IMPLEMENTATION_PARNEW_PARNEWGENERATION_HPP
+#endif // SHARE_VM_GC_CMS_PARNEWGENERATION_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/parNew/parOopClosures.cpp b/hotspot/src/share/vm/gc/cms/parOopClosures.cpp
similarity index 91%
rename from hotspot/src/share/vm/gc_implementation/parNew/parOopClosures.cpp
rename to hotspot/src/share/vm/gc/cms/parOopClosures.cpp
index 4b3f3f26adb..35f0e7e9139 100644
--- a/hotspot/src/share/vm/gc_implementation/parNew/parOopClosures.cpp
+++ b/hotspot/src/share/vm/gc/cms/parOopClosures.cpp
@@ -23,9 +23,9 @@
*/
#include "precompiled.hpp"
+#include "gc/cms/parOopClosures.inline.hpp"
+#include "gc/shared/specialized_oop_closures.hpp"
#include "memory/iterator.inline.hpp"
-#include "memory/specialized_oop_closures.hpp"
-#include "gc_implementation/parNew/parOopClosures.inline.hpp"
// Generate ParNew specialized oop_oop_iterate functions.
SPECIALIZED_OOP_OOP_ITERATE_CLOSURES_P(ALL_KLASS_OOP_OOP_ITERATE_DEFN);
diff --git a/hotspot/src/share/vm/gc_implementation/parNew/parOopClosures.hpp b/hotspot/src/share/vm/gc/cms/parOopClosures.hpp
similarity index 94%
rename from hotspot/src/share/vm/gc_implementation/parNew/parOopClosures.hpp
rename to hotspot/src/share/vm/gc/cms/parOopClosures.hpp
index 00b865f2a35..73132650a5a 100644
--- a/hotspot/src/share/vm/gc_implementation/parNew/parOopClosures.hpp
+++ b/hotspot/src/share/vm/gc/cms/parOopClosures.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,10 +22,10 @@
*
*/
-#ifndef SHARE_VM_GC_IMPLEMENTATION_PARNEW_PAROOPCLOSURES_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_PARNEW_PAROOPCLOSURES_HPP
+#ifndef SHARE_VM_GC_CMS_PAROOPCLOSURES_HPP
+#define SHARE_VM_GC_CMS_PAROOPCLOSURES_HPP
-#include "memory/genOopClosures.hpp"
+#include "gc/shared/genOopClosures.hpp"
#include "memory/padded.hpp"
// Closures for ParNewGeneration
@@ -148,4 +148,4 @@ class ParEvacuateFollowersClosure: public VoidClosure {
virtual void do_void();
};
-#endif // SHARE_VM_GC_IMPLEMENTATION_PARNEW_PAROOPCLOSURES_HPP
+#endif // SHARE_VM_GC_CMS_PAROOPCLOSURES_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/parNew/parOopClosures.inline.hpp b/hotspot/src/share/vm/gc/cms/parOopClosures.inline.hpp
similarity index 93%
rename from hotspot/src/share/vm/gc_implementation/parNew/parOopClosures.inline.hpp
rename to hotspot/src/share/vm/gc/cms/parOopClosures.inline.hpp
index 1c5d8f6e33f..658d3623db0 100644
--- a/hotspot/src/share/vm/gc_implementation/parNew/parOopClosures.inline.hpp
+++ b/hotspot/src/share/vm/gc/cms/parOopClosures.inline.hpp
@@ -22,14 +22,14 @@
*
*/
-#ifndef SHARE_VM_GC_IMPLEMENTATION_PARNEW_PAROOPCLOSURES_INLINE_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_PARNEW_PAROOPCLOSURES_INLINE_HPP
+#ifndef SHARE_VM_GC_CMS_PAROOPCLOSURES_INLINE_HPP
+#define SHARE_VM_GC_CMS_PAROOPCLOSURES_INLINE_HPP
-#include "gc_implementation/parNew/parNewGeneration.hpp"
-#include "gc_implementation/parNew/parOopClosures.hpp"
-#include "memory/cardTableRS.hpp"
-#include "memory/genCollectedHeap.hpp"
-#include "memory/genOopClosures.inline.hpp"
+#include "gc/cms/parNewGeneration.hpp"
+#include "gc/cms/parOopClosures.hpp"
+#include "gc/shared/cardTableRS.hpp"
+#include "gc/shared/genCollectedHeap.hpp"
+#include "gc/shared/genOopClosures.inline.hpp"
template inline void ParScanWeakRefClosure::do_oop_work(T* p) {
assert (!oopDesc::is_null(*p), "null weak reference?");
@@ -143,4 +143,4 @@ inline void ParScanWithBarrierClosure::do_oop_nv(narrowOop* p) { ParScanClosure:
inline void ParScanWithoutBarrierClosure::do_oop_nv(oop* p) { ParScanClosure::do_oop_work(p, false, false); }
inline void ParScanWithoutBarrierClosure::do_oop_nv(narrowOop* p) { ParScanClosure::do_oop_work(p, false, false); }
-#endif // SHARE_VM_GC_IMPLEMENTATION_PARNEW_PAROOPCLOSURES_INLINE_HPP
+#endif // SHARE_VM_GC_CMS_PAROOPCLOSURES_INLINE_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/promotionInfo.cpp b/hotspot/src/share/vm/gc/cms/promotionInfo.cpp
similarity index 98%
rename from hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/promotionInfo.cpp
rename to hotspot/src/share/vm/gc/cms/promotionInfo.cpp
index 5c1d2650a19..4e5d8ea9411 100644
--- a/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/promotionInfo.cpp
+++ b/hotspot/src/share/vm/gc/cms/promotionInfo.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -23,9 +23,9 @@
*/
#include "precompiled.hpp"
-#include "memory/genOopClosures.hpp"
-#include "gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.hpp"
-#include "gc_implementation/concurrentMarkSweep/promotionInfo.hpp"
+#include "gc/cms/compactibleFreeListSpace.hpp"
+#include "gc/cms/promotionInfo.hpp"
+#include "gc/shared/genOopClosures.hpp"
#include "oops/markOop.inline.hpp"
#include "oops/oop.inline.hpp"
diff --git a/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/promotionInfo.hpp b/hotspot/src/share/vm/gc/cms/promotionInfo.hpp
similarity index 95%
rename from hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/promotionInfo.hpp
rename to hotspot/src/share/vm/gc/cms/promotionInfo.hpp
index 72e0ba3f70a..a58bcb74038 100644
--- a/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/promotionInfo.hpp
+++ b/hotspot/src/share/vm/gc/cms/promotionInfo.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,10 +22,10 @@
*
*/
-#ifndef SHARE_VM_GC_IMPLEMENTATION_CONCURRENTMARKSWEEP_PROMOTIONINFO_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_CONCURRENTMARKSWEEP_PROMOTIONINFO_HPP
+#ifndef SHARE_VM_GC_CMS_PROMOTIONINFO_HPP
+#define SHARE_VM_GC_CMS_PROMOTIONINFO_HPP
-#include "gc_implementation/concurrentMarkSweep/freeChunk.hpp"
+#include "gc/cms/freeChunk.hpp"
#include "memory/allocation.hpp"
// Forward declarations
@@ -211,4 +211,4 @@ class PromotionInfo VALUE_OBJ_CLASS_SPEC {
};
-#endif // SHARE_VM_GC_IMPLEMENTATION_CONCURRENTMARKSWEEP_PROMOTIONINFO_HPP
+#endif // SHARE_VM_GC_CMS_PROMOTIONINFO_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/vmCMSOperations.cpp b/hotspot/src/share/vm/gc/cms/vmCMSOperations.cpp
similarity index 95%
rename from hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/vmCMSOperations.cpp
rename to hotspot/src/share/vm/gc/cms/vmCMSOperations.cpp
index 423c21ca1ff..539aef1f569 100644
--- a/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/vmCMSOperations.cpp
+++ b/hotspot/src/share/vm/gc/cms/vmCMSOperations.cpp
@@ -23,13 +23,13 @@
*/
#include "precompiled.hpp"
-#include "gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.inline.hpp"
-#include "gc_implementation/concurrentMarkSweep/concurrentMarkSweepThread.hpp"
-#include "gc_implementation/concurrentMarkSweep/vmCMSOperations.hpp"
-#include "gc_implementation/shared/gcTimer.hpp"
-#include "gc_implementation/shared/gcTraceTime.hpp"
-#include "gc_implementation/shared/isGCActiveMark.hpp"
-#include "memory/gcLocker.inline.hpp"
+#include "gc/cms/concurrentMarkSweepGeneration.inline.hpp"
+#include "gc/cms/concurrentMarkSweepThread.hpp"
+#include "gc/cms/vmCMSOperations.hpp"
+#include "gc/shared/gcLocker.inline.hpp"
+#include "gc/shared/gcTimer.hpp"
+#include "gc/shared/gcTraceTime.hpp"
+#include "gc/shared/isGCActiveMark.hpp"
#include "runtime/interfaceSupport.hpp"
#include "runtime/os.hpp"
#include "utilities/dtrace.hpp"
diff --git a/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/vmCMSOperations.hpp b/hotspot/src/share/vm/gc/cms/vmCMSOperations.hpp
similarity index 92%
rename from hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/vmCMSOperations.hpp
rename to hotspot/src/share/vm/gc/cms/vmCMSOperations.hpp
index 70de0e5f9c8..da3ee8670f6 100644
--- a/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/vmCMSOperations.hpp
+++ b/hotspot/src/share/vm/gc/cms/vmCMSOperations.hpp
@@ -22,12 +22,12 @@
*
*/
-#ifndef SHARE_VM_GC_IMPLEMENTATION_CONCURRENTMARKSWEEP_VMCMSOPERATIONS_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_CONCURRENTMARKSWEEP_VMCMSOPERATIONS_HPP
+#ifndef SHARE_VM_GC_CMS_VMCMSOPERATIONS_HPP
+#define SHARE_VM_GC_CMS_VMCMSOPERATIONS_HPP
-#include "gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.hpp"
-#include "gc_implementation/shared/vmGCOperations.hpp"
-#include "gc_interface/gcCause.hpp"
+#include "gc/cms/concurrentMarkSweepGeneration.hpp"
+#include "gc/shared/gcCause.hpp"
+#include "gc/shared/vmGCOperations.hpp"
#include "runtime/vm_operations.hpp"
// The VM_CMS_Operation is slightly different from
@@ -145,4 +145,4 @@ class VM_GenCollectFullConcurrent: public VM_GC_Operation {
virtual bool evaluate_at_safepoint() const;
};
-#endif // SHARE_VM_GC_IMPLEMENTATION_CONCURRENTMARKSWEEP_VMCMSOPERATIONS_HPP
+#endif // SHARE_VM_GC_CMS_VMCMSOPERATIONS_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/vmStructs_cms.hpp b/hotspot/src/share/vm/gc/cms/vmStructs_cms.hpp
similarity index 94%
rename from hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/vmStructs_cms.hpp
rename to hotspot/src/share/vm/gc/cms/vmStructs_cms.hpp
index 2a0a563d5f4..0164b4c502c 100644
--- a/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/vmStructs_cms.hpp
+++ b/hotspot/src/share/vm/gc/cms/vmStructs_cms.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_IMPLEMENTATION_CONCURRENTMARKSWEEP_VMSTRUCTS_CMS_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_CONCURRENTMARKSWEEP_VMSTRUCTS_CMS_HPP
+#ifndef SHARE_VM_GC_CMS_VMSTRUCTS_CMS_HPP
+#define SHARE_VM_GC_CMS_VMSTRUCTS_CMS_HPP
#define VM_STRUCTS_CMS(nonstatic_field, \
volatile_nonstatic_field, \
@@ -68,4 +68,4 @@
#define VM_INT_CONSTANTS_CMS(declare_constant) \
declare_constant(Generation::ConcurrentMarkSweep) \
-#endif // SHARE_VM_GC_IMPLEMENTATION_CONCURRENTMARKSWEEP_VMSTRUCTS_CMS_HPP
+#endif // SHARE_VM_GC_CMS_VMSTRUCTS_CMS_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/parNew/vmStructs_parNew.hpp b/hotspot/src/share/vm/gc/cms/vmStructs_parNew.hpp
similarity index 83%
rename from hotspot/src/share/vm/gc_implementation/parNew/vmStructs_parNew.hpp
rename to hotspot/src/share/vm/gc/cms/vmStructs_parNew.hpp
index c07f084c0e4..289d90458ea 100644
--- a/hotspot/src/share/vm/gc_implementation/parNew/vmStructs_parNew.hpp
+++ b/hotspot/src/share/vm/gc/cms/vmStructs_parNew.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_IMPLEMENTATION_PARNEW_VMSTRUCTS_PARNEW_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_PARNEW_VMSTRUCTS_PARNEW_HPP
+#ifndef SHARE_VM_GC_CMS_VMSTRUCTS_PARNEW_HPP
+#define SHARE_VM_GC_CMS_VMSTRUCTS_PARNEW_HPP
#define VM_TYPES_PARNEW(declare_type) \
declare_type(ParNewGeneration, DefNewGeneration)
@@ -31,4 +31,4 @@
#define VM_INT_CONSTANTS_PARNEW(declare_constant) \
declare_constant(Generation::ParNew)
-#endif // SHARE_VM_GC_IMPLEMENTATION_PARNEW_VMSTRUCTS_PARNEW_HPP
+#endif // SHARE_VM_GC_CMS_VMSTRUCTS_PARNEW_HPP
diff --git a/hotspot/src/share/vm/utilities/yieldingWorkgroup.cpp b/hotspot/src/share/vm/gc/cms/yieldingWorkgroup.cpp
similarity index 99%
rename from hotspot/src/share/vm/utilities/yieldingWorkgroup.cpp
rename to hotspot/src/share/vm/gc/cms/yieldingWorkgroup.cpp
index 1ea33e643d0..29eb4dbf9c1 100644
--- a/hotspot/src/share/vm/utilities/yieldingWorkgroup.cpp
+++ b/hotspot/src/share/vm/gc/cms/yieldingWorkgroup.cpp
@@ -23,8 +23,8 @@
*/
#include "precompiled.hpp"
+#include "gc/cms/yieldingWorkgroup.hpp"
#include "utilities/macros.hpp"
-#include "utilities/yieldingWorkgroup.hpp"
// Forward declaration of classes declared here.
diff --git a/hotspot/src/share/vm/utilities/yieldingWorkgroup.hpp b/hotspot/src/share/vm/gc/cms/yieldingWorkgroup.hpp
similarity index 96%
rename from hotspot/src/share/vm/utilities/yieldingWorkgroup.hpp
rename to hotspot/src/share/vm/gc/cms/yieldingWorkgroup.hpp
index 98d8f438ea4..2696ce56867 100644
--- a/hotspot/src/share/vm/utilities/yieldingWorkgroup.hpp
+++ b/hotspot/src/share/vm/gc/cms/yieldingWorkgroup.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,11 +22,11 @@
*
*/
-#ifndef SHARE_VM_UTILITIES_YIELDINGWORKGROUP_HPP
-#define SHARE_VM_UTILITIES_YIELDINGWORKGROUP_HPP
+#ifndef SHARE_VM_GC_CMS_YIELDINGWORKGROUP_HPP
+#define SHARE_VM_GC_CMS_YIELDINGWORKGROUP_HPP
+#include "gc/shared/workgroup.hpp"
#include "utilities/macros.hpp"
-#include "utilities/workgroup.hpp"
// Forward declarations
class YieldingFlexibleWorkGang;
@@ -211,4 +211,4 @@ private:
void reset(); // NYI
};
-#endif // SHARE_VM_UTILITIES_YIELDINGWORKGROUP_HPP
+#endif // SHARE_VM_GC_CMS_YIELDINGWORKGROUP_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/g1/bufferingOopClosure.cpp b/hotspot/src/share/vm/gc/g1/bufferingOopClosure.cpp
similarity index 98%
rename from hotspot/src/share/vm/gc_implementation/g1/bufferingOopClosure.cpp
rename to hotspot/src/share/vm/gc/g1/bufferingOopClosure.cpp
index d1edd60da9d..1985ee31cc0 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/bufferingOopClosure.cpp
+++ b/hotspot/src/share/vm/gc/g1/bufferingOopClosure.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
*/
#include "precompiled.hpp"
-#include "gc_implementation/g1/bufferingOopClosure.hpp"
+#include "gc/g1/bufferingOopClosure.hpp"
#include "memory/iterator.hpp"
#include "utilities/debug.hpp"
diff --git a/hotspot/src/share/vm/gc_implementation/g1/bufferingOopClosure.hpp b/hotspot/src/share/vm/gc/g1/bufferingOopClosure.hpp
similarity index 94%
rename from hotspot/src/share/vm/gc_implementation/g1/bufferingOopClosure.hpp
rename to hotspot/src/share/vm/gc/g1/bufferingOopClosure.hpp
index ffdc69dfa5c..038aba6f744 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/bufferingOopClosure.hpp
+++ b/hotspot/src/share/vm/gc/g1/bufferingOopClosure.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_IMPLEMENTATION_G1_BUFFERINGOOPCLOSURE_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_G1_BUFFERINGOOPCLOSURE_HPP
+#ifndef SHARE_VM_GC_G1_BUFFERINGOOPCLOSURE_HPP
+#define SHARE_VM_GC_G1_BUFFERINGOOPCLOSURE_HPP
#include "memory/iterator.hpp"
#include "oops/oopsHierarchy.hpp"
@@ -141,4 +141,4 @@ public:
_closure_app_seconds(0.0) { }
};
-#endif // SHARE_VM_GC_IMPLEMENTATION_G1_BUFFERINGOOPCLOSURE_HPP
+#endif // SHARE_VM_GC_G1_BUFFERINGOOPCLOSURE_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/g1/collectionSetChooser.cpp b/hotspot/src/share/vm/gc/g1/collectionSetChooser.cpp
similarity index 96%
rename from hotspot/src/share/vm/gc_implementation/g1/collectionSetChooser.cpp
rename to hotspot/src/share/vm/gc/g1/collectionSetChooser.cpp
index 51825bf4243..e9528320b47 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/collectionSetChooser.cpp
+++ b/hotspot/src/share/vm/gc/g1/collectionSetChooser.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -23,11 +23,11 @@
*/
#include "precompiled.hpp"
-#include "gc_implementation/g1/collectionSetChooser.hpp"
-#include "gc_implementation/g1/g1CollectedHeap.inline.hpp"
-#include "gc_implementation/g1/g1CollectorPolicy.hpp"
-#include "gc_implementation/g1/g1ErgoVerbose.hpp"
-#include "memory/space.inline.hpp"
+#include "gc/g1/collectionSetChooser.hpp"
+#include "gc/g1/g1CollectedHeap.inline.hpp"
+#include "gc/g1/g1CollectorPolicy.hpp"
+#include "gc/g1/g1ErgoVerbose.hpp"
+#include "gc/shared/space.inline.hpp"
#include "runtime/atomic.inline.hpp"
// Even though we don't use the GC efficiency in our heuristics as
diff --git a/hotspot/src/share/vm/gc_implementation/g1/collectionSetChooser.hpp b/hotspot/src/share/vm/gc/g1/collectionSetChooser.hpp
similarity index 95%
rename from hotspot/src/share/vm/gc_implementation/g1/collectionSetChooser.hpp
rename to hotspot/src/share/vm/gc/g1/collectionSetChooser.hpp
index bbe32472cbf..4323652494c 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/collectionSetChooser.hpp
+++ b/hotspot/src/share/vm/gc/g1/collectionSetChooser.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,10 +22,10 @@
*
*/
-#ifndef SHARE_VM_GC_IMPLEMENTATION_G1_COLLECTIONSETCHOOSER_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_G1_COLLECTIONSETCHOOSER_HPP
+#ifndef SHARE_VM_GC_G1_COLLECTIONSETCHOOSER_HPP
+#define SHARE_VM_GC_G1_COLLECTIONSETCHOOSER_HPP
-#include "gc_implementation/g1/heapRegion.hpp"
+#include "gc/g1/heapRegion.hpp"
#include "utilities/growableArray.hpp"
class CollectionSetChooser: public CHeapObj {
@@ -192,5 +192,5 @@ public:
bool should_add(HeapRegion* hr) { return _chooser->should_add(hr); }
};
-#endif // SHARE_VM_GC_IMPLEMENTATION_G1_COLLECTIONSETCHOOSER_HPP
+#endif // SHARE_VM_GC_G1_COLLECTIONSETCHOOSER_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/g1/concurrentG1Refine.cpp b/hotspot/src/share/vm/gc/g1/concurrentG1Refine.cpp
similarity index 93%
rename from hotspot/src/share/vm/gc_implementation/g1/concurrentG1Refine.cpp
rename to hotspot/src/share/vm/gc/g1/concurrentG1Refine.cpp
index 635781b1424..aa8174860ba 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/concurrentG1Refine.cpp
+++ b/hotspot/src/share/vm/gc/g1/concurrentG1Refine.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -23,10 +23,10 @@
*/
#include "precompiled.hpp"
-#include "gc_implementation/g1/concurrentG1Refine.hpp"
-#include "gc_implementation/g1/concurrentG1RefineThread.hpp"
-#include "gc_implementation/g1/g1CollectedHeap.inline.hpp"
-#include "gc_implementation/g1/g1HotCardCache.hpp"
+#include "gc/g1/concurrentG1Refine.hpp"
+#include "gc/g1/concurrentG1RefineThread.hpp"
+#include "gc/g1/g1CollectedHeap.inline.hpp"
+#include "gc/g1/g1HotCardCache.hpp"
#include "runtime/java.hpp"
ConcurrentG1Refine::ConcurrentG1Refine(G1CollectedHeap* g1h, CardTableEntryClosure* refine_closure) :
diff --git a/hotspot/src/share/vm/gc_implementation/g1/concurrentG1Refine.hpp b/hotspot/src/share/vm/gc/g1/concurrentG1Refine.hpp
similarity index 92%
rename from hotspot/src/share/vm/gc_implementation/g1/concurrentG1Refine.hpp
rename to hotspot/src/share/vm/gc/g1/concurrentG1Refine.hpp
index 7f77163818c..ce0e13eaba7 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/concurrentG1Refine.hpp
+++ b/hotspot/src/share/vm/gc/g1/concurrentG1Refine.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,10 +22,10 @@
*
*/
-#ifndef SHARE_VM_GC_IMPLEMENTATION_G1_CONCURRENTG1REFINE_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_G1_CONCURRENTG1REFINE_HPP
+#ifndef SHARE_VM_GC_G1_CONCURRENTG1REFINE_HPP
+#define SHARE_VM_GC_G1_CONCURRENTG1REFINE_HPP
-#include "gc_implementation/g1/g1HotCardCache.hpp"
+#include "gc/g1/g1HotCardCache.hpp"
#include "memory/allocation.hpp"
#include "runtime/thread.hpp"
#include "utilities/globalDefinitions.hpp"
@@ -109,4 +109,4 @@ class ConcurrentG1Refine: public CHeapObj {
G1HotCardCache* hot_card_cache() { return &_hot_card_cache; }
};
-#endif // SHARE_VM_GC_IMPLEMENTATION_G1_CONCURRENTG1REFINE_HPP
+#endif // SHARE_VM_GC_G1_CONCURRENTG1REFINE_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/g1/concurrentG1RefineThread.cpp b/hotspot/src/share/vm/gc/g1/concurrentG1RefineThread.cpp
similarity index 97%
rename from hotspot/src/share/vm/gc_implementation/g1/concurrentG1RefineThread.cpp
rename to hotspot/src/share/vm/gc/g1/concurrentG1RefineThread.cpp
index 159882b7cc2..7a1c4e46092 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/concurrentG1RefineThread.cpp
+++ b/hotspot/src/share/vm/gc/g1/concurrentG1RefineThread.cpp
@@ -23,10 +23,10 @@
*/
#include "precompiled.hpp"
-#include "gc_implementation/g1/concurrentG1Refine.hpp"
-#include "gc_implementation/g1/concurrentG1RefineThread.hpp"
-#include "gc_implementation/g1/g1CollectedHeap.inline.hpp"
-#include "gc_implementation/g1/g1CollectorPolicy.hpp"
+#include "gc/g1/concurrentG1Refine.hpp"
+#include "gc/g1/concurrentG1RefineThread.hpp"
+#include "gc/g1/g1CollectedHeap.inline.hpp"
+#include "gc/g1/g1CollectorPolicy.hpp"
#include "memory/resourceArea.hpp"
#include "runtime/handles.inline.hpp"
#include "runtime/mutexLocker.hpp"
diff --git a/hotspot/src/share/vm/gc_implementation/g1/concurrentG1RefineThread.hpp b/hotspot/src/share/vm/gc/g1/concurrentG1RefineThread.hpp
similarity index 89%
rename from hotspot/src/share/vm/gc_implementation/g1/concurrentG1RefineThread.hpp
rename to hotspot/src/share/vm/gc/g1/concurrentG1RefineThread.hpp
index 1e599aa335f..cbaf3c3d782 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/concurrentG1RefineThread.hpp
+++ b/hotspot/src/share/vm/gc/g1/concurrentG1RefineThread.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,10 +22,10 @@
*
*/
-#ifndef SHARE_VM_GC_IMPLEMENTATION_G1_CONCURRENTG1REFINETHREAD_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_G1_CONCURRENTG1REFINETHREAD_HPP
+#ifndef SHARE_VM_GC_G1_CONCURRENTG1REFINETHREAD_HPP
+#define SHARE_VM_GC_G1_CONCURRENTG1REFINETHREAD_HPP
-#include "gc_implementation/shared/concurrentGCThread.hpp"
+#include "gc/shared/concurrentGCThread.hpp"
// Forward Decl.
class CardTableEntryClosure;
@@ -86,4 +86,4 @@ public:
void stop();
};
-#endif // SHARE_VM_GC_IMPLEMENTATION_G1_CONCURRENTG1REFINETHREAD_HPP
+#endif // SHARE_VM_GC_G1_CONCURRENTG1REFINETHREAD_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp b/hotspot/src/share/vm/gc/g1/concurrentMark.cpp
similarity index 99%
rename from hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp
rename to hotspot/src/share/vm/gc/g1/concurrentMark.cpp
index a6c95d383a4..6fd97a6d6bd 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp
+++ b/hotspot/src/share/vm/gc/g1/concurrentMark.cpp
@@ -26,35 +26,35 @@
#include "classfile/metadataOnStackMark.hpp"
#include "classfile/symbolTable.hpp"
#include "code/codeCache.hpp"
-#include "gc_implementation/g1/concurrentMark.inline.hpp"
-#include "gc_implementation/g1/concurrentMarkThread.inline.hpp"
-#include "gc_implementation/g1/g1CollectedHeap.inline.hpp"
-#include "gc_implementation/g1/g1CollectorPolicy.hpp"
-#include "gc_implementation/g1/g1ErgoVerbose.hpp"
-#include "gc_implementation/g1/g1Log.hpp"
-#include "gc_implementation/g1/g1OopClosures.inline.hpp"
-#include "gc_implementation/g1/g1RemSet.hpp"
-#include "gc_implementation/g1/g1StringDedup.hpp"
-#include "gc_implementation/g1/heapRegion.inline.hpp"
-#include "gc_implementation/g1/heapRegionManager.inline.hpp"
-#include "gc_implementation/g1/heapRegionRemSet.hpp"
-#include "gc_implementation/g1/heapRegionSet.inline.hpp"
-#include "gc_implementation/shared/vmGCOperations.hpp"
-#include "gc_implementation/shared/gcTimer.hpp"
-#include "gc_implementation/shared/gcTrace.hpp"
-#include "gc_implementation/shared/gcTraceTime.hpp"
+#include "gc/g1/concurrentMark.inline.hpp"
+#include "gc/g1/concurrentMarkThread.inline.hpp"
+#include "gc/g1/g1CollectedHeap.inline.hpp"
+#include "gc/g1/g1CollectorPolicy.hpp"
+#include "gc/g1/g1ErgoVerbose.hpp"
+#include "gc/g1/g1Log.hpp"
+#include "gc/g1/g1OopClosures.inline.hpp"
+#include "gc/g1/g1RemSet.hpp"
+#include "gc/g1/g1StringDedup.hpp"
+#include "gc/g1/heapRegion.inline.hpp"
+#include "gc/g1/heapRegionManager.inline.hpp"
+#include "gc/g1/heapRegionRemSet.hpp"
+#include "gc/g1/heapRegionSet.inline.hpp"
+#include "gc/shared/gcTimer.hpp"
+#include "gc/shared/gcTrace.hpp"
+#include "gc/shared/gcTraceTime.hpp"
+#include "gc/shared/genOopClosures.inline.hpp"
+#include "gc/shared/referencePolicy.hpp"
+#include "gc/shared/strongRootsScope.hpp"
+#include "gc/shared/taskqueue.inline.hpp"
+#include "gc/shared/vmGCOperations.hpp"
#include "memory/allocation.hpp"
-#include "memory/genOopClosures.inline.hpp"
-#include "memory/referencePolicy.hpp"
#include "memory/resourceArea.hpp"
-#include "memory/strongRootsScope.hpp"
#include "oops/oop.inline.hpp"
+#include "runtime/atomic.inline.hpp"
#include "runtime/handles.inline.hpp"
#include "runtime/java.hpp"
-#include "runtime/atomic.inline.hpp"
#include "runtime/prefetch.inline.hpp"
#include "services/memTracker.hpp"
-#include "utilities/taskqueue.inline.hpp"
// Concurrent marking bit map wrapper
diff --git a/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.hpp b/hotspot/src/share/vm/gc/g1/concurrentMark.hpp
similarity index 99%
rename from hotspot/src/share/vm/gc_implementation/g1/concurrentMark.hpp
rename to hotspot/src/share/vm/gc/g1/concurrentMark.hpp
index ace60573da1..fdae961f333 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.hpp
+++ b/hotspot/src/share/vm/gc/g1/concurrentMark.hpp
@@ -22,14 +22,14 @@
*
*/
-#ifndef SHARE_VM_GC_IMPLEMENTATION_G1_CONCURRENTMARK_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_G1_CONCURRENTMARK_HPP
+#ifndef SHARE_VM_GC_G1_CONCURRENTMARK_HPP
+#define SHARE_VM_GC_G1_CONCURRENTMARK_HPP
#include "classfile/javaClasses.hpp"
-#include "gc_implementation/g1/heapRegionSet.hpp"
-#include "gc_implementation/g1/g1RegionToSpaceMapper.hpp"
-#include "gc_implementation/shared/gcId.hpp"
-#include "utilities/taskqueue.hpp"
+#include "gc/g1/g1RegionToSpaceMapper.hpp"
+#include "gc/g1/heapRegionSet.hpp"
+#include "gc/shared/gcId.hpp"
+#include "gc/shared/taskqueue.hpp"
class G1CollectedHeap;
class CMBitMap;
@@ -1224,4 +1224,4 @@ public:
~G1PrintRegionLivenessInfoClosure();
};
-#endif // SHARE_VM_GC_IMPLEMENTATION_G1_CONCURRENTMARK_HPP
+#endif // SHARE_VM_GC_G1_CONCURRENTMARK_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.inline.hpp b/hotspot/src/share/vm/gc/g1/concurrentMark.inline.hpp
similarity index 97%
rename from hotspot/src/share/vm/gc_implementation/g1/concurrentMark.inline.hpp
rename to hotspot/src/share/vm/gc/g1/concurrentMark.inline.hpp
index 61e627c21fa..13acd6baef8 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.inline.hpp
+++ b/hotspot/src/share/vm/gc/g1/concurrentMark.inline.hpp
@@ -22,12 +22,12 @@
*
*/
-#ifndef SHARE_VM_GC_IMPLEMENTATION_G1_CONCURRENTMARK_INLINE_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_G1_CONCURRENTMARK_INLINE_HPP
+#ifndef SHARE_VM_GC_G1_CONCURRENTMARK_INLINE_HPP
+#define SHARE_VM_GC_G1_CONCURRENTMARK_INLINE_HPP
-#include "gc_implementation/g1/concurrentMark.hpp"
-#include "gc_implementation/g1/g1CollectedHeap.inline.hpp"
-#include "utilities/taskqueue.inline.hpp"
+#include "gc/g1/concurrentMark.hpp"
+#include "gc/g1/g1CollectedHeap.inline.hpp"
+#include "gc/shared/taskqueue.inline.hpp"
// Utility routine to set an exclusive range of cards on the given
// card liveness bitmap
@@ -404,4 +404,4 @@ inline void ConcurrentMark::grayRoot(oop obj, size_t word_size,
}
}
-#endif // SHARE_VM_GC_IMPLEMENTATION_G1_CONCURRENTMARK_INLINE_HPP
+#endif // SHARE_VM_GC_G1_CONCURRENTMARK_INLINE_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/g1/concurrentMarkThread.cpp b/hotspot/src/share/vm/gc/g1/concurrentMarkThread.cpp
similarity index 97%
rename from hotspot/src/share/vm/gc_implementation/g1/concurrentMarkThread.cpp
rename to hotspot/src/share/vm/gc/g1/concurrentMarkThread.cpp
index 878bbc63691..3e1a08e9377 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/concurrentMarkThread.cpp
+++ b/hotspot/src/share/vm/gc/g1/concurrentMarkThread.cpp
@@ -23,13 +23,13 @@
*/
#include "precompiled.hpp"
-#include "gc_implementation/g1/concurrentMarkThread.inline.hpp"
-#include "gc_implementation/g1/g1CollectedHeap.inline.hpp"
-#include "gc_implementation/g1/g1CollectorPolicy.hpp"
-#include "gc_implementation/g1/g1Log.hpp"
-#include "gc_implementation/g1/g1MMUTracker.hpp"
-#include "gc_implementation/g1/vm_operations_g1.hpp"
-#include "gc_implementation/shared/gcTrace.hpp"
+#include "gc/g1/concurrentMarkThread.inline.hpp"
+#include "gc/g1/g1CollectedHeap.inline.hpp"
+#include "gc/g1/g1CollectorPolicy.hpp"
+#include "gc/g1/g1Log.hpp"
+#include "gc/g1/g1MMUTracker.hpp"
+#include "gc/g1/vm_operations_g1.hpp"
+#include "gc/shared/gcTrace.hpp"
#include "memory/resourceArea.hpp"
#include "runtime/vmThread.hpp"
diff --git a/hotspot/src/share/vm/gc_implementation/g1/concurrentMarkThread.hpp b/hotspot/src/share/vm/gc/g1/concurrentMarkThread.hpp
similarity index 90%
rename from hotspot/src/share/vm/gc_implementation/g1/concurrentMarkThread.hpp
rename to hotspot/src/share/vm/gc/g1/concurrentMarkThread.hpp
index 237e022084b..b6e7fa75acb 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/concurrentMarkThread.hpp
+++ b/hotspot/src/share/vm/gc/g1/concurrentMarkThread.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,10 +22,10 @@
*
*/
-#ifndef SHARE_VM_GC_IMPLEMENTATION_G1_CONCURRENTMARKTHREAD_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_G1_CONCURRENTMARKTHREAD_HPP
+#ifndef SHARE_VM_GC_G1_CONCURRENTMARKTHREAD_HPP
+#define SHARE_VM_GC_G1_CONCURRENTMARKTHREAD_HPP
-#include "gc_implementation/shared/concurrentGCThread.hpp"
+#include "gc/shared/concurrentGCThread.hpp"
// The Concurrent Mark GC Thread (could be several in the future).
// This is copied from the Concurrent Mark Sweep GC Thread
@@ -89,4 +89,4 @@ class ConcurrentMarkThread: public ConcurrentGCThread {
void stop();
};
-#endif // SHARE_VM_GC_IMPLEMENTATION_G1_CONCURRENTMARKTHREAD_HPP
+#endif // SHARE_VM_GC_G1_CONCURRENTMARKTHREAD_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/g1/concurrentMarkThread.inline.hpp b/hotspot/src/share/vm/gc/g1/concurrentMarkThread.inline.hpp
similarity index 77%
rename from hotspot/src/share/vm/gc_implementation/g1/concurrentMarkThread.inline.hpp
rename to hotspot/src/share/vm/gc/g1/concurrentMarkThread.inline.hpp
index 320daf9b8d3..e31475fedd6 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/concurrentMarkThread.inline.hpp
+++ b/hotspot/src/share/vm/gc/g1/concurrentMarkThread.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,11 +22,11 @@
*
*/
-#ifndef SHARE_VM_GC_IMPLEMENTATION_G1_CONCURRENTMARKTHREAD_INLINE_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_G1_CONCURRENTMARKTHREAD_INLINE_HPP
+#ifndef SHARE_VM_GC_G1_CONCURRENTMARKTHREAD_INLINE_HPP
+#define SHARE_VM_GC_G1_CONCURRENTMARKTHREAD_INLINE_HPP
-#include "gc_implementation/g1/concurrentMark.hpp"
-#include "gc_implementation/g1/concurrentMarkThread.hpp"
+#include "gc/g1/concurrentMark.hpp"
+#include "gc/g1/concurrentMarkThread.hpp"
// Total virtual time so far.
inline double ConcurrentMarkThread::vtime_accum() {
@@ -38,4 +38,4 @@ inline double ConcurrentMarkThread::vtime_mark_accum() {
return _vtime_mark_accum + _cm->all_task_accum_vtime();
}
-#endif // SHARE_VM_GC_IMPLEMENTATION_G1_CONCURRENTMARKTHREAD_INLINE_HPP
+#endif // SHARE_VM_GC_G1_CONCURRENTMARKTHREAD_INLINE_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/g1/dirtyCardQueue.cpp b/hotspot/src/share/vm/gc/g1/dirtyCardQueue.cpp
similarity index 97%
rename from hotspot/src/share/vm/gc_implementation/g1/dirtyCardQueue.cpp
rename to hotspot/src/share/vm/gc/g1/dirtyCardQueue.cpp
index 32b1f763f25..94a60746a1f 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/dirtyCardQueue.cpp
+++ b/hotspot/src/share/vm/gc/g1/dirtyCardQueue.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -23,14 +23,14 @@
*/
#include "precompiled.hpp"
-#include "gc_implementation/g1/dirtyCardQueue.hpp"
-#include "gc_implementation/g1/g1CollectedHeap.inline.hpp"
-#include "gc_implementation/g1/heapRegionRemSet.hpp"
+#include "gc/g1/dirtyCardQueue.hpp"
+#include "gc/g1/g1CollectedHeap.inline.hpp"
+#include "gc/g1/heapRegionRemSet.hpp"
+#include "gc/shared/workgroup.hpp"
#include "runtime/atomic.inline.hpp"
#include "runtime/mutexLocker.hpp"
#include "runtime/safepoint.hpp"
#include "runtime/thread.inline.hpp"
-#include "utilities/workgroup.hpp"
bool DirtyCardQueue::apply_closure(CardTableEntryClosure* cl,
bool consume,
diff --git a/hotspot/src/share/vm/gc_implementation/g1/dirtyCardQueue.hpp b/hotspot/src/share/vm/gc/g1/dirtyCardQueue.hpp
similarity index 96%
rename from hotspot/src/share/vm/gc_implementation/g1/dirtyCardQueue.hpp
rename to hotspot/src/share/vm/gc/g1/dirtyCardQueue.hpp
index 27d287ea962..84a02b8f1d2 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/dirtyCardQueue.hpp
+++ b/hotspot/src/share/vm/gc/g1/dirtyCardQueue.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,10 +22,10 @@
*
*/
-#ifndef SHARE_VM_GC_IMPLEMENTATION_G1_DIRTYCARDQUEUE_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_G1_DIRTYCARDQUEUE_HPP
+#ifndef SHARE_VM_GC_G1_DIRTYCARDQUEUE_HPP
+#define SHARE_VM_GC_G1_DIRTYCARDQUEUE_HPP
-#include "gc_implementation/g1/ptrQueue.hpp"
+#include "gc/g1/ptrQueue.hpp"
#include "memory/allocation.hpp"
class FreeIdSet;
@@ -172,4 +172,4 @@ public:
};
-#endif // SHARE_VM_GC_IMPLEMENTATION_G1_DIRTYCARDQUEUE_HPP
+#endif // SHARE_VM_GC_G1_DIRTYCARDQUEUE_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/g1/evacuationInfo.hpp b/hotspot/src/share/vm/gc/g1/evacuationInfo.hpp
similarity index 94%
rename from hotspot/src/share/vm/gc_implementation/g1/evacuationInfo.hpp
rename to hotspot/src/share/vm/gc/g1/evacuationInfo.hpp
index 06bbefff93e..17677537835 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/evacuationInfo.hpp
+++ b/hotspot/src/share/vm/gc/g1/evacuationInfo.hpp
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_IMPLEMENTATION_G1_EVACUATIONINFO_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_G1_EVACUATIONINFO_HPP
+#ifndef SHARE_VM_GC_G1_EVACUATIONINFO_HPP
+#define SHARE_VM_GC_G1_EVACUATIONINFO_HPP
#include "memory/allocation.hpp"
@@ -78,4 +78,4 @@ public:
uint regions_freed() { return _regions_freed; }
};
-#endif // SHARE_VM_GC_IMPLEMENTATION_G1_EVACUATIONINFO_HPP
+#endif // SHARE_VM_GC_G1_EVACUATIONINFO_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1AllocRegion.cpp b/hotspot/src/share/vm/gc/g1/g1AllocRegion.cpp
similarity index 98%
rename from hotspot/src/share/vm/gc_implementation/g1/g1AllocRegion.cpp
rename to hotspot/src/share/vm/gc/g1/g1AllocRegion.cpp
index 697a4027577..ea5f98c6859 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/g1AllocRegion.cpp
+++ b/hotspot/src/share/vm/gc/g1/g1AllocRegion.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -23,8 +23,8 @@
*/
#include "precompiled.hpp"
-#include "gc_implementation/g1/g1AllocRegion.inline.hpp"
-#include "gc_implementation/g1/g1CollectedHeap.inline.hpp"
+#include "gc/g1/g1AllocRegion.inline.hpp"
+#include "gc/g1/g1CollectedHeap.inline.hpp"
#include "runtime/orderAccess.inline.hpp"
G1CollectedHeap* G1AllocRegion::_g1h = NULL;
diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1AllocRegion.hpp b/hotspot/src/share/vm/gc/g1/g1AllocRegion.hpp
similarity index 97%
rename from hotspot/src/share/vm/gc_implementation/g1/g1AllocRegion.hpp
rename to hotspot/src/share/vm/gc/g1/g1AllocRegion.hpp
index 2edc6545ce6..fe303a5a02e 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/g1AllocRegion.hpp
+++ b/hotspot/src/share/vm/gc/g1/g1AllocRegion.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,10 +22,10 @@
*
*/
-#ifndef SHARE_VM_GC_IMPLEMENTATION_G1_G1ALLOCREGION_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_G1_G1ALLOCREGION_HPP
+#ifndef SHARE_VM_GC_G1_G1ALLOCREGION_HPP
+#define SHARE_VM_GC_G1_G1ALLOCREGION_HPP
-#include "gc_implementation/g1/heapRegion.hpp"
+#include "gc/g1/heapRegion.hpp"
class G1CollectedHeap;
@@ -233,4 +233,4 @@ public:
}
};
-#endif // SHARE_VM_GC_IMPLEMENTATION_G1_G1ALLOCREGION_HPP
+#endif // SHARE_VM_GC_G1_G1ALLOCREGION_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1AllocRegion.inline.hpp b/hotspot/src/share/vm/gc/g1/g1AllocRegion.inline.hpp
similarity index 90%
rename from hotspot/src/share/vm/gc_implementation/g1/g1AllocRegion.inline.hpp
rename to hotspot/src/share/vm/gc/g1/g1AllocRegion.inline.hpp
index 2f3529d3e3c..68b959f1dbe 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/g1AllocRegion.inline.hpp
+++ b/hotspot/src/share/vm/gc/g1/g1AllocRegion.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,11 +22,11 @@
*
*/
-#ifndef SHARE_VM_GC_IMPLEMENTATION_G1_G1ALLOCREGION_INLINE_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_G1_G1ALLOCREGION_INLINE_HPP
+#ifndef SHARE_VM_GC_G1_G1ALLOCREGION_INLINE_HPP
+#define SHARE_VM_GC_G1_G1ALLOCREGION_INLINE_HPP
-#include "gc_implementation/g1/g1AllocRegion.hpp"
-#include "gc_implementation/g1/heapRegion.inline.hpp"
+#include "gc/g1/g1AllocRegion.hpp"
+#include "gc/g1/heapRegion.inline.hpp"
inline HeapWord* G1AllocRegion::allocate(HeapRegion* alloc_region,
size_t word_size,
@@ -104,4 +104,4 @@ inline HeapWord* G1AllocRegion::attempt_allocation_force(size_t word_size,
return NULL;
}
-#endif // SHARE_VM_GC_IMPLEMENTATION_G1_G1ALLOCREGION_INLINE_HPP
+#endif // SHARE_VM_GC_G1_G1ALLOCREGION_INLINE_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1AllocationContext.hpp b/hotspot/src/share/vm/gc/g1/g1AllocationContext.hpp
similarity index 85%
rename from hotspot/src/share/vm/gc_implementation/g1/g1AllocationContext.hpp
rename to hotspot/src/share/vm/gc/g1/g1AllocationContext.hpp
index c1089268ca6..b740b375573 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/g1AllocationContext.hpp
+++ b/hotspot/src/share/vm/gc/g1/g1AllocationContext.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_IMPLEMENTATION_G1_G1ALLOCATIONCONTEXT_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_G1_G1ALLOCATIONCONTEXT_HPP
+#ifndef SHARE_VM_GC_G1_G1ALLOCATIONCONTEXT_HPP
+#define SHARE_VM_GC_G1_G1ALLOCATIONCONTEXT_HPP
#include "memory/allocation.hpp"
@@ -49,4 +49,4 @@ public:
inline bool available() { return false; }
};
-#endif // SHARE_VM_GC_IMPLEMENTATION_G1_G1ALLOCATIONCONTEXT_HPP
+#endif // SHARE_VM_GC_G1_G1ALLOCATIONCONTEXT_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1Allocator.cpp b/hotspot/src/share/vm/gc/g1/g1Allocator.cpp
similarity index 96%
rename from hotspot/src/share/vm/gc_implementation/g1/g1Allocator.cpp
rename to hotspot/src/share/vm/gc/g1/g1Allocator.cpp
index 16e0bcbcfe1..c3703ced3c1 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/g1Allocator.cpp
+++ b/hotspot/src/share/vm/gc/g1/g1Allocator.cpp
@@ -23,11 +23,11 @@
*/
#include "precompiled.hpp"
-#include "gc_implementation/g1/g1Allocator.hpp"
-#include "gc_implementation/g1/g1CollectedHeap.inline.hpp"
-#include "gc_implementation/g1/g1CollectorPolicy.hpp"
-#include "gc_implementation/g1/heapRegion.inline.hpp"
-#include "gc_implementation/g1/heapRegionSet.inline.hpp"
+#include "gc/g1/g1Allocator.hpp"
+#include "gc/g1/g1CollectedHeap.inline.hpp"
+#include "gc/g1/g1CollectorPolicy.hpp"
+#include "gc/g1/heapRegion.inline.hpp"
+#include "gc/g1/heapRegionSet.inline.hpp"
void G1DefaultAllocator::init_mutator_alloc_region() {
assert(_mutator_alloc_region.get() == NULL, "pre-condition");
diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1Allocator.hpp b/hotspot/src/share/vm/gc/g1/g1Allocator.hpp
similarity index 95%
rename from hotspot/src/share/vm/gc_implementation/g1/g1Allocator.hpp
rename to hotspot/src/share/vm/gc/g1/g1Allocator.hpp
index 2830a80ae91..be1d2215857 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/g1Allocator.hpp
+++ b/hotspot/src/share/vm/gc/g1/g1Allocator.hpp
@@ -22,14 +22,14 @@
*
*/
-#ifndef SHARE_VM_GC_IMPLEMENTATION_G1_G1ALLOCATOR_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_G1_G1ALLOCATOR_HPP
+#ifndef SHARE_VM_GC_G1_G1ALLOCATOR_HPP
+#define SHARE_VM_GC_G1_G1ALLOCATOR_HPP
-#include "gc_implementation/g1/g1AllocationContext.hpp"
-#include "gc_implementation/g1/g1AllocRegion.hpp"
-#include "gc_implementation/g1/g1InCSetState.hpp"
-#include "gc_implementation/shared/plab.hpp"
-#include "gc_interface/collectedHeap.hpp"
+#include "gc/g1/g1AllocRegion.hpp"
+#include "gc/g1/g1AllocationContext.hpp"
+#include "gc/g1/g1InCSetState.hpp"
+#include "gc/shared/collectedHeap.hpp"
+#include "gc/shared/plab.hpp"
class EvacuationInfo;
@@ -269,4 +269,4 @@ public:
virtual void waste(size_t& wasted, size_t& undo_wasted);
};
-#endif // SHARE_VM_GC_IMPLEMENTATION_G1_G1ALLOCATOR_HPP
+#endif // SHARE_VM_GC_G1_G1ALLOCATOR_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1Allocator_ext.cpp b/hotspot/src/share/vm/gc/g1/g1Allocator_ext.cpp
similarity index 87%
rename from hotspot/src/share/vm/gc_implementation/g1/g1Allocator_ext.cpp
rename to hotspot/src/share/vm/gc/g1/g1Allocator_ext.cpp
index e852b37f37b..3491ece62ab 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/g1Allocator_ext.cpp
+++ b/hotspot/src/share/vm/gc/g1/g1Allocator_ext.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -23,8 +23,8 @@
*/
#include "precompiled.hpp"
-#include "gc_implementation/g1/g1Allocator.hpp"
-#include "gc_implementation/g1/g1CollectedHeap.hpp"
+#include "gc/g1/g1Allocator.hpp"
+#include "gc/g1/g1CollectedHeap.hpp"
G1Allocator* G1Allocator::create_allocator(G1CollectedHeap* g1h) {
return new G1DefaultAllocator(g1h);
diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1BiasedArray.cpp b/hotspot/src/share/vm/gc/g1/g1BiasedArray.cpp
similarity index 98%
rename from hotspot/src/share/vm/gc_implementation/g1/g1BiasedArray.cpp
rename to hotspot/src/share/vm/gc/g1/g1BiasedArray.cpp
index 8c5bef77122..a0b9901a01f 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/g1BiasedArray.cpp
+++ b/hotspot/src/share/vm/gc/g1/g1BiasedArray.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
*/
#include "precompiled.hpp"
-#include "gc_implementation/g1/g1BiasedArray.hpp"
+#include "gc/g1/g1BiasedArray.hpp"
#include "memory/padded.inline.hpp"
// Allocate a new array, generic version.
diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1BiasedArray.hpp b/hotspot/src/share/vm/gc/g1/g1BiasedArray.hpp
similarity index 96%
rename from hotspot/src/share/vm/gc_implementation/g1/g1BiasedArray.hpp
rename to hotspot/src/share/vm/gc/g1/g1BiasedArray.hpp
index f7ec3e39f2d..45e6981f2b3 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/g1BiasedArray.hpp
+++ b/hotspot/src/share/vm/gc/g1/g1BiasedArray.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_IMPLEMENTATION_G1_G1BIASEDARRAY_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_G1_G1BIASEDARRAY_HPP
+#ifndef SHARE_VM_GC_G1_G1BIASEDARRAY_HPP
+#define SHARE_VM_GC_G1_G1BIASEDARRAY_HPP
#include "memory/allocation.hpp"
#include "utilities/debug.hpp"
@@ -174,4 +174,4 @@ public:
}
};
-#endif // SHARE_VM_GC_IMPLEMENTATION_G1_G1BIASEDARRAY_HPP
+#endif // SHARE_VM_GC_G1_G1BIASEDARRAY_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1BlockOffsetTable.cpp b/hotspot/src/share/vm/gc/g1/g1BlockOffsetTable.cpp
similarity index 99%
rename from hotspot/src/share/vm/gc_implementation/g1/g1BlockOffsetTable.cpp
rename to hotspot/src/share/vm/gc/g1/g1BlockOffsetTable.cpp
index 1add1f34369..a37b2578364 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/g1BlockOffsetTable.cpp
+++ b/hotspot/src/share/vm/gc/g1/g1BlockOffsetTable.cpp
@@ -23,10 +23,10 @@
*/
#include "precompiled.hpp"
-#include "gc_implementation/g1/g1BlockOffsetTable.inline.hpp"
-#include "gc_implementation/g1/g1CollectedHeap.inline.hpp"
-#include "gc_implementation/g1/heapRegion.hpp"
-#include "memory/space.hpp"
+#include "gc/g1/g1BlockOffsetTable.inline.hpp"
+#include "gc/g1/g1CollectedHeap.inline.hpp"
+#include "gc/g1/heapRegion.hpp"
+#include "gc/shared/space.hpp"
#include "oops/oop.inline.hpp"
#include "runtime/java.hpp"
#include "services/memTracker.hpp"
diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1BlockOffsetTable.hpp b/hotspot/src/share/vm/gc/g1/g1BlockOffsetTable.hpp
similarity index 98%
rename from hotspot/src/share/vm/gc_implementation/g1/g1BlockOffsetTable.hpp
rename to hotspot/src/share/vm/gc/g1/g1BlockOffsetTable.hpp
index bda43d23140..6f10a94392c 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/g1BlockOffsetTable.hpp
+++ b/hotspot/src/share/vm/gc/g1/g1BlockOffsetTable.hpp
@@ -22,10 +22,10 @@
*
*/
-#ifndef SHARE_VM_GC_IMPLEMENTATION_G1_G1BLOCKOFFSETTABLE_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_G1_G1BLOCKOFFSETTABLE_HPP
+#ifndef SHARE_VM_GC_G1_G1BLOCKOFFSETTABLE_HPP
+#define SHARE_VM_GC_G1_G1BLOCKOFFSETTABLE_HPP
-#include "gc_implementation/g1/g1RegionToSpaceMapper.hpp"
+#include "gc/g1/g1RegionToSpaceMapper.hpp"
#include "memory/memRegion.hpp"
#include "memory/virtualspace.hpp"
#include "utilities/globalDefinitions.hpp"
@@ -377,4 +377,4 @@ class G1BlockOffsetArrayContigSpace: public G1BlockOffsetArray {
virtual void print_on(outputStream* out) PRODUCT_RETURN;
};
-#endif // SHARE_VM_GC_IMPLEMENTATION_G1_G1BLOCKOFFSETTABLE_HPP
+#endif // SHARE_VM_GC_G1_G1BLOCKOFFSETTABLE_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1BlockOffsetTable.inline.hpp b/hotspot/src/share/vm/gc/g1/g1BlockOffsetTable.inline.hpp
similarity index 94%
rename from hotspot/src/share/vm/gc_implementation/g1/g1BlockOffsetTable.inline.hpp
rename to hotspot/src/share/vm/gc/g1/g1BlockOffsetTable.inline.hpp
index 2d9a453a6f0..fd513bed1fb 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/g1BlockOffsetTable.inline.hpp
+++ b/hotspot/src/share/vm/gc/g1/g1BlockOffsetTable.inline.hpp
@@ -22,12 +22,12 @@
*
*/
-#ifndef SHARE_VM_GC_IMPLEMENTATION_G1_G1BLOCKOFFSETTABLE_INLINE_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_G1_G1BLOCKOFFSETTABLE_INLINE_HPP
+#ifndef SHARE_VM_GC_G1_G1BLOCKOFFSETTABLE_INLINE_HPP
+#define SHARE_VM_GC_G1_G1BLOCKOFFSETTABLE_INLINE_HPP
-#include "gc_implementation/g1/g1BlockOffsetTable.hpp"
-#include "gc_implementation/g1/heapRegion.inline.hpp"
-#include "memory/space.hpp"
+#include "gc/g1/g1BlockOffsetTable.hpp"
+#include "gc/g1/heapRegion.inline.hpp"
+#include "gc/shared/space.hpp"
inline HeapWord* G1BlockOffsetTable::block_start(const void* addr) {
if (addr >= _bottom && addr < _end) {
@@ -172,4 +172,4 @@ G1BlockOffsetArray::forward_to_block_containing_addr(HeapWord* q,
return q;
}
-#endif // SHARE_VM_GC_IMPLEMENTATION_G1_G1BLOCKOFFSETTABLE_INLINE_HPP
+#endif // SHARE_VM_GC_G1_G1BLOCKOFFSETTABLE_INLINE_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1CardCounts.cpp b/hotspot/src/share/vm/gc/g1/g1CardCounts.cpp
similarity index 95%
rename from hotspot/src/share/vm/gc_implementation/g1/g1CardCounts.cpp
rename to hotspot/src/share/vm/gc/g1/g1CardCounts.cpp
index 440c7fbc256..0ed901aa242 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/g1CardCounts.cpp
+++ b/hotspot/src/share/vm/gc/g1/g1CardCounts.cpp
@@ -23,11 +23,11 @@
*/
#include "precompiled.hpp"
-#include "gc_implementation/g1/g1CardCounts.hpp"
-#include "gc_implementation/g1/g1CollectedHeap.inline.hpp"
-#include "gc_implementation/g1/g1CollectorPolicy.hpp"
-#include "gc_implementation/g1/g1GCPhaseTimes.hpp"
-#include "memory/cardTableModRefBS.hpp"
+#include "gc/g1/g1CardCounts.hpp"
+#include "gc/g1/g1CollectedHeap.inline.hpp"
+#include "gc/g1/g1CollectorPolicy.hpp"
+#include "gc/g1/g1GCPhaseTimes.hpp"
+#include "gc/shared/cardTableModRefBS.hpp"
#include "services/memTracker.hpp"
#include "utilities/copy.hpp"
diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1CardCounts.hpp b/hotspot/src/share/vm/gc/g1/g1CardCounts.hpp
similarity index 95%
rename from hotspot/src/share/vm/gc_implementation/g1/g1CardCounts.hpp
rename to hotspot/src/share/vm/gc/g1/g1CardCounts.hpp
index be509cee874..bb8ab72f0cb 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/g1CardCounts.hpp
+++ b/hotspot/src/share/vm/gc/g1/g1CardCounts.hpp
@@ -22,10 +22,10 @@
*
*/
-#ifndef SHARE_VM_GC_IMPLEMENTATION_G1_G1CARDCOUNTS_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_G1_G1CARDCOUNTS_HPP
+#ifndef SHARE_VM_GC_G1_G1CARDCOUNTS_HPP
+#define SHARE_VM_GC_G1_G1CARDCOUNTS_HPP
-#include "gc_implementation/g1/g1RegionToSpaceMapper.hpp"
+#include "gc/g1/g1RegionToSpaceMapper.hpp"
#include "memory/allocation.hpp"
#include "memory/virtualspace.hpp"
#include "utilities/globalDefinitions.hpp"
@@ -129,4 +129,4 @@ class G1CardCounts: public CHeapObj {
void clear_all();
};
-#endif // SHARE_VM_GC_IMPLEMENTATION_G1_G1CARDCOUNTS_HPP
+#endif // SHARE_VM_GC_G1_G1CARDCOUNTS_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1CodeCacheRemSet.cpp b/hotspot/src/share/vm/gc/g1/g1CodeCacheRemSet.cpp
similarity index 98%
rename from hotspot/src/share/vm/gc_implementation/g1/g1CodeCacheRemSet.cpp
rename to hotspot/src/share/vm/gc/g1/g1CodeCacheRemSet.cpp
index b09d8a8a31e..a9690ac2318 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/g1CodeCacheRemSet.cpp
+++ b/hotspot/src/share/vm/gc/g1/g1CodeCacheRemSet.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,8 +25,8 @@
#include "precompiled.hpp"
#include "code/codeCache.hpp"
#include "code/nmethod.hpp"
-#include "gc_implementation/g1/g1CodeCacheRemSet.hpp"
-#include "gc_implementation/g1/heapRegion.hpp"
+#include "gc/g1/g1CodeCacheRemSet.hpp"
+#include "gc/g1/heapRegion.hpp"
#include "memory/heap.hpp"
#include "memory/iterator.hpp"
#include "oops/oop.inline.hpp"
diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1CodeCacheRemSet.hpp b/hotspot/src/share/vm/gc/g1/g1CodeCacheRemSet.hpp
similarity index 90%
rename from hotspot/src/share/vm/gc_implementation/g1/g1CodeCacheRemSet.hpp
rename to hotspot/src/share/vm/gc/g1/g1CodeCacheRemSet.hpp
index 87eb52a5b64..fcd82187909 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/g1CodeCacheRemSet.hpp
+++ b/hotspot/src/share/vm/gc/g1/g1CodeCacheRemSet.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_IMPLEMENTATION_G1_G1CODECACHEREMSET_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_G1_G1CODECACHEREMSET_HPP
+#ifndef SHARE_VM_GC_G1_G1CODECACHEREMSET_HPP
+#define SHARE_VM_GC_G1_G1CODECACHEREMSET_HPP
#include "memory/allocation.hpp"
@@ -86,4 +86,4 @@ class G1CodeRootSet VALUE_OBJ_CLASS_SPEC {
};
-#endif // SHARE_VM_GC_IMPLEMENTATION_G1_G1CODECACHEREMSET_HPP
+#endif // SHARE_VM_GC_G1_G1CODECACHEREMSET_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp b/hotspot/src/share/vm/gc/g1/g1CollectedHeap.cpp
similarity index 99%
rename from hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp
rename to hotspot/src/share/vm/gc/g1/g1CollectedHeap.cpp
index 52eb65cda8a..19095c5f887 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp
+++ b/hotspot/src/share/vm/gc/g1/g1CollectedHeap.cpp
@@ -27,46 +27,46 @@
#include "classfile/stringTable.hpp"
#include "code/codeCache.hpp"
#include "code/icBuffer.hpp"
-#include "gc_implementation/g1/bufferingOopClosure.hpp"
-#include "gc_implementation/g1/concurrentG1Refine.hpp"
-#include "gc_implementation/g1/concurrentG1RefineThread.hpp"
-#include "gc_implementation/g1/concurrentMarkThread.inline.hpp"
-#include "gc_implementation/g1/g1AllocRegion.inline.hpp"
-#include "gc_implementation/g1/g1CollectedHeap.inline.hpp"
-#include "gc_implementation/g1/g1CollectorPolicy.hpp"
-#include "gc_implementation/g1/g1ErgoVerbose.hpp"
-#include "gc_implementation/g1/g1EvacFailure.hpp"
-#include "gc_implementation/g1/g1GCPhaseTimes.hpp"
-#include "gc_implementation/g1/g1Log.hpp"
-#include "gc_implementation/g1/g1MarkSweep.hpp"
-#include "gc_implementation/g1/g1OopClosures.inline.hpp"
-#include "gc_implementation/g1/g1ParScanThreadState.inline.hpp"
-#include "gc_implementation/g1/g1RegionToSpaceMapper.hpp"
-#include "gc_implementation/g1/g1RemSet.inline.hpp"
-#include "gc_implementation/g1/g1RootProcessor.hpp"
-#include "gc_implementation/g1/g1StringDedup.hpp"
-#include "gc_implementation/g1/g1YCTypes.hpp"
-#include "gc_implementation/g1/heapRegion.inline.hpp"
-#include "gc_implementation/g1/heapRegionRemSet.hpp"
-#include "gc_implementation/g1/heapRegionSet.inline.hpp"
-#include "gc_implementation/g1/vm_operations_g1.hpp"
-#include "gc_implementation/shared/gcHeapSummary.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/g1/bufferingOopClosure.hpp"
+#include "gc/g1/concurrentG1Refine.hpp"
+#include "gc/g1/concurrentG1RefineThread.hpp"
+#include "gc/g1/concurrentMarkThread.inline.hpp"
+#include "gc/g1/g1AllocRegion.inline.hpp"
+#include "gc/g1/g1CollectedHeap.inline.hpp"
+#include "gc/g1/g1CollectorPolicy.hpp"
+#include "gc/g1/g1ErgoVerbose.hpp"
+#include "gc/g1/g1EvacFailure.hpp"
+#include "gc/g1/g1GCPhaseTimes.hpp"
+#include "gc/g1/g1Log.hpp"
+#include "gc/g1/g1MarkSweep.hpp"
+#include "gc/g1/g1OopClosures.inline.hpp"
+#include "gc/g1/g1ParScanThreadState.inline.hpp"
+#include "gc/g1/g1RegionToSpaceMapper.hpp"
+#include "gc/g1/g1RemSet.inline.hpp"
+#include "gc/g1/g1RootProcessor.hpp"
+#include "gc/g1/g1StringDedup.hpp"
+#include "gc/g1/g1YCTypes.hpp"
+#include "gc/g1/heapRegion.inline.hpp"
+#include "gc/g1/heapRegionRemSet.hpp"
+#include "gc/g1/heapRegionSet.inline.hpp"
+#include "gc/g1/vm_operations_g1.hpp"
+#include "gc/shared/gcHeapSummary.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/generationSpec.hpp"
+#include "gc/shared/isGCActiveMark.hpp"
+#include "gc/shared/referenceProcessor.hpp"
+#include "gc/shared/taskqueue.inline.hpp"
#include "memory/allocation.hpp"
-#include "memory/gcLocker.inline.hpp"
-#include "memory/generationSpec.hpp"
#include "memory/iterator.hpp"
-#include "memory/referenceProcessor.hpp"
#include "oops/oop.inline.hpp"
#include "runtime/atomic.inline.hpp"
#include "runtime/orderAccess.inline.hpp"
#include "runtime/vmThread.hpp"
#include "utilities/globalDefinitions.hpp"
#include "utilities/stack.inline.hpp"
-#include "utilities/taskqueue.inline.hpp"
size_t G1CollectedHeap::_humongous_object_threshold_in_words = 0;
diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp b/hotspot/src/share/vm/gc/g1/g1CollectedHeap.hpp
similarity index 98%
rename from hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp
rename to hotspot/src/share/vm/gc/g1/g1CollectedHeap.hpp
index 483eb8f3482..fdd0f83c48e 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp
+++ b/hotspot/src/share/vm/gc/g1/g1CollectedHeap.hpp
@@ -22,25 +22,25 @@
*
*/
-#ifndef SHARE_VM_GC_IMPLEMENTATION_G1_G1COLLECTEDHEAP_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_G1_G1COLLECTEDHEAP_HPP
+#ifndef SHARE_VM_GC_G1_G1COLLECTEDHEAP_HPP
+#define SHARE_VM_GC_G1_G1COLLECTEDHEAP_HPP
-#include "gc_implementation/g1/g1AllocationContext.hpp"
-#include "gc_implementation/g1/g1Allocator.hpp"
-#include "gc_implementation/g1/concurrentMark.hpp"
-#include "gc_implementation/g1/evacuationInfo.hpp"
-#include "gc_implementation/g1/g1AllocRegion.hpp"
-#include "gc_implementation/g1/g1BiasedArray.hpp"
-#include "gc_implementation/g1/g1HRPrinter.hpp"
-#include "gc_implementation/g1/g1InCSetState.hpp"
-#include "gc_implementation/g1/g1MonitoringSupport.hpp"
-#include "gc_implementation/g1/g1SATBCardTableModRefBS.hpp"
-#include "gc_implementation/g1/g1YCTypes.hpp"
-#include "gc_implementation/g1/heapRegionManager.hpp"
-#include "gc_implementation/g1/heapRegionSet.hpp"
-#include "gc_implementation/shared/hSpaceCounters.hpp"
-#include "gc_interface/collectedHeap.hpp"
-#include "memory/barrierSet.hpp"
+#include "gc/g1/concurrentMark.hpp"
+#include "gc/g1/evacuationInfo.hpp"
+#include "gc/g1/g1AllocRegion.hpp"
+#include "gc/g1/g1AllocationContext.hpp"
+#include "gc/g1/g1Allocator.hpp"
+#include "gc/g1/g1BiasedArray.hpp"
+#include "gc/g1/g1HRPrinter.hpp"
+#include "gc/g1/g1InCSetState.hpp"
+#include "gc/g1/g1MonitoringSupport.hpp"
+#include "gc/g1/g1SATBCardTableModRefBS.hpp"
+#include "gc/g1/g1YCTypes.hpp"
+#include "gc/g1/hSpaceCounters.hpp"
+#include "gc/g1/heapRegionManager.hpp"
+#include "gc/g1/heapRegionSet.hpp"
+#include "gc/shared/barrierSet.hpp"
+#include "gc/shared/collectedHeap.hpp"
#include "memory/memRegion.hpp"
#include "utilities/stack.hpp"
@@ -1591,4 +1591,4 @@ protected:
size_t _max_heap_capacity;
};
-#endif // SHARE_VM_GC_IMPLEMENTATION_G1_G1COLLECTEDHEAP_HPP
+#endif // SHARE_VM_GC_G1_G1COLLECTEDHEAP_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.inline.hpp b/hotspot/src/share/vm/gc/g1/g1CollectedHeap.inline.hpp
similarity index 95%
rename from hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.inline.hpp
rename to hotspot/src/share/vm/gc/g1/g1CollectedHeap.inline.hpp
index 466c20e2147..6cd15d0fa7e 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.inline.hpp
+++ b/hotspot/src/share/vm/gc/g1/g1CollectedHeap.inline.hpp
@@ -22,18 +22,18 @@
*
*/
-#ifndef SHARE_VM_GC_IMPLEMENTATION_G1_G1COLLECTEDHEAP_INLINE_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_G1_G1COLLECTEDHEAP_INLINE_HPP
+#ifndef SHARE_VM_GC_G1_G1COLLECTEDHEAP_INLINE_HPP
+#define SHARE_VM_GC_G1_G1COLLECTEDHEAP_INLINE_HPP
-#include "gc_implementation/g1/concurrentMark.hpp"
-#include "gc_implementation/g1/g1CollectedHeap.hpp"
-#include "gc_implementation/g1/g1AllocRegion.inline.hpp"
-#include "gc_implementation/g1/g1CollectorPolicy.hpp"
-#include "gc_implementation/g1/g1SATBCardTableModRefBS.hpp"
-#include "gc_implementation/g1/heapRegionManager.inline.hpp"
-#include "gc_implementation/g1/heapRegionSet.inline.hpp"
+#include "gc/g1/concurrentMark.hpp"
+#include "gc/g1/g1AllocRegion.inline.hpp"
+#include "gc/g1/g1CollectedHeap.hpp"
+#include "gc/g1/g1CollectorPolicy.hpp"
+#include "gc/g1/g1SATBCardTableModRefBS.hpp"
+#include "gc/g1/heapRegionManager.inline.hpp"
+#include "gc/g1/heapRegionSet.inline.hpp"
+#include "gc/shared/taskqueue.hpp"
#include "runtime/orderAccess.inline.hpp"
-#include "utilities/taskqueue.hpp"
PLABStats* G1CollectedHeap::alloc_buffer_stats(InCSetState dest) {
switch (dest.value()) {
@@ -380,4 +380,4 @@ inline void G1CollectedHeap::set_humongous_is_live(oop obj) {
}
}
-#endif // SHARE_VM_GC_IMPLEMENTATION_G1_G1COLLECTEDHEAP_INLINE_HPP
+#endif // SHARE_VM_GC_G1_G1COLLECTEDHEAP_INLINE_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap_ext.cpp b/hotspot/src/share/vm/gc/g1/g1CollectedHeap_ext.cpp
similarity index 91%
rename from hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap_ext.cpp
rename to hotspot/src/share/vm/gc/g1/g1CollectedHeap_ext.cpp
index 7f71451b6ca..5c429bafda2 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap_ext.cpp
+++ b/hotspot/src/share/vm/gc/g1/g1CollectedHeap_ext.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
*/
#include "precompiled.hpp"
-#include "gc_implementation/g1/g1CollectedHeap.hpp"
+#include "gc/g1/g1CollectedHeap.hpp"
bool G1CollectedHeap::copy_allocation_context_stats(const jint* contexts,
jlong* totals,
diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp b/hotspot/src/share/vm/gc/g1/g1CollectorPolicy.cpp
similarity index 99%
rename from hotspot/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp
rename to hotspot/src/share/vm/gc/g1/g1CollectorPolicy.cpp
index 41943dd1ca0..72fdeb5ee21 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp
+++ b/hotspot/src/share/vm/gc/g1/g1CollectorPolicy.cpp
@@ -23,16 +23,16 @@
*/
#include "precompiled.hpp"
-#include "gc_implementation/g1/concurrentG1Refine.hpp"
-#include "gc_implementation/g1/concurrentMark.hpp"
-#include "gc_implementation/g1/concurrentMarkThread.inline.hpp"
-#include "gc_implementation/g1/g1CollectedHeap.inline.hpp"
-#include "gc_implementation/g1/g1CollectorPolicy.hpp"
-#include "gc_implementation/g1/g1ErgoVerbose.hpp"
-#include "gc_implementation/g1/g1GCPhaseTimes.hpp"
-#include "gc_implementation/g1/g1Log.hpp"
-#include "gc_implementation/g1/heapRegionRemSet.hpp"
-#include "gc_implementation/shared/gcPolicyCounters.hpp"
+#include "gc/g1/concurrentG1Refine.hpp"
+#include "gc/g1/concurrentMark.hpp"
+#include "gc/g1/concurrentMarkThread.inline.hpp"
+#include "gc/g1/g1CollectedHeap.inline.hpp"
+#include "gc/g1/g1CollectorPolicy.hpp"
+#include "gc/g1/g1ErgoVerbose.hpp"
+#include "gc/g1/g1GCPhaseTimes.hpp"
+#include "gc/g1/g1Log.hpp"
+#include "gc/g1/heapRegionRemSet.hpp"
+#include "gc/shared/gcPolicyCounters.hpp"
#include "runtime/arguments.hpp"
#include "runtime/java.hpp"
#include "runtime/mutexLocker.hpp"
diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1CollectorPolicy.hpp b/hotspot/src/share/vm/gc/g1/g1CollectorPolicy.hpp
similarity index 98%
rename from hotspot/src/share/vm/gc_implementation/g1/g1CollectorPolicy.hpp
rename to hotspot/src/share/vm/gc/g1/g1CollectorPolicy.hpp
index 3cee9369634..c94ada50fa4 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/g1CollectorPolicy.hpp
+++ b/hotspot/src/share/vm/gc/g1/g1CollectorPolicy.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,13 +22,13 @@
*
*/
-#ifndef SHARE_VM_GC_IMPLEMENTATION_G1_G1COLLECTORPOLICY_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_G1_G1COLLECTORPOLICY_HPP
+#ifndef SHARE_VM_GC_G1_G1COLLECTORPOLICY_HPP
+#define SHARE_VM_GC_G1_G1COLLECTORPOLICY_HPP
-#include "gc_implementation/g1/collectionSetChooser.hpp"
-#include "gc_implementation/g1/g1Allocator.hpp"
-#include "gc_implementation/g1/g1MMUTracker.hpp"
-#include "memory/collectorPolicy.hpp"
+#include "gc/g1/collectionSetChooser.hpp"
+#include "gc/g1/g1Allocator.hpp"
+#include "gc/g1/g1MMUTracker.hpp"
+#include "gc/shared/collectorPolicy.hpp"
// A G1CollectorPolicy makes policy decisions that determine the
// characteristics of the collector. Examples include:
@@ -942,4 +942,4 @@ inline double variance(int n, double sum_of_squares, double sum) {
return (sum_of_squares - 2.0 * avg * sum + n_d * avg * avg) / n_d;
}
-#endif // SHARE_VM_GC_IMPLEMENTATION_G1_G1COLLECTORPOLICY_HPP
+#endif // SHARE_VM_GC_G1_G1COLLECTORPOLICY_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1CollectorPolicy_ext.hpp b/hotspot/src/share/vm/gc/g1/g1CollectorPolicy_ext.hpp
similarity index 76%
rename from hotspot/src/share/vm/gc_implementation/g1/g1CollectorPolicy_ext.hpp
rename to hotspot/src/share/vm/gc/g1/g1CollectorPolicy_ext.hpp
index c0b90985606..667fbcb68af 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/g1CollectorPolicy_ext.hpp
+++ b/hotspot/src/share/vm/gc/g1/g1CollectorPolicy_ext.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,11 +22,11 @@
*
*/
-#ifndef SHARE_VM_GC_IMPLEMENTATION_G1_G1COLLECTORPOLICY_EXT_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_G1_G1COLLECTORPOLICY_EXT_HPP
+#ifndef SHARE_VM_GC_G1_G1COLLECTORPOLICY_EXT_HPP
+#define SHARE_VM_GC_G1_G1COLLECTORPOLICY_EXT_HPP
-#include "gc_implementation/g1/g1CollectorPolicy.hpp"
+#include "gc/g1/g1CollectorPolicy.hpp"
class G1CollectorPolicyExt : public G1CollectorPolicy { };
-#endif // SHARE_VM_GC_IMPLEMENTATION_G1_G1COLLECTORPOLICY_EXT_HPP
+#endif // SHARE_VM_GC_G1_G1COLLECTORPOLICY_EXT_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1ErgoVerbose.cpp b/hotspot/src/share/vm/gc/g1/g1ErgoVerbose.cpp
similarity index 94%
rename from hotspot/src/share/vm/gc_implementation/g1/g1ErgoVerbose.cpp
rename to hotspot/src/share/vm/gc/g1/g1ErgoVerbose.cpp
index 167d19c2e22..1480c2d5087 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/g1ErgoVerbose.cpp
+++ b/hotspot/src/share/vm/gc/g1/g1ErgoVerbose.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
*/
#include "precompiled.hpp"
-#include "gc_implementation/g1/g1ErgoVerbose.hpp"
+#include "gc/g1/g1ErgoVerbose.hpp"
#include "utilities/ostream.hpp"
ErgoLevel G1ErgoVerbose::_level;
diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1ErgoVerbose.hpp b/hotspot/src/share/vm/gc/g1/g1ErgoVerbose.hpp
similarity index 97%
rename from hotspot/src/share/vm/gc_implementation/g1/g1ErgoVerbose.hpp
rename to hotspot/src/share/vm/gc/g1/g1ErgoVerbose.hpp
index 92df3a0d291..d0ae71812e9 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/g1ErgoVerbose.hpp
+++ b/hotspot/src/share/vm/gc/g1/g1ErgoVerbose.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_IMPLEMENTATION_G1_G1ERGOVERBOSE_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_G1_G1ERGOVERBOSE_HPP
+#ifndef SHARE_VM_GC_G1_G1ERGOVERBOSE_HPP
+#define SHARE_VM_GC_G1_G1ERGOVERBOSE_HPP
#include "memory/allocation.hpp"
#include "utilities/debug.hpp"
@@ -199,4 +199,4 @@ public:
ergo_verbose0(_tag_, _action_, "")
-#endif // SHARE_VM_GC_IMPLEMENTATION_G1_G1ERGOVERBOSE_HPP
+#endif // SHARE_VM_GC_G1_G1ERGOVERBOSE_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1EvacFailure.cpp b/hotspot/src/share/vm/gc/g1/g1EvacFailure.cpp
similarity index 95%
rename from hotspot/src/share/vm/gc_implementation/g1/g1EvacFailure.cpp
rename to hotspot/src/share/vm/gc/g1/g1EvacFailure.cpp
index a369a5b7ae1..66292cfcdac 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/g1EvacFailure.cpp
+++ b/hotspot/src/share/vm/gc/g1/g1EvacFailure.cpp
@@ -23,14 +23,14 @@
*/
#include "precompiled.hpp"
-#include "gc_implementation/g1/concurrentMark.inline.hpp"
-#include "gc_implementation/g1/dirtyCardQueue.hpp"
-#include "gc_implementation/g1/g1CollectedHeap.inline.hpp"
-#include "gc_implementation/g1/g1EvacFailure.hpp"
-#include "gc_implementation/g1/g1_globals.hpp"
-#include "gc_implementation/g1/g1OopClosures.inline.hpp"
-#include "gc_implementation/g1/heapRegion.hpp"
-#include "gc_implementation/g1/heapRegionRemSet.hpp"
+#include "gc/g1/concurrentMark.inline.hpp"
+#include "gc/g1/dirtyCardQueue.hpp"
+#include "gc/g1/g1CollectedHeap.inline.hpp"
+#include "gc/g1/g1EvacFailure.hpp"
+#include "gc/g1/g1OopClosures.inline.hpp"
+#include "gc/g1/g1_globals.hpp"
+#include "gc/g1/heapRegion.hpp"
+#include "gc/g1/heapRegionRemSet.hpp"
class UpdateRSetDeferred : public OopsInHeapRegionClosure {
private:
diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1EvacFailure.hpp b/hotspot/src/share/vm/gc/g1/g1EvacFailure.hpp
similarity index 82%
rename from hotspot/src/share/vm/gc_implementation/g1/g1EvacFailure.hpp
rename to hotspot/src/share/vm/gc/g1/g1EvacFailure.hpp
index 709bd03a7d7..4385fd02acd 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/g1EvacFailure.hpp
+++ b/hotspot/src/share/vm/gc/g1/g1EvacFailure.hpp
@@ -22,13 +22,13 @@
*
*/
-#ifndef SHARE_VM_GC_IMPLEMENTATION_G1_G1EVACFAILURE_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_G1_G1EVACFAILURE_HPP
+#ifndef SHARE_VM_GC_G1_G1EVACFAILURE_HPP
+#define SHARE_VM_GC_G1_G1EVACFAILURE_HPP
-#include "gc_implementation/g1/g1OopClosures.hpp"
-#include "gc_implementation/g1/heapRegionManager.hpp"
+#include "gc/g1/g1OopClosures.hpp"
+#include "gc/g1/heapRegionManager.hpp"
+#include "gc/shared/workgroup.hpp"
#include "utilities/globalDefinitions.hpp"
-#include "utilities/workgroup.hpp"
class G1CollectedHeap;
@@ -45,4 +45,4 @@ public:
void work(uint worker_id);
};
-#endif // SHARE_VM_GC_IMPLEMENTATION_G1_G1EVACFAILURE_HPP
+#endif // SHARE_VM_GC_G1_G1EVACFAILURE_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1GCPhaseTimes.cpp b/hotspot/src/share/vm/gc/g1/g1GCPhaseTimes.cpp
similarity index 98%
rename from hotspot/src/share/vm/gc_implementation/g1/g1GCPhaseTimes.cpp
rename to hotspot/src/share/vm/gc/g1/g1GCPhaseTimes.cpp
index 8f51050a7e8..cb17b953e47 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/g1GCPhaseTimes.cpp
+++ b/hotspot/src/share/vm/gc/g1/g1GCPhaseTimes.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2015 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -23,10 +23,10 @@
*/
#include "precompiled.hpp"
-#include "gc_implementation/g1/g1CollectedHeap.inline.hpp"
-#include "gc_implementation/g1/g1GCPhaseTimes.hpp"
-#include "gc_implementation/g1/g1Log.hpp"
-#include "gc_implementation/g1/g1StringDedup.hpp"
+#include "gc/g1/g1CollectedHeap.inline.hpp"
+#include "gc/g1/g1GCPhaseTimes.hpp"
+#include "gc/g1/g1Log.hpp"
+#include "gc/g1/g1StringDedup.hpp"
#include "memory/allocation.hpp"
#include "runtime/os.hpp"
diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1GCPhaseTimes.hpp b/hotspot/src/share/vm/gc/g1/g1GCPhaseTimes.hpp
similarity index 96%
rename from hotspot/src/share/vm/gc_implementation/g1/g1GCPhaseTimes.hpp
rename to hotspot/src/share/vm/gc/g1/g1GCPhaseTimes.hpp
index 1ab1ba62871..ac64f6a88eb 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/g1GCPhaseTimes.hpp
+++ b/hotspot/src/share/vm/gc/g1/g1GCPhaseTimes.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2015 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_IMPLEMENTATION_G1_G1GCPHASETIMES_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_G1_G1GCPHASETIMES_HPP
+#ifndef SHARE_VM_GC_G1_G1GCPHASETIMES_HPP
+#define SHARE_VM_GC_G1_G1GCPHASETIMES_HPP
#include "memory/allocation.hpp"
@@ -286,4 +286,4 @@ public:
~G1GCParPhaseTimesTracker();
};
-#endif // SHARE_VM_GC_IMPLEMENTATION_G1_G1GCPHASETIMES_HPP
+#endif // SHARE_VM_GC_G1_G1GCPHASETIMES_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1HRPrinter.cpp b/hotspot/src/share/vm/gc/g1/g1HRPrinter.cpp
similarity index 96%
rename from hotspot/src/share/vm/gc_implementation/g1/g1HRPrinter.cpp
rename to hotspot/src/share/vm/gc/g1/g1HRPrinter.cpp
index 68a2a96d73d..83344c140cc 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/g1HRPrinter.cpp
+++ b/hotspot/src/share/vm/gc/g1/g1HRPrinter.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -23,8 +23,8 @@
*/
#include "precompiled.hpp"
-#include "gc_implementation/g1/g1HRPrinter.hpp"
-#include "gc_implementation/g1/heapRegion.hpp"
+#include "gc/g1/g1HRPrinter.hpp"
+#include "gc/g1/heapRegion.hpp"
#include "utilities/ostream.hpp"
const char* G1HRPrinter::action_name(ActionType action) {
diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1HRPrinter.hpp b/hotspot/src/share/vm/gc/g1/g1HRPrinter.hpp
similarity index 93%
rename from hotspot/src/share/vm/gc_implementation/g1/g1HRPrinter.hpp
rename to hotspot/src/share/vm/gc/g1/g1HRPrinter.hpp
index 425cbaca2a3..b97f2168544 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/g1HRPrinter.hpp
+++ b/hotspot/src/share/vm/gc/g1/g1HRPrinter.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,11 +22,11 @@
*
*/
-#ifndef SHARE_VM_GC_IMPLEMENTATION_G1_G1HRPRINTER_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_G1_G1HRPRINTER_HPP
+#ifndef SHARE_VM_GC_G1_G1HRPRINTER_HPP
+#define SHARE_VM_GC_G1_G1HRPRINTER_HPP
+#include "gc/g1/heapRegion.hpp"
#include "memory/allocation.hpp"
-#include "gc_implementation/g1/heapRegion.hpp"
#define SKIP_RETIRED_FULL_REGIONS 1
@@ -179,4 +179,4 @@ public:
G1HRPrinter() : _active(false) { }
};
-#endif // SHARE_VM_GC_IMPLEMENTATION_G1_G1HRPRINTER_HPP
+#endif // SHARE_VM_GC_G1_G1HRPRINTER_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1HotCardCache.cpp b/hotspot/src/share/vm/gc/g1/g1HotCardCache.cpp
similarity index 96%
rename from hotspot/src/share/vm/gc_implementation/g1/g1HotCardCache.cpp
rename to hotspot/src/share/vm/gc/g1/g1HotCardCache.cpp
index a32ffae41d9..2b45155f552 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/g1HotCardCache.cpp
+++ b/hotspot/src/share/vm/gc/g1/g1HotCardCache.cpp
@@ -23,10 +23,10 @@
*/
#include "precompiled.hpp"
-#include "gc_implementation/g1/dirtyCardQueue.hpp"
-#include "gc_implementation/g1/g1CollectedHeap.inline.hpp"
-#include "gc_implementation/g1/g1HotCardCache.hpp"
-#include "gc_implementation/g1/g1RemSet.hpp"
+#include "gc/g1/dirtyCardQueue.hpp"
+#include "gc/g1/g1CollectedHeap.inline.hpp"
+#include "gc/g1/g1HotCardCache.hpp"
+#include "gc/g1/g1RemSet.hpp"
#include "runtime/atomic.inline.hpp"
G1HotCardCache::G1HotCardCache(G1CollectedHeap *g1h):
diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1HotCardCache.hpp b/hotspot/src/share/vm/gc/g1/g1HotCardCache.hpp
similarity index 94%
rename from hotspot/src/share/vm/gc_implementation/g1/g1HotCardCache.hpp
rename to hotspot/src/share/vm/gc/g1/g1HotCardCache.hpp
index ee329a77ef1..09edcd8bc00 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/g1HotCardCache.hpp
+++ b/hotspot/src/share/vm/gc/g1/g1HotCardCache.hpp
@@ -22,11 +22,11 @@
*
*/
-#ifndef SHARE_VM_GC_IMPLEMENTATION_G1_G1HOTCARDCACHE_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_G1_G1HOTCARDCACHE_HPP
+#ifndef SHARE_VM_GC_G1_G1HOTCARDCACHE_HPP
+#define SHARE_VM_GC_G1_G1HOTCARDCACHE_HPP
-#include "gc_implementation/g1/g1_globals.hpp"
-#include "gc_implementation/g1/g1CardCounts.hpp"
+#include "gc/g1/g1CardCounts.hpp"
+#include "gc/g1/g1_globals.hpp"
#include "memory/allocation.hpp"
#include "runtime/safepoint.hpp"
#include "runtime/thread.hpp"
@@ -145,4 +145,4 @@ class G1HotCardCache: public CHeapObj {
}
};
-#endif // SHARE_VM_GC_IMPLEMENTATION_G1_G1HOTCARDCACHE_HPP
+#endif // SHARE_VM_GC_G1_G1HOTCARDCACHE_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1InCSetState.hpp b/hotspot/src/share/vm/gc/g1/g1InCSetState.hpp
similarity index 94%
rename from hotspot/src/share/vm/gc_implementation/g1/g1InCSetState.hpp
rename to hotspot/src/share/vm/gc/g1/g1InCSetState.hpp
index 8cc45ad15e5..f945153e395 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/g1InCSetState.hpp
+++ b/hotspot/src/share/vm/gc/g1/g1InCSetState.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,11 +22,11 @@
*
*/
-#ifndef SHARE_VM_GC_IMPLEMENTATION_G1_G1INCSETSTATE_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_G1_G1INCSETSTATE_HPP
+#ifndef SHARE_VM_GC_G1_G1INCSETSTATE_HPP
+#define SHARE_VM_GC_G1_G1INCSETSTATE_HPP
-#include "gc_implementation/g1/heapRegion.hpp"
-#include "gc_implementation/g1/g1BiasedArray.hpp"
+#include "gc/g1/g1BiasedArray.hpp"
+#include "gc/g1/heapRegion.hpp"
#include "memory/allocation.hpp"
// Per-region state during garbage collection.
@@ -132,4 +132,4 @@ class G1InCSetStateFastTestBiasedMappedArray : public G1BiasedMappedArrayhrm_index(), InCSetState::NotInCSet); }
};
-#endif // SHARE_VM_GC_IMPLEMENTATION_G1_G1INCSETSTATE_HPP
+#endif // SHARE_VM_GC_G1_G1INCSETSTATE_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1Log.cpp b/hotspot/src/share/vm/gc/g1/g1Log.cpp
similarity index 96%
rename from hotspot/src/share/vm/gc_implementation/g1/g1Log.cpp
rename to hotspot/src/share/vm/gc/g1/g1Log.cpp
index dc3b4d1e64f..40c1da28812 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/g1Log.cpp
+++ b/hotspot/src/share/vm/gc/g1/g1Log.cpp
@@ -23,8 +23,8 @@
*/
#include "precompiled.hpp"
-#include "gc_implementation/g1/g1_globals.hpp"
-#include "gc_implementation/g1/g1Log.hpp"
+#include "gc/g1/g1Log.hpp"
+#include "gc/g1/g1_globals.hpp"
#include "runtime/globals_extension.hpp"
G1Log::LogLevel G1Log::_level = G1Log::LevelNone;
diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1Log.hpp b/hotspot/src/share/vm/gc/g1/g1Log.hpp
similarity index 91%
rename from hotspot/src/share/vm/gc_implementation/g1/g1Log.hpp
rename to hotspot/src/share/vm/gc/g1/g1Log.hpp
index 4bdc99b2af5..7a313e360cd 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/g1Log.hpp
+++ b/hotspot/src/share/vm/gc/g1/g1Log.hpp
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_IMPLEMENTATION_G1_G1LOG_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_G1_G1LOG_HPP
+#ifndef SHARE_VM_GC_G1_G1LOG_HPP
+#define SHARE_VM_GC_G1_G1LOG_HPP
#include "memory/allocation.hpp"
@@ -62,4 +62,4 @@ class G1Log : public AllStatic {
static void update_level();
};
-#endif // SHARE_VM_GC_IMPLEMENTATION_G1_G1LOG_HPP
+#endif // SHARE_VM_GC_G1_G1LOG_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1MMUTracker.cpp b/hotspot/src/share/vm/gc/g1/g1MMUTracker.cpp
similarity index 99%
rename from hotspot/src/share/vm/gc_implementation/g1/g1MMUTracker.cpp
rename to hotspot/src/share/vm/gc/g1/g1MMUTracker.cpp
index d1b38a733aa..1760fd3ce34 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/g1MMUTracker.cpp
+++ b/hotspot/src/share/vm/gc/g1/g1MMUTracker.cpp
@@ -23,7 +23,7 @@
*/
#include "precompiled.hpp"
-#include "gc_implementation/g1/g1MMUTracker.hpp"
+#include "gc/g1/g1MMUTracker.hpp"
#include "runtime/mutexLocker.hpp"
#include "utilities/ostream.hpp"
diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1MMUTracker.hpp b/hotspot/src/share/vm/gc/g1/g1MMUTracker.hpp
similarity index 96%
rename from hotspot/src/share/vm/gc_implementation/g1/g1MMUTracker.hpp
rename to hotspot/src/share/vm/gc/g1/g1MMUTracker.hpp
index c4890d97dc0..212706dbea0 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/g1MMUTracker.hpp
+++ b/hotspot/src/share/vm/gc/g1/g1MMUTracker.hpp
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_IMPLEMENTATION_G1_G1MMUTRACKER_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_G1_G1MMUTRACKER_HPP
+#ifndef SHARE_VM_GC_G1_G1MMUTRACKER_HPP
+#define SHARE_VM_GC_G1_G1MMUTRACKER_HPP
#include "memory/allocation.hpp"
#include "utilities/debug.hpp"
@@ -131,4 +131,4 @@ public:
virtual double when_sec(double current_time, double pause_time);
};
-#endif // SHARE_VM_GC_IMPLEMENTATION_G1_G1MMUTRACKER_HPP
+#endif // SHARE_VM_GC_G1_G1MMUTRACKER_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1MarkSweep.cpp b/hotspot/src/share/vm/gc/g1/g1MarkSweep.cpp
similarity index 95%
rename from hotspot/src/share/vm/gc_implementation/g1/g1MarkSweep.cpp
rename to hotspot/src/share/vm/gc/g1/g1MarkSweep.cpp
index 64af265d3ec..22662210e29 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/g1MarkSweep.cpp
+++ b/hotspot/src/share/vm/gc/g1/g1MarkSweep.cpp
@@ -29,20 +29,20 @@
#include "classfile/vmSymbols.hpp"
#include "code/codeCache.hpp"
#include "code/icBuffer.hpp"
-#include "gc_implementation/g1/g1Log.hpp"
-#include "gc_implementation/g1/g1MarkSweep.hpp"
-#include "gc_implementation/g1/g1RootProcessor.hpp"
-#include "gc_implementation/g1/g1StringDedup.hpp"
-#include "gc_implementation/shared/markSweep.inline.hpp"
-#include "gc_implementation/shared/gcHeapSummary.hpp"
-#include "gc_implementation/shared/gcTimer.hpp"
-#include "gc_implementation/shared/gcTrace.hpp"
-#include "gc_implementation/shared/gcTraceTime.hpp"
-#include "memory/gcLocker.hpp"
-#include "memory/genCollectedHeap.hpp"
-#include "memory/modRefBarrierSet.hpp"
-#include "memory/referencePolicy.hpp"
-#include "memory/space.hpp"
+#include "gc/g1/g1Log.hpp"
+#include "gc/g1/g1MarkSweep.hpp"
+#include "gc/g1/g1RootProcessor.hpp"
+#include "gc/g1/g1StringDedup.hpp"
+#include "gc/serial/markSweep.inline.hpp"
+#include "gc/shared/gcHeapSummary.hpp"
+#include "gc/shared/gcLocker.hpp"
+#include "gc/shared/gcTimer.hpp"
+#include "gc/shared/gcTrace.hpp"
+#include "gc/shared/gcTraceTime.hpp"
+#include "gc/shared/genCollectedHeap.hpp"
+#include "gc/shared/modRefBarrierSet.hpp"
+#include "gc/shared/referencePolicy.hpp"
+#include "gc/shared/space.hpp"
#include "oops/instanceRefKlass.hpp"
#include "oops/oop.inline.hpp"
#include "prims/jvmtiExport.hpp"
diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1MarkSweep.hpp b/hotspot/src/share/vm/gc/g1/g1MarkSweep.hpp
similarity index 88%
rename from hotspot/src/share/vm/gc_implementation/g1/g1MarkSweep.hpp
rename to hotspot/src/share/vm/gc/g1/g1MarkSweep.hpp
index 58a84ce49a2..b3681edd860 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/g1MarkSweep.hpp
+++ b/hotspot/src/share/vm/gc/g1/g1MarkSweep.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,13 +22,13 @@
*
*/
-#ifndef SHARE_VM_GC_IMPLEMENTATION_G1_G1MARKSWEEP_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_G1_G1MARKSWEEP_HPP
+#ifndef SHARE_VM_GC_G1_G1MARKSWEEP_HPP
+#define SHARE_VM_GC_G1_G1MARKSWEEP_HPP
-#include "gc_implementation/g1/g1CollectedHeap.hpp"
-#include "gc_implementation/g1/heapRegion.hpp"
-#include "memory/genMarkSweep.hpp"
-#include "memory/generation.hpp"
+#include "gc/g1/g1CollectedHeap.hpp"
+#include "gc/g1/heapRegion.hpp"
+#include "gc/serial/genMarkSweep.hpp"
+#include "gc/shared/generation.hpp"
#include "memory/universe.hpp"
#include "oops/markOop.hpp"
#include "oops/oop.hpp"
@@ -93,4 +93,4 @@ class G1PrepareCompactClosure : public HeapRegionClosure {
bool doHeapRegion(HeapRegion* hr);
};
-#endif // SHARE_VM_GC_IMPLEMENTATION_G1_G1MARKSWEEP_HPP
+#endif // SHARE_VM_GC_G1_G1MARKSWEEP_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1MarkSweep_ext.cpp b/hotspot/src/share/vm/gc/g1/g1MarkSweep_ext.cpp
similarity index 91%
rename from hotspot/src/share/vm/gc_implementation/g1/g1MarkSweep_ext.cpp
rename to hotspot/src/share/vm/gc/g1/g1MarkSweep_ext.cpp
index 006e787bee3..9ba0d92a337 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/g1MarkSweep_ext.cpp
+++ b/hotspot/src/share/vm/gc/g1/g1MarkSweep_ext.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
*/
#include "precompiled.hpp"
-#include "gc_implementation/g1/g1MarkSweep.hpp"
+#include "gc/g1/g1MarkSweep.hpp"
void G1MarkSweep::prepare_compaction() {
G1PrepareCompactClosure blk;
diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1MonitoringSupport.cpp b/hotspot/src/share/vm/gc/g1/g1MonitoringSupport.cpp
similarity index 98%
rename from hotspot/src/share/vm/gc_implementation/g1/g1MonitoringSupport.cpp
rename to hotspot/src/share/vm/gc/g1/g1MonitoringSupport.cpp
index 1c4f29d88c3..4be78e3db95 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/g1MonitoringSupport.cpp
+++ b/hotspot/src/share/vm/gc/g1/g1MonitoringSupport.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -23,9 +23,9 @@
*/
#include "precompiled.hpp"
-#include "gc_implementation/g1/g1MonitoringSupport.hpp"
-#include "gc_implementation/g1/g1CollectedHeap.inline.hpp"
-#include "gc_implementation/g1/g1CollectorPolicy.hpp"
+#include "gc/g1/g1CollectedHeap.inline.hpp"
+#include "gc/g1/g1CollectorPolicy.hpp"
+#include "gc/g1/g1MonitoringSupport.hpp"
G1GenerationCounters::G1GenerationCounters(G1MonitoringSupport* g1mm,
const char* name,
diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1MonitoringSupport.hpp b/hotspot/src/share/vm/gc/g1/g1MonitoringSupport.hpp
similarity index 97%
rename from hotspot/src/share/vm/gc_implementation/g1/g1MonitoringSupport.hpp
rename to hotspot/src/share/vm/gc/g1/g1MonitoringSupport.hpp
index d354c746cb0..3c1d7444108 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/g1MonitoringSupport.hpp
+++ b/hotspot/src/share/vm/gc/g1/g1MonitoringSupport.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,10 +22,10 @@
*
*/
-#ifndef SHARE_VM_GC_IMPLEMENTATION_G1_G1MONITORINGSUPPORT_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_G1_G1MONITORINGSUPPORT_HPP
+#ifndef SHARE_VM_GC_G1_G1MONITORINGSUPPORT_HPP
+#define SHARE_VM_GC_G1_G1MONITORINGSUPPORT_HPP
-#include "gc_implementation/shared/hSpaceCounters.hpp"
+#include "gc/g1/hSpaceCounters.hpp"
class G1CollectedHeap;
@@ -266,4 +266,4 @@ public:
virtual void update_all();
};
-#endif // SHARE_VM_GC_IMPLEMENTATION_G1_G1MONITORINGSUPPORT_HPP
+#endif // SHARE_VM_GC_G1_G1MONITORINGSUPPORT_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1OopClosures.cpp b/hotspot/src/share/vm/gc/g1/g1OopClosures.cpp
similarity index 87%
rename from hotspot/src/share/vm/gc_implementation/g1/g1OopClosures.cpp
rename to hotspot/src/share/vm/gc/g1/g1OopClosures.cpp
index e2b22d5a142..57ce7a58299 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/g1OopClosures.cpp
+++ b/hotspot/src/share/vm/gc/g1/g1OopClosures.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -23,10 +23,10 @@
*/
#include "precompiled.hpp"
-#include "gc_implementation/g1/g1_specialized_oop_closures.hpp"
-#include "gc_implementation/g1/g1CollectedHeap.inline.hpp"
-#include "gc_implementation/g1/g1OopClosures.inline.hpp"
-#include "gc_implementation/g1/g1ParScanThreadState.hpp"
+#include "gc/g1/g1CollectedHeap.inline.hpp"
+#include "gc/g1/g1OopClosures.inline.hpp"
+#include "gc/g1/g1ParScanThreadState.hpp"
+#include "gc/g1/g1_specialized_oop_closures.hpp"
#include "memory/iterator.inline.hpp"
#include "utilities/stack.inline.hpp"
diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1OopClosures.hpp b/hotspot/src/share/vm/gc/g1/g1OopClosures.hpp
similarity index 97%
rename from hotspot/src/share/vm/gc_implementation/g1/g1OopClosures.hpp
rename to hotspot/src/share/vm/gc/g1/g1OopClosures.hpp
index 44a6c1220d2..d991aa9ddd0 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/g1OopClosures.hpp
+++ b/hotspot/src/share/vm/gc/g1/g1OopClosures.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_IMPLEMENTATION_G1_G1OOPCLOSURES_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_G1_G1OOPCLOSURES_HPP
+#ifndef SHARE_VM_GC_G1_G1OOPCLOSURES_HPP
+#define SHARE_VM_GC_G1_G1OOPCLOSURES_HPP
#include "memory/iterator.hpp"
#include "oops/markOop.hpp"
@@ -281,4 +281,4 @@ public:
virtual void do_oop(oop* p) { do_oop_nv(p); }
};
-#endif // SHARE_VM_GC_IMPLEMENTATION_G1_G1OOPCLOSURES_HPP
+#endif // SHARE_VM_GC_G1_G1OOPCLOSURES_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1OopClosures.inline.hpp b/hotspot/src/share/vm/gc/g1/g1OopClosures.inline.hpp
similarity index 93%
rename from hotspot/src/share/vm/gc_implementation/g1/g1OopClosures.inline.hpp
rename to hotspot/src/share/vm/gc/g1/g1OopClosures.inline.hpp
index 11c22ca004b..c8b594f14e7 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/g1OopClosures.inline.hpp
+++ b/hotspot/src/share/vm/gc/g1/g1OopClosures.inline.hpp
@@ -22,16 +22,16 @@
*
*/
-#ifndef SHARE_VM_GC_IMPLEMENTATION_G1_G1OOPCLOSURES_INLINE_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_G1_G1OOPCLOSURES_INLINE_HPP
+#ifndef SHARE_VM_GC_G1_G1OOPCLOSURES_INLINE_HPP
+#define SHARE_VM_GC_G1_G1OOPCLOSURES_INLINE_HPP
-#include "gc_implementation/g1/concurrentMark.inline.hpp"
-#include "gc_implementation/g1/g1CollectedHeap.hpp"
-#include "gc_implementation/g1/g1OopClosures.hpp"
-#include "gc_implementation/g1/g1ParScanThreadState.inline.hpp"
-#include "gc_implementation/g1/g1RemSet.hpp"
-#include "gc_implementation/g1/g1RemSet.inline.hpp"
-#include "gc_implementation/g1/heapRegionRemSet.hpp"
+#include "gc/g1/concurrentMark.inline.hpp"
+#include "gc/g1/g1CollectedHeap.hpp"
+#include "gc/g1/g1OopClosures.hpp"
+#include "gc/g1/g1ParScanThreadState.inline.hpp"
+#include "gc/g1/g1RemSet.hpp"
+#include "gc/g1/g1RemSet.inline.hpp"
+#include "gc/g1/heapRegionRemSet.hpp"
#include "memory/iterator.inline.hpp"
#include "runtime/prefetch.inline.hpp"
@@ -224,4 +224,4 @@ inline void G1UpdateRSOrPushRefOopClosure::do_oop_nv(T* p) {
}
}
-#endif // SHARE_VM_GC_IMPLEMENTATION_G1_G1OOPCLOSURES_INLINE_HPP
+#endif // SHARE_VM_GC_G1_G1OOPCLOSURES_INLINE_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1PageBasedVirtualSpace.cpp b/hotspot/src/share/vm/gc/g1/g1PageBasedVirtualSpace.cpp
similarity index 99%
rename from hotspot/src/share/vm/gc_implementation/g1/g1PageBasedVirtualSpace.cpp
rename to hotspot/src/share/vm/gc/g1/g1PageBasedVirtualSpace.cpp
index 9144d3c7246..f586dfdb088 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/g1PageBasedVirtualSpace.cpp
+++ b/hotspot/src/share/vm/gc/g1/g1PageBasedVirtualSpace.cpp
@@ -23,7 +23,7 @@
*/
#include "precompiled.hpp"
-#include "gc_implementation/g1/g1PageBasedVirtualSpace.hpp"
+#include "gc/g1/g1PageBasedVirtualSpace.hpp"
#include "oops/markOop.hpp"
#include "oops/oop.inline.hpp"
#include "services/memTracker.hpp"
diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1PageBasedVirtualSpace.hpp b/hotspot/src/share/vm/gc/g1/g1PageBasedVirtualSpace.hpp
similarity index 96%
rename from hotspot/src/share/vm/gc_implementation/g1/g1PageBasedVirtualSpace.hpp
rename to hotspot/src/share/vm/gc/g1/g1PageBasedVirtualSpace.hpp
index edf4d6972a8..23a7d53d85f 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/g1PageBasedVirtualSpace.hpp
+++ b/hotspot/src/share/vm/gc/g1/g1PageBasedVirtualSpace.hpp
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_IMPLEMENTATION_G1_G1PAGEBASEDVIRTUALSPACE_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_G1_G1PAGEBASEDVIRTUALSPACE_HPP
+#ifndef SHARE_VM_GC_G1_G1PAGEBASEDVIRTUALSPACE_HPP
+#define SHARE_VM_GC_G1_G1PAGEBASEDVIRTUALSPACE_HPP
#include "memory/allocation.hpp"
#include "memory/memRegion.hpp"
@@ -148,4 +148,4 @@ class G1PageBasedVirtualSpace VALUE_OBJ_CLASS_SPEC {
void print();
};
-#endif // SHARE_VM_GC_IMPLEMENTATION_G1_G1PAGEBASEDVIRTUALSPACE_HPP
+#endif // SHARE_VM_GC_G1_G1PAGEBASEDVIRTUALSPACE_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1ParScanThreadState.cpp b/hotspot/src/share/vm/gc/g1/g1ParScanThreadState.cpp
similarity index 97%
rename from hotspot/src/share/vm/gc_implementation/g1/g1ParScanThreadState.cpp
rename to hotspot/src/share/vm/gc/g1/g1ParScanThreadState.cpp
index eed032ab4f3..1d38d9832fa 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/g1ParScanThreadState.cpp
+++ b/hotspot/src/share/vm/gc/g1/g1ParScanThreadState.cpp
@@ -23,13 +23,13 @@
*/
#include "precompiled.hpp"
-#include "gc_implementation/g1/g1CollectedHeap.inline.hpp"
-#include "gc_implementation/g1/g1OopClosures.inline.hpp"
-#include "gc_implementation/g1/g1ParScanThreadState.inline.hpp"
-#include "gc_implementation/g1/g1StringDedup.hpp"
+#include "gc/g1/g1CollectedHeap.inline.hpp"
+#include "gc/g1/g1OopClosures.inline.hpp"
+#include "gc/g1/g1ParScanThreadState.inline.hpp"
+#include "gc/g1/g1StringDedup.hpp"
+#include "gc/shared/taskqueue.inline.hpp"
#include "oops/oop.inline.hpp"
#include "runtime/prefetch.inline.hpp"
-#include "utilities/taskqueue.inline.hpp"
G1ParScanThreadState::G1ParScanThreadState(G1CollectedHeap* g1h, uint queue_num, ReferenceProcessor* rp)
: _g1h(g1h),
diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1ParScanThreadState.hpp b/hotspot/src/share/vm/gc/g1/g1ParScanThreadState.hpp
similarity index 92%
rename from hotspot/src/share/vm/gc_implementation/g1/g1ParScanThreadState.hpp
rename to hotspot/src/share/vm/gc/g1/g1ParScanThreadState.hpp
index 9a1f52799f0..77ce22666d8 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/g1ParScanThreadState.hpp
+++ b/hotspot/src/share/vm/gc/g1/g1ParScanThreadState.hpp
@@ -22,16 +22,16 @@
*
*/
-#ifndef SHARE_VM_GC_IMPLEMENTATION_G1_G1PARSCANTHREADSTATE_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_G1_G1PARSCANTHREADSTATE_HPP
+#ifndef SHARE_VM_GC_G1_G1PARSCANTHREADSTATE_HPP
+#define SHARE_VM_GC_G1_G1PARSCANTHREADSTATE_HPP
-#include "gc_implementation/g1/dirtyCardQueue.hpp"
-#include "gc_implementation/g1/g1SATBCardTableModRefBS.hpp"
-#include "gc_implementation/g1/g1CollectedHeap.hpp"
-#include "gc_implementation/g1/g1CollectorPolicy.hpp"
-#include "gc_implementation/g1/g1OopClosures.hpp"
-#include "gc_implementation/g1/g1RemSet.hpp"
-#include "gc_implementation/shared/ageTable.hpp"
+#include "gc/g1/dirtyCardQueue.hpp"
+#include "gc/g1/g1CollectedHeap.hpp"
+#include "gc/g1/g1CollectorPolicy.hpp"
+#include "gc/g1/g1OopClosures.hpp"
+#include "gc/g1/g1RemSet.hpp"
+#include "gc/g1/g1SATBCardTableModRefBS.hpp"
+#include "gc/shared/ageTable.hpp"
#include "memory/allocation.hpp"
#include "oops/oop.hpp"
@@ -213,4 +213,4 @@ class G1ParScanThreadState : public StackObj {
inline void steal_and_trim_queue(RefToScanQueueSet *task_queues);
};
-#endif // SHARE_VM_GC_IMPLEMENTATION_G1_G1PARSCANTHREADSTATE_HPP
+#endif // SHARE_VM_GC_G1_G1PARSCANTHREADSTATE_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1ParScanThreadState.inline.hpp b/hotspot/src/share/vm/gc/g1/g1ParScanThreadState.inline.hpp
similarity index 94%
rename from hotspot/src/share/vm/gc_implementation/g1/g1ParScanThreadState.inline.hpp
rename to hotspot/src/share/vm/gc/g1/g1ParScanThreadState.inline.hpp
index c0ff1e5b426..0a1b3d055c2 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/g1ParScanThreadState.inline.hpp
+++ b/hotspot/src/share/vm/gc/g1/g1ParScanThreadState.inline.hpp
@@ -22,11 +22,11 @@
*
*/
-#ifndef SHARE_VM_GC_IMPLEMENTATION_G1_G1PARSCANTHREADSTATE_INLINE_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_G1_G1PARSCANTHREADSTATE_INLINE_HPP
+#ifndef SHARE_VM_GC_G1_G1PARSCANTHREADSTATE_INLINE_HPP
+#define SHARE_VM_GC_G1_G1PARSCANTHREADSTATE_INLINE_HPP
-#include "gc_implementation/g1/g1ParScanThreadState.hpp"
-#include "gc_implementation/g1/g1RemSet.inline.hpp"
+#include "gc/g1/g1ParScanThreadState.hpp"
+#include "gc/g1/g1RemSet.inline.hpp"
#include "oops/oop.inline.hpp"
template void G1ParScanThreadState::do_oop_evac(T* p, HeapRegion* from) {
@@ -147,5 +147,5 @@ void G1ParScanThreadState::steal_and_trim_queue(RefToScanQueueSet *task_queues)
}
}
-#endif /* SHARE_VM_GC_IMPLEMENTATION_G1_G1PARSCANTHREADSTATE_INLINE_HPP */
+#endif /* SHARE_VM_GC_G1_G1PARSCANTHREADSTATE_INLINE_HPP */
diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1RegionToSpaceMapper.cpp b/hotspot/src/share/vm/gc/g1/g1RegionToSpaceMapper.cpp
similarity index 98%
rename from hotspot/src/share/vm/gc_implementation/g1/g1RegionToSpaceMapper.cpp
rename to hotspot/src/share/vm/gc/g1/g1RegionToSpaceMapper.cpp
index b78f37d8cc9..374ca385abf 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/g1RegionToSpaceMapper.cpp
+++ b/hotspot/src/share/vm/gc/g1/g1RegionToSpaceMapper.cpp
@@ -23,8 +23,8 @@
*/
#include "precompiled.hpp"
-#include "gc_implementation/g1/g1BiasedArray.hpp"
-#include "gc_implementation/g1/g1RegionToSpaceMapper.hpp"
+#include "gc/g1/g1BiasedArray.hpp"
+#include "gc/g1/g1RegionToSpaceMapper.hpp"
#include "memory/allocation.inline.hpp"
#include "memory/virtualspace.hpp"
#include "services/memTracker.hpp"
diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1RegionToSpaceMapper.hpp b/hotspot/src/share/vm/gc/g1/g1RegionToSpaceMapper.hpp
similarity index 93%
rename from hotspot/src/share/vm/gc_implementation/g1/g1RegionToSpaceMapper.hpp
rename to hotspot/src/share/vm/gc/g1/g1RegionToSpaceMapper.hpp
index 6623a37f9d0..fff6ec7605b 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/g1RegionToSpaceMapper.hpp
+++ b/hotspot/src/share/vm/gc/g1/g1RegionToSpaceMapper.hpp
@@ -22,10 +22,10 @@
*
*/
-#ifndef SHARE_VM_GC_IMPLEMENTATION_G1_G1REGIONTOSPACEMAPPER_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_G1_G1REGIONTOSPACEMAPPER_HPP
+#ifndef SHARE_VM_GC_G1_G1REGIONTOSPACEMAPPER_HPP
+#define SHARE_VM_GC_G1_G1REGIONTOSPACEMAPPER_HPP
-#include "gc_implementation/g1/g1PageBasedVirtualSpace.hpp"
+#include "gc/g1/g1PageBasedVirtualSpace.hpp"
#include "memory/allocation.hpp"
#include "utilities/debug.hpp"
@@ -89,4 +89,4 @@ class G1RegionToSpaceMapper : public CHeapObj {
MemoryType type);
};
-#endif /* SHARE_VM_GC_IMPLEMENTATION_G1_G1REGIONTOSPACEMAPPER_HPP */
+#endif /* SHARE_VM_GC_G1_G1REGIONTOSPACEMAPPER_HPP */
diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1RemSet.cpp b/hotspot/src/share/vm/gc/g1/g1RemSet.cpp
similarity index 97%
rename from hotspot/src/share/vm/gc_implementation/g1/g1RemSet.cpp
rename to hotspot/src/share/vm/gc/g1/g1RemSet.cpp
index 1bc162f328d..decdbba888e 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/g1RemSet.cpp
+++ b/hotspot/src/share/vm/gc/g1/g1RemSet.cpp
@@ -23,17 +23,17 @@
*/
#include "precompiled.hpp"
-#include "gc_implementation/g1/concurrentG1Refine.hpp"
-#include "gc_implementation/g1/concurrentG1RefineThread.hpp"
-#include "gc_implementation/g1/g1BlockOffsetTable.inline.hpp"
-#include "gc_implementation/g1/g1CollectedHeap.inline.hpp"
-#include "gc_implementation/g1/g1CollectorPolicy.hpp"
-#include "gc_implementation/g1/g1HotCardCache.hpp"
-#include "gc_implementation/g1/g1GCPhaseTimes.hpp"
-#include "gc_implementation/g1/g1OopClosures.inline.hpp"
-#include "gc_implementation/g1/g1RemSet.inline.hpp"
-#include "gc_implementation/g1/heapRegionManager.inline.hpp"
-#include "gc_implementation/g1/heapRegionRemSet.hpp"
+#include "gc/g1/concurrentG1Refine.hpp"
+#include "gc/g1/concurrentG1RefineThread.hpp"
+#include "gc/g1/g1BlockOffsetTable.inline.hpp"
+#include "gc/g1/g1CollectedHeap.inline.hpp"
+#include "gc/g1/g1CollectorPolicy.hpp"
+#include "gc/g1/g1GCPhaseTimes.hpp"
+#include "gc/g1/g1HotCardCache.hpp"
+#include "gc/g1/g1OopClosures.inline.hpp"
+#include "gc/g1/g1RemSet.inline.hpp"
+#include "gc/g1/heapRegionManager.inline.hpp"
+#include "gc/g1/heapRegionRemSet.hpp"
#include "memory/iterator.hpp"
#include "oops/oop.inline.hpp"
#include "utilities/globalDefinitions.hpp"
diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1RemSet.hpp b/hotspot/src/share/vm/gc/g1/g1RemSet.hpp
similarity index 95%
rename from hotspot/src/share/vm/gc_implementation/g1/g1RemSet.hpp
rename to hotspot/src/share/vm/gc/g1/g1RemSet.hpp
index 77eed43ac87..a71bc2bbd9c 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/g1RemSet.hpp
+++ b/hotspot/src/share/vm/gc/g1/g1RemSet.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,10 +22,10 @@
*
*/
-#ifndef SHARE_VM_GC_IMPLEMENTATION_G1_G1REMSET_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_G1_G1REMSET_HPP
+#ifndef SHARE_VM_GC_G1_G1REMSET_HPP
+#define SHARE_VM_GC_G1_G1REMSET_HPP
-#include "gc_implementation/g1/g1RemSetSummary.hpp"
+#include "gc/g1/g1RemSetSummary.hpp"
// A G1RemSet provides ways of iterating over pointers into a selected
// collection set.
@@ -175,4 +175,4 @@ public:
bool apply_to_weak_ref_discovered_field() { return true; }
};
-#endif // SHARE_VM_GC_IMPLEMENTATION_G1_G1REMSET_HPP
+#endif // SHARE_VM_GC_G1_G1REMSET_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1RemSet.inline.hpp b/hotspot/src/share/vm/gc/g1/g1RemSet.inline.hpp
similarity index 87%
rename from hotspot/src/share/vm/gc_implementation/g1/g1RemSet.inline.hpp
rename to hotspot/src/share/vm/gc/g1/g1RemSet.inline.hpp
index ee32c64a426..4fd438ab61f 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/g1RemSet.inline.hpp
+++ b/hotspot/src/share/vm/gc/g1/g1RemSet.inline.hpp
@@ -22,12 +22,12 @@
*
*/
-#ifndef SHARE_VM_GC_IMPLEMENTATION_G1_G1REMSET_INLINE_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_G1_G1REMSET_INLINE_HPP
+#ifndef SHARE_VM_GC_G1_G1REMSET_INLINE_HPP
+#define SHARE_VM_GC_G1_G1REMSET_INLINE_HPP
-#include "gc_implementation/g1/g1RemSet.hpp"
-#include "gc_implementation/g1/heapRegion.hpp"
-#include "gc_implementation/g1/heapRegionRemSet.hpp"
+#include "gc/g1/g1RemSet.hpp"
+#include "gc/g1/heapRegion.hpp"
+#include "gc/g1/heapRegionRemSet.hpp"
#include "oops/oop.inline.hpp"
inline uint G1RemSet::n_workers() {
@@ -75,4 +75,4 @@ inline void UpdateRSOopClosure::do_oop_work(T* p) {
_rs->par_write_ref(_from, p, _worker_i);
}
-#endif // SHARE_VM_GC_IMPLEMENTATION_G1_G1REMSET_INLINE_HPP
+#endif // SHARE_VM_GC_G1_G1REMSET_INLINE_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1RemSetSummary.cpp b/hotspot/src/share/vm/gc/g1/g1RemSetSummary.cpp
similarity index 96%
rename from hotspot/src/share/vm/gc_implementation/g1/g1RemSetSummary.cpp
rename to hotspot/src/share/vm/gc/g1/g1RemSetSummary.cpp
index 4f8a35254c3..f8308611d29 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/g1RemSetSummary.cpp
+++ b/hotspot/src/share/vm/gc/g1/g1RemSetSummary.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -23,13 +23,13 @@
*/
#include "precompiled.hpp"
-#include "gc_implementation/g1/concurrentG1Refine.hpp"
-#include "gc_implementation/g1/concurrentG1RefineThread.hpp"
-#include "gc_implementation/g1/heapRegion.hpp"
-#include "gc_implementation/g1/g1CollectedHeap.inline.hpp"
-#include "gc_implementation/g1/g1RemSet.inline.hpp"
-#include "gc_implementation/g1/g1RemSetSummary.hpp"
-#include "gc_implementation/g1/heapRegionRemSet.hpp"
+#include "gc/g1/concurrentG1Refine.hpp"
+#include "gc/g1/concurrentG1RefineThread.hpp"
+#include "gc/g1/g1CollectedHeap.inline.hpp"
+#include "gc/g1/g1RemSet.inline.hpp"
+#include "gc/g1/g1RemSetSummary.hpp"
+#include "gc/g1/heapRegion.hpp"
+#include "gc/g1/heapRegionRemSet.hpp"
#include "runtime/thread.inline.hpp"
class GetRSThreadVTimeClosure : public ThreadClosure {
diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1RemSetSummary.hpp b/hotspot/src/share/vm/gc/g1/g1RemSetSummary.hpp
similarity index 92%
rename from hotspot/src/share/vm/gc_implementation/g1/g1RemSetSummary.hpp
rename to hotspot/src/share/vm/gc/g1/g1RemSetSummary.hpp
index 2b083388fbc..b18fedd98ee 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/g1RemSetSummary.hpp
+++ b/hotspot/src/share/vm/gc/g1/g1RemSetSummary.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_IMPLEMENTATION_G1_G1REMSETSUMMARY_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_G1_G1REMSETSUMMARY_HPP
+#ifndef SHARE_VM_GC_G1_G1REMSETSUMMARY_HPP
+#define SHARE_VM_GC_G1_G1REMSETSUMMARY_HPP
#include "utilities/ostream.hpp"
@@ -115,4 +115,4 @@ public:
}
};
-#endif // SHARE_VM_GC_IMPLEMENTATION_G1_G1REMSETSUMMARY_HPP
+#endif // SHARE_VM_GC_G1_G1REMSETSUMMARY_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1RootProcessor.cpp b/hotspot/src/share/vm/gc/g1/g1RootProcessor.cpp
similarity index 97%
rename from hotspot/src/share/vm/gc_implementation/g1/g1RootProcessor.cpp
rename to hotspot/src/share/vm/gc/g1/g1RootProcessor.cpp
index cf1708146cd..2c2c68be549 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/g1RootProcessor.cpp
+++ b/hotspot/src/share/vm/gc/g1/g1RootProcessor.cpp
@@ -27,12 +27,12 @@
#include "classfile/stringTable.hpp"
#include "classfile/systemDictionary.hpp"
#include "code/codeCache.hpp"
-#include "gc_implementation/g1/bufferingOopClosure.hpp"
-#include "gc_implementation/g1/g1CollectedHeap.inline.hpp"
-#include "gc_implementation/g1/g1CollectorPolicy.hpp"
-#include "gc_implementation/g1/g1GCPhaseTimes.hpp"
-#include "gc_implementation/g1/g1RemSet.inline.hpp"
-#include "gc_implementation/g1/g1RootProcessor.hpp"
+#include "gc/g1/bufferingOopClosure.hpp"
+#include "gc/g1/g1CollectedHeap.inline.hpp"
+#include "gc/g1/g1CollectorPolicy.hpp"
+#include "gc/g1/g1GCPhaseTimes.hpp"
+#include "gc/g1/g1RemSet.inline.hpp"
+#include "gc/g1/g1RootProcessor.hpp"
#include "memory/allocation.inline.hpp"
#include "runtime/fprofiler.hpp"
#include "runtime/mutex.hpp"
diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1RootProcessor.hpp b/hotspot/src/share/vm/gc/g1/g1RootProcessor.hpp
similarity index 95%
rename from hotspot/src/share/vm/gc_implementation/g1/g1RootProcessor.hpp
rename to hotspot/src/share/vm/gc/g1/g1RootProcessor.hpp
index 35ba27578f0..9be26d5259b 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/g1RootProcessor.hpp
+++ b/hotspot/src/share/vm/gc/g1/g1RootProcessor.hpp
@@ -22,11 +22,11 @@
*
*/
-#ifndef SHARE_VM_GC_IMPLEMENTATION_G1_G1ROOTPROCESSOR_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_G1_G1ROOTPROCESSOR_HPP
+#ifndef SHARE_VM_GC_G1_G1ROOTPROCESSOR_HPP
+#define SHARE_VM_GC_G1_G1ROOTPROCESSOR_HPP
+#include "gc/shared/strongRootsScope.hpp"
#include "memory/allocation.hpp"
-#include "memory/strongRootsScope.hpp"
#include "runtime/mutex.hpp"
class CLDClosure;
@@ -118,4 +118,4 @@ public:
void set_num_workers(uint active_workers);
};
-#endif // SHARE_VM_GC_IMPLEMENTATION_G1_G1ROOTPROCESSOR_HPP
+#endif // SHARE_VM_GC_G1_G1ROOTPROCESSOR_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1SATBCardTableModRefBS.cpp b/hotspot/src/share/vm/gc/g1/g1SATBCardTableModRefBS.cpp
similarity index 97%
rename from hotspot/src/share/vm/gc_implementation/g1/g1SATBCardTableModRefBS.cpp
rename to hotspot/src/share/vm/gc/g1/g1SATBCardTableModRefBS.cpp
index 1778abd10a7..4a4c91e9de7 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/g1SATBCardTableModRefBS.cpp
+++ b/hotspot/src/share/vm/gc/g1/g1SATBCardTableModRefBS.cpp
@@ -23,10 +23,10 @@
*/
#include "precompiled.hpp"
-#include "gc_implementation/g1/g1CollectedHeap.inline.hpp"
-#include "gc_implementation/g1/g1SATBCardTableModRefBS.hpp"
-#include "gc_implementation/g1/heapRegion.hpp"
-#include "gc_implementation/g1/satbQueue.hpp"
+#include "gc/g1/g1CollectedHeap.inline.hpp"
+#include "gc/g1/g1SATBCardTableModRefBS.hpp"
+#include "gc/g1/heapRegion.hpp"
+#include "gc/g1/satbQueue.hpp"
#include "oops/oop.inline.hpp"
#include "runtime/atomic.inline.hpp"
#include "runtime/mutexLocker.hpp"
diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1SATBCardTableModRefBS.hpp b/hotspot/src/share/vm/gc/g1/g1SATBCardTableModRefBS.hpp
similarity index 95%
rename from hotspot/src/share/vm/gc_implementation/g1/g1SATBCardTableModRefBS.hpp
rename to hotspot/src/share/vm/gc/g1/g1SATBCardTableModRefBS.hpp
index 2abdf30d237..7f0f26c7d36 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/g1SATBCardTableModRefBS.hpp
+++ b/hotspot/src/share/vm/gc/g1/g1SATBCardTableModRefBS.hpp
@@ -22,11 +22,11 @@
*
*/
-#ifndef SHARE_VM_GC_IMPLEMENTATION_G1_G1SATBCARDTABLEMODREFBS_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_G1_G1SATBCARDTABLEMODREFBS_HPP
+#ifndef SHARE_VM_GC_G1_G1SATBCARDTABLEMODREFBS_HPP
+#define SHARE_VM_GC_G1_G1SATBCARDTABLEMODREFBS_HPP
-#include "gc_implementation/g1/g1RegionToSpaceMapper.hpp"
-#include "memory/cardTableModRefBS.hpp"
+#include "gc/g1/g1RegionToSpaceMapper.hpp"
+#include "gc/shared/cardTableModRefBS.hpp"
#include "memory/memRegion.hpp"
#include "oops/oop.hpp"
#include "utilities/macros.hpp"
@@ -183,4 +183,4 @@ struct BarrierSet::GetName {
static const BarrierSet::Name value = BarrierSet::G1SATBCTLogging;
};
-#endif // SHARE_VM_GC_IMPLEMENTATION_G1_G1SATBCARDTABLEMODREFBS_HPP
+#endif // SHARE_VM_GC_G1_G1SATBCARDTABLEMODREFBS_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1StringDedup.cpp b/hotspot/src/share/vm/gc/g1/g1StringDedup.cpp
similarity index 95%
rename from hotspot/src/share/vm/gc_implementation/g1/g1StringDedup.cpp
rename to hotspot/src/share/vm/gc/g1/g1StringDedup.cpp
index 4b3819800c3..fa99207ff35 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/g1StringDedup.cpp
+++ b/hotspot/src/share/vm/gc/g1/g1StringDedup.cpp
@@ -24,13 +24,13 @@
#include "precompiled.hpp"
#include "classfile/javaClasses.inline.hpp"
-#include "gc_implementation/g1/g1CollectedHeap.inline.hpp"
-#include "gc_implementation/g1/g1GCPhaseTimes.hpp"
-#include "gc_implementation/g1/g1StringDedup.hpp"
-#include "gc_implementation/g1/g1StringDedupQueue.hpp"
-#include "gc_implementation/g1/g1StringDedupStat.hpp"
-#include "gc_implementation/g1/g1StringDedupTable.hpp"
-#include "gc_implementation/g1/g1StringDedupThread.hpp"
+#include "gc/g1/g1CollectedHeap.inline.hpp"
+#include "gc/g1/g1GCPhaseTimes.hpp"
+#include "gc/g1/g1StringDedup.hpp"
+#include "gc/g1/g1StringDedupQueue.hpp"
+#include "gc/g1/g1StringDedupStat.hpp"
+#include "gc/g1/g1StringDedupTable.hpp"
+#include "gc/g1/g1StringDedupThread.hpp"
#include "runtime/atomic.inline.hpp"
bool G1StringDedup::_enabled = false;
diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1StringDedup.hpp b/hotspot/src/share/vm/gc/g1/g1StringDedup.hpp
similarity index 96%
rename from hotspot/src/share/vm/gc_implementation/g1/g1StringDedup.hpp
rename to hotspot/src/share/vm/gc/g1/g1StringDedup.hpp
index 71c75bc2bbf..9191613787b 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/g1StringDedup.hpp
+++ b/hotspot/src/share/vm/gc/g1/g1StringDedup.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_IMPLEMENTATION_G1_G1STRINGDEDUP_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_G1_G1STRINGDEDUP_HPP
+#ifndef SHARE_VM_GC_G1_G1STRINGDEDUP_HPP
+#define SHARE_VM_GC_G1_G1STRINGDEDUP_HPP
//
// String Deduplication
@@ -201,4 +201,4 @@ public:
}
};
-#endif // SHARE_VM_GC_IMPLEMENTATION_G1_G1STRINGDEDUP_HPP
+#endif // SHARE_VM_GC_G1_G1STRINGDEDUP_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupQueue.cpp b/hotspot/src/share/vm/gc/g1/g1StringDedupQueue.cpp
similarity index 96%
rename from hotspot/src/share/vm/gc_implementation/g1/g1StringDedupQueue.cpp
rename to hotspot/src/share/vm/gc/g1/g1StringDedupQueue.cpp
index 1e2c5e4970f..8216889c8af 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupQueue.cpp
+++ b/hotspot/src/share/vm/gc/g1/g1StringDedupQueue.cpp
@@ -24,10 +24,10 @@
#include "precompiled.hpp"
#include "classfile/javaClasses.inline.hpp"
-#include "gc_implementation/g1/g1CollectedHeap.hpp"
-#include "gc_implementation/g1/g1StringDedup.hpp"
-#include "gc_implementation/g1/g1StringDedupQueue.hpp"
-#include "memory/gcLocker.hpp"
+#include "gc/g1/g1CollectedHeap.hpp"
+#include "gc/g1/g1StringDedup.hpp"
+#include "gc/g1/g1StringDedupQueue.hpp"
+#include "gc/shared/gcLocker.hpp"
#include "oops/oop.inline.hpp"
#include "runtime/atomic.inline.hpp"
#include "runtime/mutexLocker.hpp"
diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupQueue.hpp b/hotspot/src/share/vm/gc/g1/g1StringDedupQueue.hpp
similarity index 93%
rename from hotspot/src/share/vm/gc_implementation/g1/g1StringDedupQueue.hpp
rename to hotspot/src/share/vm/gc/g1/g1StringDedupQueue.hpp
index 99f555b7076..3c9bbd1360f 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupQueue.hpp
+++ b/hotspot/src/share/vm/gc/g1/g1StringDedupQueue.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_IMPLEMENTATION_G1_G1STRINGDEDUPQUEUE_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_G1_G1STRINGDEDUPQUEUE_HPP
+#ifndef SHARE_VM_GC_G1_G1STRINGDEDUPQUEUE_HPP
+#define SHARE_VM_GC_G1_G1STRINGDEDUPQUEUE_HPP
#include "memory/allocation.hpp"
#include "oops/oop.hpp"
@@ -98,4 +98,4 @@ public:
static void verify();
};
-#endif // SHARE_VM_GC_IMPLEMENTATION_G1_G1STRINGDEDUPQUEUE_HPP
+#endif // SHARE_VM_GC_G1_G1STRINGDEDUPQUEUE_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupStat.cpp b/hotspot/src/share/vm/gc/g1/g1StringDedupStat.cpp
similarity index 98%
rename from hotspot/src/share/vm/gc_implementation/g1/g1StringDedupStat.cpp
rename to hotspot/src/share/vm/gc/g1/g1StringDedupStat.cpp
index 2d5523cce9e..1e555875d78 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupStat.cpp
+++ b/hotspot/src/share/vm/gc/g1/g1StringDedupStat.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
*/
#include "precompiled.hpp"
-#include "gc_implementation/g1/g1StringDedupStat.hpp"
+#include "gc/g1/g1StringDedupStat.hpp"
G1StringDedupStat::G1StringDedupStat() :
_inspected(0),
diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupStat.hpp b/hotspot/src/share/vm/gc/g1/g1StringDedupStat.hpp
similarity index 93%
rename from hotspot/src/share/vm/gc_implementation/g1/g1StringDedupStat.hpp
rename to hotspot/src/share/vm/gc/g1/g1StringDedupStat.hpp
index bfb55caa720..1e0367c013b 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupStat.hpp
+++ b/hotspot/src/share/vm/gc/g1/g1StringDedupStat.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_IMPLEMENTATION_G1_G1STRINGDEDUPSTAT_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_G1_G1STRINGDEDUPSTAT_HPP
+#ifndef SHARE_VM_GC_G1_G1STRINGDEDUPSTAT_HPP
+#define SHARE_VM_GC_G1_G1STRINGDEDUPSTAT_HPP
#include "memory/allocation.hpp"
#include "runtime/os.hpp"
@@ -139,4 +139,4 @@ public:
static void print_statistics(outputStream* st, const G1StringDedupStat& stat, bool total);
};
-#endif // SHARE_VM_GC_IMPLEMENTATION_G1_G1STRINGDEDUPSTAT_HPP
+#endif // SHARE_VM_GC_G1_G1STRINGDEDUPSTAT_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupTable.cpp b/hotspot/src/share/vm/gc/g1/g1StringDedupTable.cpp
similarity index 98%
rename from hotspot/src/share/vm/gc_implementation/g1/g1StringDedupTable.cpp
rename to hotspot/src/share/vm/gc/g1/g1StringDedupTable.cpp
index 7c998fa51e8..30dcb659757 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupTable.cpp
+++ b/hotspot/src/share/vm/gc/g1/g1StringDedupTable.cpp
@@ -25,14 +25,14 @@
#include "precompiled.hpp"
#include "classfile/altHashing.hpp"
#include "classfile/javaClasses.inline.hpp"
-#include "gc_implementation/g1/g1CollectedHeap.inline.hpp"
-#include "gc_implementation/g1/g1SATBCardTableModRefBS.hpp"
-#include "gc_implementation/g1/g1StringDedup.hpp"
-#include "gc_implementation/g1/g1StringDedupTable.hpp"
-#include "memory/gcLocker.hpp"
+#include "gc/g1/g1CollectedHeap.inline.hpp"
+#include "gc/g1/g1SATBCardTableModRefBS.hpp"
+#include "gc/g1/g1StringDedup.hpp"
+#include "gc/g1/g1StringDedupTable.hpp"
+#include "gc/shared/gcLocker.hpp"
#include "memory/padded.inline.hpp"
-#include "oops/typeArrayOop.hpp"
#include "oops/oop.inline.hpp"
+#include "oops/typeArrayOop.hpp"
#include "runtime/mutexLocker.hpp"
//
diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupTable.hpp b/hotspot/src/share/vm/gc/g1/g1StringDedupTable.hpp
similarity index 96%
rename from hotspot/src/share/vm/gc_implementation/g1/g1StringDedupTable.hpp
rename to hotspot/src/share/vm/gc/g1/g1StringDedupTable.hpp
index 75f25f3db0c..56f1c2d1c06 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupTable.hpp
+++ b/hotspot/src/share/vm/gc/g1/g1StringDedupTable.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,10 +22,10 @@
*
*/
-#ifndef SHARE_VM_GC_IMPLEMENTATION_G1_G1STRINGDEDUPTABLE_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_G1_G1STRINGDEDUPTABLE_HPP
+#ifndef SHARE_VM_GC_G1_G1STRINGDEDUPTABLE_HPP
+#define SHARE_VM_GC_G1_G1STRINGDEDUPTABLE_HPP
-#include "gc_implementation/g1/g1StringDedupStat.hpp"
+#include "gc/g1/g1StringDedupStat.hpp"
#include "runtime/mutexLocker.hpp"
class G1StringDedupEntryCache;
@@ -228,4 +228,4 @@ public:
static void verify();
};
-#endif // SHARE_VM_GC_IMPLEMENTATION_G1_G1STRINGDEDUPTABLE_HPP
+#endif // SHARE_VM_GC_G1_G1STRINGDEDUPTABLE_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupThread.cpp b/hotspot/src/share/vm/gc/g1/g1StringDedupThread.cpp
similarity index 93%
rename from hotspot/src/share/vm/gc_implementation/g1/g1StringDedupThread.cpp
rename to hotspot/src/share/vm/gc/g1/g1StringDedupThread.cpp
index 97cd68e5109..1a40c863a61 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupThread.cpp
+++ b/hotspot/src/share/vm/gc/g1/g1StringDedupThread.cpp
@@ -23,11 +23,11 @@
*/
#include "precompiled.hpp"
-#include "gc_implementation/g1/g1Log.hpp"
-#include "gc_implementation/g1/g1StringDedup.hpp"
-#include "gc_implementation/g1/g1StringDedupTable.hpp"
-#include "gc_implementation/g1/g1StringDedupThread.hpp"
-#include "gc_implementation/g1/g1StringDedupQueue.hpp"
+#include "gc/g1/g1Log.hpp"
+#include "gc/g1/g1StringDedup.hpp"
+#include "gc/g1/g1StringDedupQueue.hpp"
+#include "gc/g1/g1StringDedupTable.hpp"
+#include "gc/g1/g1StringDedupThread.hpp"
#include "runtime/atomic.inline.hpp"
G1StringDedupThread* G1StringDedupThread::_thread = NULL;
diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupThread.hpp b/hotspot/src/share/vm/gc/g1/g1StringDedupThread.hpp
similarity index 83%
rename from hotspot/src/share/vm/gc_implementation/g1/g1StringDedupThread.hpp
rename to hotspot/src/share/vm/gc/g1/g1StringDedupThread.hpp
index 9ae86042950..90d463db692 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupThread.hpp
+++ b/hotspot/src/share/vm/gc/g1/g1StringDedupThread.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,11 +22,11 @@
*
*/
-#ifndef SHARE_VM_GC_IMPLEMENTATION_G1_G1STRINGDEDUPTHREAD_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_G1_G1STRINGDEDUPTHREAD_HPP
+#ifndef SHARE_VM_GC_G1_G1STRINGDEDUPTHREAD_HPP
+#define SHARE_VM_GC_G1_G1STRINGDEDUPTHREAD_HPP
-#include "gc_implementation/g1/g1StringDedupStat.hpp"
-#include "gc_implementation/shared/concurrentGCThread.hpp"
+#include "gc/g1/g1StringDedupStat.hpp"
+#include "gc/shared/concurrentGCThread.hpp"
//
// The deduplication thread is where the actual deduplication occurs. It waits for
@@ -54,4 +54,4 @@ public:
virtual void run();
};
-#endif // SHARE_VM_GC_IMPLEMENTATION_G1_G1STRINGDEDUPTHREAD_HPP
+#endif // SHARE_VM_GC_G1_G1STRINGDEDUPTHREAD_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1YCTypes.hpp b/hotspot/src/share/vm/gc/g1/g1YCTypes.hpp
similarity index 86%
rename from hotspot/src/share/vm/gc_implementation/g1/g1YCTypes.hpp
rename to hotspot/src/share/vm/gc/g1/g1YCTypes.hpp
index 7d2216059cb..7fd99270bb7 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/g1YCTypes.hpp
+++ b/hotspot/src/share/vm/gc/g1/g1YCTypes.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_IMPLEMENTATION_G1_G1YCTYPES_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_G1_G1YCTYPES_HPP
+#ifndef SHARE_VM_GC_G1_G1YCTYPES_HPP
+#define SHARE_VM_GC_G1_G1YCTYPES_HPP
#include "utilities/debug.hpp"
@@ -48,4 +48,4 @@ class G1YCTypeHelper {
}
};
-#endif // SHARE_VM_GC_IMPLEMENTATION_G1_G1YCTYPES_HPP
+#endif // SHARE_VM_GC_G1_G1YCTYPES_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1_globals.cpp b/hotspot/src/share/vm/gc/g1/g1_globals.cpp
similarity index 92%
rename from hotspot/src/share/vm/gc_implementation/g1/g1_globals.cpp
rename to hotspot/src/share/vm/gc/g1/g1_globals.cpp
index af7405df214..6e869d2d1e0 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/g1_globals.cpp
+++ b/hotspot/src/share/vm/gc/g1/g1_globals.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
*/
#include "precompiled.hpp"
-#include "gc_implementation/g1/g1_globals.hpp"
+#include "gc/g1/g1_globals.hpp"
G1_FLAGS(MATERIALIZE_DEVELOPER_FLAG, MATERIALIZE_PD_DEVELOPER_FLAG, \
MATERIALIZE_PRODUCT_FLAG, MATERIALIZE_PD_PRODUCT_FLAG, \
diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1_globals.hpp b/hotspot/src/share/vm/gc/g1/g1_globals.hpp
similarity index 99%
rename from hotspot/src/share/vm/gc_implementation/g1/g1_globals.hpp
rename to hotspot/src/share/vm/gc/g1/g1_globals.hpp
index 859cfc2fdbe..bfeeea94ca1 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/g1_globals.hpp
+++ b/hotspot/src/share/vm/gc/g1/g1_globals.hpp
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_IMPLEMENTATION_G1_G1_GLOBALS_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_G1_G1_GLOBALS_HPP
+#ifndef SHARE_VM_GC_G1_G1_GLOBALS_HPP
+#define SHARE_VM_GC_G1_G1_GLOBALS_HPP
#include "runtime/globals.hpp"
//
@@ -316,4 +316,4 @@
G1_FLAGS(DECLARE_DEVELOPER_FLAG, DECLARE_PD_DEVELOPER_FLAG, DECLARE_PRODUCT_FLAG, DECLARE_PD_PRODUCT_FLAG, DECLARE_DIAGNOSTIC_FLAG, DECLARE_EXPERIMENTAL_FLAG, DECLARE_NOTPRODUCT_FLAG, DECLARE_MANAGEABLE_FLAG, DECLARE_PRODUCT_RW_FLAG)
-#endif // SHARE_VM_GC_IMPLEMENTATION_G1_G1_GLOBALS_HPP
+#endif // SHARE_VM_GC_G1_G1_GLOBALS_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1_specialized_oop_closures.hpp b/hotspot/src/share/vm/gc/g1/g1_specialized_oop_closures.hpp
similarity index 91%
rename from hotspot/src/share/vm/gc_implementation/g1/g1_specialized_oop_closures.hpp
rename to hotspot/src/share/vm/gc/g1/g1_specialized_oop_closures.hpp
index f3c49d7fc15..68708b891cc 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/g1_specialized_oop_closures.hpp
+++ b/hotspot/src/share/vm/gc/g1/g1_specialized_oop_closures.hpp
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_IMPLEMENTATION_G1_G1_SPECIALIZED_OOP_CLOSURES_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_G1_G1_SPECIALIZED_OOP_CLOSURES_HPP
+#ifndef SHARE_VM_GC_G1_G1_SPECIALIZED_OOP_CLOSURES_HPP
+#define SHARE_VM_GC_G1_G1_SPECIALIZED_OOP_CLOSURES_HPP
// The following OopClosure types get specialized versions of
// "oop_oop_iterate" that invoke the closures' do_oop methods
@@ -58,4 +58,4 @@ class G1UpdateRSOrPushRefOopClosure;
f(G1InvokeIfNotTriggeredClosure,_nv) \
f(G1UpdateRSOrPushRefOopClosure,_nv)
-#endif // SHARE_VM_GC_IMPLEMENTATION_G1_G1_SPECIALIZED_OOP_CLOSURES_HPP
+#endif // SHARE_VM_GC_G1_G1_SPECIALIZED_OOP_CLOSURES_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/shared/hSpaceCounters.cpp b/hotspot/src/share/vm/gc/g1/hSpaceCounters.cpp
similarity index 94%
rename from hotspot/src/share/vm/gc_implementation/shared/hSpaceCounters.cpp
rename to hotspot/src/share/vm/gc/g1/hSpaceCounters.cpp
index 9aa76f31736..7a5afddfedf 100644
--- a/hotspot/src/share/vm/gc_implementation/shared/hSpaceCounters.cpp
+++ b/hotspot/src/share/vm/gc/g1/hSpaceCounters.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -23,8 +23,8 @@
*/
#include "precompiled.hpp"
-#include "gc_implementation/shared/hSpaceCounters.hpp"
-#include "memory/generation.hpp"
+#include "gc/g1/hSpaceCounters.hpp"
+#include "gc/shared/generation.hpp"
#include "memory/resourceArea.hpp"
HSpaceCounters::HSpaceCounters(const char* name,
diff --git a/hotspot/src/share/vm/gc_implementation/shared/hSpaceCounters.hpp b/hotspot/src/share/vm/gc/g1/hSpaceCounters.hpp
similarity index 87%
rename from hotspot/src/share/vm/gc_implementation/shared/hSpaceCounters.hpp
rename to hotspot/src/share/vm/gc/g1/hSpaceCounters.hpp
index f1722677775..fd7ed263415 100644
--- a/hotspot/src/share/vm/gc_implementation/shared/hSpaceCounters.hpp
+++ b/hotspot/src/share/vm/gc/g1/hSpaceCounters.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,13 +22,13 @@
*
*/
-#ifndef SHARE_VM_GC_IMPLEMENTATION_SHARED_HSPACECOUNTERS_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_SHARED_HSPACECOUNTERS_HPP
+#ifndef SHARE_VM_GC_G1_HSPACECOUNTERS_HPP
+#define SHARE_VM_GC_G1_HSPACECOUNTERS_HPP
-#include "utilities/macros.hpp"
-#include "gc_implementation/shared/generationCounters.hpp"
-#include "memory/generation.hpp"
+#include "gc/shared/generation.hpp"
+#include "gc/shared/generationCounters.hpp"
#include "runtime/perfData.hpp"
+#include "utilities/macros.hpp"
// A HSpaceCounter is a holder class for performance counters
// that track a collections (logical spaces) in a heap;
@@ -83,4 +83,4 @@ class HSpaceCounters: public CHeapObj {
const char* name_space() const { return _name_space; }
};
-#endif // SHARE_VM_GC_IMPLEMENTATION_SHARED_HSPACECOUNTERS_HPP
+#endif // SHARE_VM_GC_G1_HSPACECOUNTERS_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/g1/heapRegion.cpp b/hotspot/src/share/vm/gc/g1/heapRegion.cpp
similarity index 98%
rename from hotspot/src/share/vm/gc_implementation/g1/heapRegion.cpp
rename to hotspot/src/share/vm/gc/g1/heapRegion.cpp
index 77f6c413287..f336738ea97 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/heapRegion.cpp
+++ b/hotspot/src/share/vm/gc/g1/heapRegion.cpp
@@ -24,17 +24,17 @@
#include "precompiled.hpp"
#include "code/nmethod.hpp"
-#include "gc_implementation/g1/g1BlockOffsetTable.inline.hpp"
-#include "gc_implementation/g1/g1CollectedHeap.inline.hpp"
-#include "gc_implementation/g1/g1OopClosures.inline.hpp"
-#include "gc_implementation/g1/heapRegion.inline.hpp"
-#include "gc_implementation/g1/heapRegionBounds.inline.hpp"
-#include "gc_implementation/g1/heapRegionRemSet.hpp"
-#include "gc_implementation/g1/heapRegionManager.inline.hpp"
-#include "gc_implementation/shared/liveRange.hpp"
-#include "memory/genOopClosures.inline.hpp"
+#include "gc/g1/g1BlockOffsetTable.inline.hpp"
+#include "gc/g1/g1CollectedHeap.inline.hpp"
+#include "gc/g1/g1OopClosures.inline.hpp"
+#include "gc/g1/heapRegion.inline.hpp"
+#include "gc/g1/heapRegionBounds.inline.hpp"
+#include "gc/g1/heapRegionManager.inline.hpp"
+#include "gc/g1/heapRegionRemSet.hpp"
+#include "gc/shared/genOopClosures.inline.hpp"
+#include "gc/shared/liveRange.hpp"
+#include "gc/shared/space.inline.hpp"
#include "memory/iterator.hpp"
-#include "memory/space.inline.hpp"
#include "oops/oop.inline.hpp"
#include "runtime/atomic.inline.hpp"
#include "runtime/orderAccess.inline.hpp"
diff --git a/hotspot/src/share/vm/gc_implementation/g1/heapRegion.hpp b/hotspot/src/share/vm/gc/g1/heapRegion.hpp
similarity index 98%
rename from hotspot/src/share/vm/gc_implementation/g1/heapRegion.hpp
rename to hotspot/src/share/vm/gc/g1/heapRegion.hpp
index 2e971906650..7ea1fe95259 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/heapRegion.hpp
+++ b/hotspot/src/share/vm/gc/g1/heapRegion.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,16 +22,16 @@
*
*/
-#ifndef SHARE_VM_GC_IMPLEMENTATION_G1_HEAPREGION_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_G1_HEAPREGION_HPP
+#ifndef SHARE_VM_GC_G1_HEAPREGION_HPP
+#define SHARE_VM_GC_G1_HEAPREGION_HPP
-#include "gc_implementation/g1/g1AllocationContext.hpp"
-#include "gc_implementation/g1/g1BlockOffsetTable.hpp"
-#include "gc_implementation/g1/heapRegionType.hpp"
-#include "gc_implementation/g1/survRateGroup.hpp"
-#include "gc_implementation/shared/ageTable.hpp"
-#include "gc_implementation/shared/spaceDecorator.hpp"
-#include "memory/watermark.hpp"
+#include "gc/g1/g1AllocationContext.hpp"
+#include "gc/g1/g1BlockOffsetTable.hpp"
+#include "gc/g1/heapRegionType.hpp"
+#include "gc/g1/survRateGroup.hpp"
+#include "gc/shared/ageTable.hpp"
+#include "gc/shared/spaceDecorator.hpp"
+#include "gc/shared/watermark.hpp"
#include "utilities/macros.hpp"
// A HeapRegion is the smallest piece of a G1CollectedHeap that
@@ -790,4 +790,4 @@ class HeapRegionClosure : public StackObj {
bool complete() { return _complete; }
};
-#endif // SHARE_VM_GC_IMPLEMENTATION_G1_HEAPREGION_HPP
+#endif // SHARE_VM_GC_G1_HEAPREGION_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/g1/heapRegion.inline.hpp b/hotspot/src/share/vm/gc/g1/heapRegion.inline.hpp
similarity index 94%
rename from hotspot/src/share/vm/gc_implementation/g1/heapRegion.inline.hpp
rename to hotspot/src/share/vm/gc/g1/heapRegion.inline.hpp
index 955b8489cc0..e7e36501fd4 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/heapRegion.inline.hpp
+++ b/hotspot/src/share/vm/gc/g1/heapRegion.inline.hpp
@@ -22,13 +22,13 @@
*
*/
-#ifndef SHARE_VM_GC_IMPLEMENTATION_G1_HEAPREGION_INLINE_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_G1_HEAPREGION_INLINE_HPP
+#ifndef SHARE_VM_GC_G1_HEAPREGION_INLINE_HPP
+#define SHARE_VM_GC_G1_HEAPREGION_INLINE_HPP
-#include "gc_implementation/g1/g1BlockOffsetTable.inline.hpp"
-#include "gc_implementation/g1/g1CollectedHeap.hpp"
-#include "gc_implementation/g1/heapRegion.hpp"
-#include "memory/space.hpp"
+#include "gc/g1/g1BlockOffsetTable.inline.hpp"
+#include "gc/g1/g1CollectedHeap.hpp"
+#include "gc/g1/heapRegion.hpp"
+#include "gc/shared/space.hpp"
#include "oops/oop.inline.hpp"
#include "runtime/atomic.inline.hpp"
@@ -200,4 +200,4 @@ inline bool HeapRegion::in_collection_set() const {
return G1CollectedHeap::heap()->is_in_cset(this);
}
-#endif // SHARE_VM_GC_IMPLEMENTATION_G1_HEAPREGION_INLINE_HPP
+#endif // SHARE_VM_GC_G1_HEAPREGION_INLINE_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/g1/heapRegionBounds.hpp b/hotspot/src/share/vm/gc/g1/heapRegionBounds.hpp
similarity index 88%
rename from hotspot/src/share/vm/gc_implementation/g1/heapRegionBounds.hpp
rename to hotspot/src/share/vm/gc/g1/heapRegionBounds.hpp
index 1da7f24c1d8..30d353454f3 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/heapRegionBounds.hpp
+++ b/hotspot/src/share/vm/gc/g1/heapRegionBounds.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_IMPLEMENTATION_G1_HEAPREGIONBOUNDS_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_G1_HEAPREGIONBOUNDS_HPP
+#ifndef SHARE_VM_GC_G1_HEAPREGIONBOUNDS_HPP
+#define SHARE_VM_GC_G1_HEAPREGIONBOUNDS_HPP
class HeapRegionBounds : public AllStatic {
private:
@@ -49,4 +49,4 @@ public:
static inline size_t target_number();
};
-#endif // SHARE_VM_GC_IMPLEMENTATION_G1_HEAPREGIONBOUNDS_HPP
+#endif // SHARE_VM_GC_G1_HEAPREGIONBOUNDS_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/g1/heapRegionBounds.inline.hpp b/hotspot/src/share/vm/gc/g1/heapRegionBounds.inline.hpp
similarity index 83%
rename from hotspot/src/share/vm/gc_implementation/g1/heapRegionBounds.inline.hpp
rename to hotspot/src/share/vm/gc/g1/heapRegionBounds.inline.hpp
index 061d1a30712..29530a1077a 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/heapRegionBounds.inline.hpp
+++ b/hotspot/src/share/vm/gc/g1/heapRegionBounds.inline.hpp
@@ -22,10 +22,10 @@
*
*/
-#ifndef SHARE_VM_GC_IMPLEMENTATION_G1_HEAPREGIONBOUNDS_INLINE_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_G1_HEAPREGIONBOUNDS_INLINE_HPP
+#ifndef SHARE_VM_GC_G1_HEAPREGIONBOUNDS_INLINE_HPP
+#define SHARE_VM_GC_G1_HEAPREGIONBOUNDS_INLINE_HPP
-#include "gc_implementation/g1/heapRegionBounds.hpp"
+#include "gc/g1/heapRegionBounds.hpp"
size_t HeapRegionBounds::min_size() {
return MIN_REGION_SIZE;
@@ -39,4 +39,4 @@ size_t HeapRegionBounds::target_number() {
return TARGET_REGION_NUMBER;
}
-#endif // SHARE_VM_GC_IMPLEMENTATION_G1_HEAPREGIONBOUNDS_INLINE_HPP
+#endif // SHARE_VM_GC_G1_HEAPREGIONBOUNDS_INLINE_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/g1/heapRegionManager.cpp b/hotspot/src/share/vm/gc/g1/heapRegionManager.cpp
similarity index 98%
rename from hotspot/src/share/vm/gc_implementation/g1/heapRegionManager.cpp
rename to hotspot/src/share/vm/gc/g1/heapRegionManager.cpp
index 1c28a8e1f5d..7406e6342ec 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/heapRegionManager.cpp
+++ b/hotspot/src/share/vm/gc/g1/heapRegionManager.cpp
@@ -23,11 +23,11 @@
*/
#include "precompiled.hpp"
-#include "gc_implementation/g1/heapRegion.hpp"
-#include "gc_implementation/g1/heapRegionManager.inline.hpp"
-#include "gc_implementation/g1/heapRegionSet.inline.hpp"
-#include "gc_implementation/g1/g1CollectedHeap.inline.hpp"
-#include "gc_implementation/g1/concurrentG1Refine.hpp"
+#include "gc/g1/concurrentG1Refine.hpp"
+#include "gc/g1/g1CollectedHeap.inline.hpp"
+#include "gc/g1/heapRegion.hpp"
+#include "gc/g1/heapRegionManager.inline.hpp"
+#include "gc/g1/heapRegionSet.inline.hpp"
#include "memory/allocation.hpp"
void HeapRegionManager::initialize(G1RegionToSpaceMapper* heap_storage,
diff --git a/hotspot/src/share/vm/gc_implementation/g1/heapRegionManager.hpp b/hotspot/src/share/vm/gc/g1/heapRegionManager.hpp
similarity index 96%
rename from hotspot/src/share/vm/gc_implementation/g1/heapRegionManager.hpp
rename to hotspot/src/share/vm/gc/g1/heapRegionManager.hpp
index 1ac538608d3..d287216c1d0 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/heapRegionManager.hpp
+++ b/hotspot/src/share/vm/gc/g1/heapRegionManager.hpp
@@ -22,12 +22,12 @@
*
*/
-#ifndef SHARE_VM_GC_IMPLEMENTATION_G1_HEAPREGIONMANAGER_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_G1_HEAPREGIONMANAGER_HPP
+#ifndef SHARE_VM_GC_G1_HEAPREGIONMANAGER_HPP
+#define SHARE_VM_GC_G1_HEAPREGIONMANAGER_HPP
-#include "gc_implementation/g1/g1BiasedArray.hpp"
-#include "gc_implementation/g1/g1RegionToSpaceMapper.hpp"
-#include "gc_implementation/g1/heapRegionSet.hpp"
+#include "gc/g1/g1BiasedArray.hpp"
+#include "gc/g1/g1RegionToSpaceMapper.hpp"
+#include "gc/g1/heapRegionSet.hpp"
#include "services/memoryUsage.hpp"
class HeapRegion;
@@ -265,5 +265,5 @@ class HeapRegionClaimer : public StackObj {
// Claim the given region, returns true if successfully claimed.
bool claim_region(uint region_index);
};
-#endif // SHARE_VM_GC_IMPLEMENTATION_G1_HEAPREGIONMANAGER_HPP
+#endif // SHARE_VM_GC_G1_HEAPREGIONMANAGER_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/g1/heapRegionManager.inline.hpp b/hotspot/src/share/vm/gc/g1/heapRegionManager.inline.hpp
similarity index 81%
rename from hotspot/src/share/vm/gc_implementation/g1/heapRegionManager.inline.hpp
rename to hotspot/src/share/vm/gc/g1/heapRegionManager.inline.hpp
index 96bc92fcec2..8120758be8b 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/heapRegionManager.inline.hpp
+++ b/hotspot/src/share/vm/gc/g1/heapRegionManager.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,12 +22,12 @@
*
*/
-#ifndef SHARE_VM_GC_IMPLEMENTATION_G1_HEAPREGIONMANAGER_INLINE_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_G1_HEAPREGIONMANAGER_INLINE_HPP
+#ifndef SHARE_VM_GC_G1_HEAPREGIONMANAGER_INLINE_HPP
+#define SHARE_VM_GC_G1_HEAPREGIONMANAGER_INLINE_HPP
-#include "gc_implementation/g1/heapRegion.hpp"
-#include "gc_implementation/g1/heapRegionManager.hpp"
-#include "gc_implementation/g1/heapRegionSet.inline.hpp"
+#include "gc/g1/heapRegion.hpp"
+#include "gc/g1/heapRegionManager.hpp"
+#include "gc/g1/heapRegionSet.inline.hpp"
inline HeapRegion* HeapRegionManager::addr_to_region(HeapWord* addr) const {
assert(addr < heap_end(),
@@ -55,4 +55,4 @@ inline void HeapRegionManager::allocate_free_regions_starting_at(uint first, uin
_free_list.remove_starting_at(at(first), num_regions);
}
-#endif // SHARE_VM_GC_IMPLEMENTATION_G1_HEAPREGIONMANAGER_INLINE_HPP
+#endif // SHARE_VM_GC_G1_HEAPREGIONMANAGER_INLINE_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp b/hotspot/src/share/vm/gc/g1/heapRegionRemSet.cpp
similarity index 99%
rename from hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp
rename to hotspot/src/share/vm/gc/g1/heapRegionRemSet.cpp
index a8416bc9984..02ac68eee8d 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp
+++ b/hotspot/src/share/vm/gc/g1/heapRegionRemSet.cpp
@@ -23,14 +23,14 @@
*/
#include "precompiled.hpp"
-#include "gc_implementation/g1/concurrentG1Refine.hpp"
-#include "gc_implementation/g1/g1BlockOffsetTable.inline.hpp"
-#include "gc_implementation/g1/g1CollectedHeap.inline.hpp"
-#include "gc_implementation/g1/heapRegionRemSet.hpp"
-#include "gc_implementation/g1/heapRegionManager.inline.hpp"
+#include "gc/g1/concurrentG1Refine.hpp"
+#include "gc/g1/g1BlockOffsetTable.inline.hpp"
+#include "gc/g1/g1CollectedHeap.inline.hpp"
+#include "gc/g1/heapRegionManager.inline.hpp"
+#include "gc/g1/heapRegionRemSet.hpp"
+#include "gc/shared/space.inline.hpp"
#include "memory/allocation.hpp"
#include "memory/padded.inline.hpp"
-#include "memory/space.inline.hpp"
#include "oops/oop.inline.hpp"
#include "runtime/atomic.inline.hpp"
#include "utilities/bitMap.inline.hpp"
diff --git a/hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.hpp b/hotspot/src/share/vm/gc/g1/heapRegionRemSet.hpp
similarity index 97%
rename from hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.hpp
rename to hotspot/src/share/vm/gc/g1/heapRegionRemSet.hpp
index adbee92d06a..3b07c65d1bf 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.hpp
+++ b/hotspot/src/share/vm/gc/g1/heapRegionRemSet.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,11 +22,11 @@
*
*/
-#ifndef SHARE_VM_GC_IMPLEMENTATION_G1_HEAPREGIONREMSET_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_G1_HEAPREGIONREMSET_HPP
+#ifndef SHARE_VM_GC_G1_HEAPREGIONREMSET_HPP
+#define SHARE_VM_GC_G1_HEAPREGIONREMSET_HPP
-#include "gc_implementation/g1/g1CodeCacheRemSet.hpp"
-#include "gc_implementation/g1/sparsePRT.hpp"
+#include "gc/g1/g1CodeCacheRemSet.hpp"
+#include "gc/g1/sparsePRT.hpp"
// Remembered set for a heap region. Represent a set of "cards" that
// contain pointers into the owner heap region. Cards are defined somewhat
@@ -487,4 +487,4 @@ class HeapRegionRemSetIterator : public StackObj {
}
};
-#endif // SHARE_VM_GC_IMPLEMENTATION_G1_HEAPREGIONREMSET_HPP
+#endif // SHARE_VM_GC_G1_HEAPREGIONREMSET_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/g1/heapRegionSet.cpp b/hotspot/src/share/vm/gc/g1/heapRegionSet.cpp
similarity index 98%
rename from hotspot/src/share/vm/gc_implementation/g1/heapRegionSet.cpp
rename to hotspot/src/share/vm/gc/g1/heapRegionSet.cpp
index 7f55ac0540d..2f844fd7eb3 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/heapRegionSet.cpp
+++ b/hotspot/src/share/vm/gc/g1/heapRegionSet.cpp
@@ -23,9 +23,9 @@
*/
#include "precompiled.hpp"
-#include "gc_implementation/g1/g1CollectedHeap.inline.hpp"
-#include "gc_implementation/g1/heapRegionRemSet.hpp"
-#include "gc_implementation/g1/heapRegionSet.inline.hpp"
+#include "gc/g1/g1CollectedHeap.inline.hpp"
+#include "gc/g1/heapRegionRemSet.hpp"
+#include "gc/g1/heapRegionSet.inline.hpp"
uint FreeRegionList::_unrealistically_long_length = 0;
diff --git a/hotspot/src/share/vm/gc_implementation/g1/heapRegionSet.hpp b/hotspot/src/share/vm/gc/g1/heapRegionSet.hpp
similarity index 97%
rename from hotspot/src/share/vm/gc_implementation/g1/heapRegionSet.hpp
rename to hotspot/src/share/vm/gc/g1/heapRegionSet.hpp
index 9a9267c4b9b..f5325e552ee 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/heapRegionSet.hpp
+++ b/hotspot/src/share/vm/gc/g1/heapRegionSet.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,10 +22,10 @@
*
*/
-#ifndef SHARE_VM_GC_IMPLEMENTATION_G1_HEAPREGIONSET_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_G1_HEAPREGIONSET_HPP
+#ifndef SHARE_VM_GC_G1_HEAPREGIONSET_HPP
+#define SHARE_VM_GC_G1_HEAPREGIONSET_HPP
-#include "gc_implementation/g1/heapRegion.hpp"
+#include "gc/g1/heapRegion.hpp"
// Large buffer for some cases where the output might be larger than normal.
#define HRS_ERR_MSG_BUFSZ 512
@@ -292,4 +292,4 @@ public:
}
};
-#endif // SHARE_VM_GC_IMPLEMENTATION_G1_HEAPREGIONSET_HPP
+#endif // SHARE_VM_GC_G1_HEAPREGIONSET_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/g1/heapRegionSet.inline.hpp b/hotspot/src/share/vm/gc/g1/heapRegionSet.inline.hpp
similarity index 92%
rename from hotspot/src/share/vm/gc_implementation/g1/heapRegionSet.inline.hpp
rename to hotspot/src/share/vm/gc/g1/heapRegionSet.inline.hpp
index f1fce751a2e..c9936421a5f 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/heapRegionSet.inline.hpp
+++ b/hotspot/src/share/vm/gc/g1/heapRegionSet.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,10 +22,10 @@
*
*/
-#ifndef SHARE_VM_GC_IMPLEMENTATION_G1_HEAPREGIONSET_INLINE_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_G1_HEAPREGIONSET_INLINE_HPP
+#ifndef SHARE_VM_GC_G1_HEAPREGIONSET_INLINE_HPP
+#define SHARE_VM_GC_G1_HEAPREGIONSET_INLINE_HPP
-#include "gc_implementation/g1/heapRegionSet.hpp"
+#include "gc/g1/heapRegionSet.hpp"
inline void HeapRegionSetBase::add(HeapRegion* hr) {
check_mt_safety();
@@ -148,5 +148,5 @@ inline HeapRegion* FreeRegionList::remove_region(bool from_head) {
return hr;
}
-#endif // SHARE_VM_GC_IMPLEMENTATION_G1_HEAPREGIONSET_INLINE_HPP
+#endif // SHARE_VM_GC_G1_HEAPREGIONSET_INLINE_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/g1/heapRegionType.cpp b/hotspot/src/share/vm/gc/g1/heapRegionType.cpp
similarity index 94%
rename from hotspot/src/share/vm/gc_implementation/g1/heapRegionType.cpp
rename to hotspot/src/share/vm/gc/g1/heapRegionType.cpp
index 952056067fd..cee1b9f5146 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/heapRegionType.cpp
+++ b/hotspot/src/share/vm/gc/g1/heapRegionType.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
*/
#include "precompiled.hpp"
-#include "gc_implementation/g1/heapRegionType.hpp"
+#include "gc/g1/heapRegionType.hpp"
bool HeapRegionType::is_valid(Tag tag) {
switch (tag) {
diff --git a/hotspot/src/share/vm/gc_implementation/g1/heapRegionType.hpp b/hotspot/src/share/vm/gc/g1/heapRegionType.hpp
similarity index 94%
rename from hotspot/src/share/vm/gc_implementation/g1/heapRegionType.hpp
rename to hotspot/src/share/vm/gc/g1/heapRegionType.hpp
index ef65a172d81..199502adcf4 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/heapRegionType.hpp
+++ b/hotspot/src/share/vm/gc/g1/heapRegionType.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_IMPLEMENTATION_G1_HEAPREGIONTYPE_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_G1_HEAPREGIONTYPE_HPP
+#ifndef SHARE_VM_GC_G1_HEAPREGIONTYPE_HPP
+#define SHARE_VM_GC_G1_HEAPREGIONTYPE_HPP
#include "memory/allocation.hpp"
@@ -131,4 +131,4 @@ public:
HeapRegionType() : _tag(FreeTag) { hrt_assert_is_valid(_tag); }
};
-#endif // SHARE_VM_GC_IMPLEMENTATION_G1_HEAPREGIONTYPE_HPP
+#endif // SHARE_VM_GC_G1_HEAPREGIONTYPE_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/g1/ptrQueue.cpp b/hotspot/src/share/vm/gc/g1/ptrQueue.cpp
similarity index 99%
rename from hotspot/src/share/vm/gc_implementation/g1/ptrQueue.cpp
rename to hotspot/src/share/vm/gc/g1/ptrQueue.cpp
index aae06af1622..42aa91175b0 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/ptrQueue.cpp
+++ b/hotspot/src/share/vm/gc/g1/ptrQueue.cpp
@@ -23,7 +23,7 @@
*/
#include "precompiled.hpp"
-#include "gc_implementation/g1/ptrQueue.hpp"
+#include "gc/g1/ptrQueue.hpp"
#include "memory/allocation.hpp"
#include "memory/allocation.inline.hpp"
#include "runtime/mutex.hpp"
diff --git a/hotspot/src/share/vm/gc_implementation/g1/ptrQueue.hpp b/hotspot/src/share/vm/gc/g1/ptrQueue.hpp
similarity index 97%
rename from hotspot/src/share/vm/gc_implementation/g1/ptrQueue.hpp
rename to hotspot/src/share/vm/gc/g1/ptrQueue.hpp
index 988e90ba8c9..b4071450f40 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/ptrQueue.hpp
+++ b/hotspot/src/share/vm/gc/g1/ptrQueue.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_IMPLEMENTATION_G1_PTRQUEUE_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_G1_PTRQUEUE_HPP
+#ifndef SHARE_VM_GC_G1_PTRQUEUE_HPP
+#define SHARE_VM_GC_G1_PTRQUEUE_HPP
#include "memory/allocation.hpp"
#include "utilities/sizes.hpp"
@@ -316,4 +316,4 @@ public:
void notify_if_necessary();
};
-#endif // SHARE_VM_GC_IMPLEMENTATION_G1_PTRQUEUE_HPP
+#endif // SHARE_VM_GC_G1_PTRQUEUE_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/g1/satbQueue.cpp b/hotspot/src/share/vm/gc/g1/satbQueue.cpp
similarity index 98%
rename from hotspot/src/share/vm/gc_implementation/g1/satbQueue.cpp
rename to hotspot/src/share/vm/gc/g1/satbQueue.cpp
index ddaa28cf140..b35f294e672 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/satbQueue.cpp
+++ b/hotspot/src/share/vm/gc/g1/satbQueue.cpp
@@ -23,9 +23,9 @@
*/
#include "precompiled.hpp"
-#include "gc_implementation/g1/g1CollectedHeap.inline.hpp"
-#include "gc_implementation/g1/satbQueue.hpp"
-#include "gc_interface/collectedHeap.hpp"
+#include "gc/g1/g1CollectedHeap.inline.hpp"
+#include "gc/g1/satbQueue.hpp"
+#include "gc/shared/collectedHeap.hpp"
#include "memory/allocation.inline.hpp"
#include "oops/oop.inline.hpp"
#include "runtime/mutexLocker.hpp"
diff --git a/hotspot/src/share/vm/gc_implementation/g1/satbQueue.hpp b/hotspot/src/share/vm/gc/g1/satbQueue.hpp
similarity index 95%
rename from hotspot/src/share/vm/gc_implementation/g1/satbQueue.hpp
rename to hotspot/src/share/vm/gc/g1/satbQueue.hpp
index 5948959190f..2e916a7c9a8 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/satbQueue.hpp
+++ b/hotspot/src/share/vm/gc/g1/satbQueue.hpp
@@ -22,11 +22,11 @@
*
*/
-#ifndef SHARE_VM_GC_IMPLEMENTATION_G1_SATBQUEUE_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_G1_SATBQUEUE_HPP
+#ifndef SHARE_VM_GC_G1_SATBQUEUE_HPP
+#define SHARE_VM_GC_G1_SATBQUEUE_HPP
+#include "gc/g1/ptrQueue.hpp"
#include "memory/allocation.hpp"
-#include "gc_implementation/g1/ptrQueue.hpp"
class JavaThread;
class SATBMarkQueueSet;
@@ -120,4 +120,4 @@ public:
void abandon_partial_marking();
};
-#endif // SHARE_VM_GC_IMPLEMENTATION_G1_SATBQUEUE_HPP
+#endif // SHARE_VM_GC_G1_SATBQUEUE_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/g1/sparsePRT.cpp b/hotspot/src/share/vm/gc/g1/sparsePRT.cpp
similarity index 98%
rename from hotspot/src/share/vm/gc_implementation/g1/sparsePRT.cpp
rename to hotspot/src/share/vm/gc/g1/sparsePRT.cpp
index 62646b00f3b..f5be62e366a 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/sparsePRT.cpp
+++ b/hotspot/src/share/vm/gc/g1/sparsePRT.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -23,12 +23,12 @@
*/
#include "precompiled.hpp"
-#include "gc_implementation/g1/heapRegion.hpp"
-#include "gc_implementation/g1/heapRegionRemSet.hpp"
-#include "gc_implementation/g1/sparsePRT.hpp"
+#include "gc/g1/heapRegion.hpp"
+#include "gc/g1/heapRegionRemSet.hpp"
+#include "gc/g1/sparsePRT.hpp"
+#include "gc/shared/cardTableModRefBS.hpp"
+#include "gc/shared/space.inline.hpp"
#include "memory/allocation.inline.hpp"
-#include "memory/cardTableModRefBS.hpp"
-#include "memory/space.inline.hpp"
#include "runtime/atomic.inline.hpp"
#include "runtime/mutexLocker.hpp"
diff --git a/hotspot/src/share/vm/gc_implementation/g1/sparsePRT.hpp b/hotspot/src/share/vm/gc/g1/sparsePRT.hpp
similarity index 97%
rename from hotspot/src/share/vm/gc_implementation/g1/sparsePRT.hpp
rename to hotspot/src/share/vm/gc/g1/sparsePRT.hpp
index a534ceca5f1..b5ea3cde9a9 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/sparsePRT.hpp
+++ b/hotspot/src/share/vm/gc/g1/sparsePRT.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,13 +22,13 @@
*
*/
-#ifndef SHARE_VM_GC_IMPLEMENTATION_G1_SPARSEPRT_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_G1_SPARSEPRT_HPP
+#ifndef SHARE_VM_GC_G1_SPARSEPRT_HPP
+#define SHARE_VM_GC_G1_SPARSEPRT_HPP
-#include "gc_implementation/g1/g1CollectedHeap.hpp"
-#include "gc_implementation/g1/heapRegion.hpp"
+#include "gc/g1/g1CollectedHeap.hpp"
+#include "gc/g1/heapRegion.hpp"
+#include "gc/shared/cardTableModRefBS.hpp"
#include "memory/allocation.hpp"
-#include "memory/cardTableModRefBS.hpp"
#include "runtime/mutex.hpp"
#include "utilities/globalDefinitions.hpp"
@@ -331,4 +331,4 @@ public:
SparsePRT* tail() { return _tail; }
};
-#endif // SHARE_VM_GC_IMPLEMENTATION_G1_SPARSEPRT_HPP
+#endif // SHARE_VM_GC_G1_SPARSEPRT_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/g1/survRateGroup.cpp b/hotspot/src/share/vm/gc/g1/survRateGroup.cpp
similarity index 96%
rename from hotspot/src/share/vm/gc_implementation/g1/survRateGroup.cpp
rename to hotspot/src/share/vm/gc/g1/survRateGroup.cpp
index 13c812499d3..a4a58aa4e28 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/survRateGroup.cpp
+++ b/hotspot/src/share/vm/gc/g1/survRateGroup.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -23,10 +23,10 @@
*/
#include "precompiled.hpp"
-#include "gc_implementation/g1/g1CollectedHeap.inline.hpp"
-#include "gc_implementation/g1/g1CollectorPolicy.hpp"
-#include "gc_implementation/g1/heapRegion.hpp"
-#include "gc_implementation/g1/survRateGroup.hpp"
+#include "gc/g1/g1CollectedHeap.inline.hpp"
+#include "gc/g1/g1CollectorPolicy.hpp"
+#include "gc/g1/heapRegion.hpp"
+#include "gc/g1/survRateGroup.hpp"
#include "memory/allocation.hpp"
SurvRateGroup::SurvRateGroup(G1CollectorPolicy* g1p,
diff --git a/hotspot/src/share/vm/gc_implementation/g1/survRateGroup.hpp b/hotspot/src/share/vm/gc/g1/survRateGroup.hpp
similarity index 92%
rename from hotspot/src/share/vm/gc_implementation/g1/survRateGroup.hpp
rename to hotspot/src/share/vm/gc/g1/survRateGroup.hpp
index fade2442d97..cb5d2872680 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/survRateGroup.hpp
+++ b/hotspot/src/share/vm/gc/g1/survRateGroup.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_IMPLEMENTATION_G1_SURVRATEGROUP_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_G1_SURVRATEGROUP_HPP
+#ifndef SHARE_VM_GC_G1_SURVRATEGROUP_HPP
+#define SHARE_VM_GC_G1_SURVRATEGROUP_HPP
#include "utilities/numberSeq.hpp"
@@ -98,4 +98,4 @@ public:
#endif // PRODUCT
};
-#endif // SHARE_VM_GC_IMPLEMENTATION_G1_SURVRATEGROUP_HPP
+#endif // SHARE_VM_GC_G1_SURVRATEGROUP_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/shared/suspendibleThreadSet.cpp b/hotspot/src/share/vm/gc/g1/suspendibleThreadSet.cpp
similarity index 98%
rename from hotspot/src/share/vm/gc_implementation/shared/suspendibleThreadSet.cpp
rename to hotspot/src/share/vm/gc/g1/suspendibleThreadSet.cpp
index 6e9992a047a..d15bef9254a 100644
--- a/hotspot/src/share/vm/gc_implementation/shared/suspendibleThreadSet.cpp
+++ b/hotspot/src/share/vm/gc/g1/suspendibleThreadSet.cpp
@@ -23,7 +23,7 @@
*/
#include "precompiled.hpp"
-#include "gc_implementation/shared/suspendibleThreadSet.hpp"
+#include "gc/g1/suspendibleThreadSet.hpp"
#include "runtime/mutexLocker.hpp"
#include "runtime/thread.inline.hpp"
diff --git a/hotspot/src/share/vm/gc_implementation/shared/suspendibleThreadSet.hpp b/hotspot/src/share/vm/gc/g1/suspendibleThreadSet.hpp
similarity index 94%
rename from hotspot/src/share/vm/gc_implementation/shared/suspendibleThreadSet.hpp
rename to hotspot/src/share/vm/gc/g1/suspendibleThreadSet.hpp
index c171d405f72..33cbe00f40c 100644
--- a/hotspot/src/share/vm/gc_implementation/shared/suspendibleThreadSet.hpp
+++ b/hotspot/src/share/vm/gc/g1/suspendibleThreadSet.hpp
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_IMPLEMENTATION_SHARED_SUSPENDIBLETHREADSET_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_SHARED_SUSPENDIBLETHREADSET_HPP
+#ifndef SHARE_VM_GC_G1_SUSPENDIBLETHREADSET_HPP
+#define SHARE_VM_GC_G1_SUSPENDIBLETHREADSET_HPP
#include "memory/allocation.hpp"
@@ -114,4 +114,4 @@ public:
}
};
-#endif // SHARE_VM_GC_IMPLEMENTATION_SHARED_SUSPENDIBLETHREADSET_HPP
+#endif // SHARE_VM_GC_G1_SUSPENDIBLETHREADSET_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/g1/vmStructs_g1.hpp b/hotspot/src/share/vm/gc/g1/vmStructs_g1.hpp
similarity index 93%
rename from hotspot/src/share/vm/gc_implementation/g1/vmStructs_g1.hpp
rename to hotspot/src/share/vm/gc/g1/vmStructs_g1.hpp
index 58f70a363bd..bd333c20868 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/vmStructs_g1.hpp
+++ b/hotspot/src/share/vm/gc/g1/vmStructs_g1.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,12 +22,12 @@
*
*/
-#ifndef SHARE_VM_GC_IMPLEMENTATION_G1_VMSTRUCTS_G1_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_G1_VMSTRUCTS_G1_HPP
+#ifndef SHARE_VM_GC_G1_VMSTRUCTS_G1_HPP
+#define SHARE_VM_GC_G1_VMSTRUCTS_G1_HPP
-#include "gc_implementation/g1/heapRegion.hpp"
-#include "gc_implementation/g1/heapRegionManager.hpp"
-#include "gc_implementation/g1/g1CollectedHeap.hpp"
+#include "gc/g1/g1CollectedHeap.hpp"
+#include "gc/g1/heapRegion.hpp"
+#include "gc/g1/heapRegionManager.hpp"
#define VM_STRUCTS_G1(nonstatic_field, static_field) \
\
@@ -86,4 +86,4 @@
declare_toplevel_type(G1Allocator*) \
-#endif // SHARE_VM_GC_IMPLEMENTATION_G1_VMSTRUCTS_G1_HPP
+#endif // SHARE_VM_GC_G1_VMSTRUCTS_G1_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/g1/vm_operations_g1.cpp b/hotspot/src/share/vm/gc/g1/vm_operations_g1.cpp
similarity index 95%
rename from hotspot/src/share/vm/gc_implementation/g1/vm_operations_g1.cpp
rename to hotspot/src/share/vm/gc/g1/vm_operations_g1.cpp
index c4ffabc3f7e..676d0751da5 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/vm_operations_g1.cpp
+++ b/hotspot/src/share/vm/gc/g1/vm_operations_g1.cpp
@@ -23,15 +23,14 @@
*/
#include "precompiled.hpp"
-#include "gc_implementation/g1/concurrentMarkThread.inline.hpp"
-#include "gc_implementation/g1/g1CollectedHeap.inline.hpp"
-#include "gc_implementation/g1/g1CollectorPolicy.hpp"
-#include "gc_implementation/g1/g1Log.hpp"
-#include "gc_implementation/g1/vm_operations_g1.hpp"
-#include "gc_implementation/shared/gcTimer.hpp"
-#include "gc_implementation/shared/gcTraceTime.hpp"
-#include "gc_implementation/shared/isGCActiveMark.hpp"
-#include "gc_implementation/g1/vm_operations_g1.hpp"
+#include "gc/g1/concurrentMarkThread.inline.hpp"
+#include "gc/g1/g1CollectedHeap.inline.hpp"
+#include "gc/g1/g1CollectorPolicy.hpp"
+#include "gc/g1/g1Log.hpp"
+#include "gc/g1/vm_operations_g1.hpp"
+#include "gc/shared/gcTimer.hpp"
+#include "gc/shared/gcTraceTime.hpp"
+#include "gc/shared/isGCActiveMark.hpp"
#include "runtime/interfaceSupport.hpp"
VM_G1CollectForAllocation::VM_G1CollectForAllocation(uint gc_count_before,
diff --git a/hotspot/src/share/vm/gc_implementation/g1/vm_operations_g1.hpp b/hotspot/src/share/vm/gc/g1/vm_operations_g1.hpp
similarity index 93%
rename from hotspot/src/share/vm/gc_implementation/g1/vm_operations_g1.hpp
rename to hotspot/src/share/vm/gc/g1/vm_operations_g1.hpp
index 265eb37d36f..e4149aaa52d 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/vm_operations_g1.hpp
+++ b/hotspot/src/share/vm/gc/g1/vm_operations_g1.hpp
@@ -22,11 +22,11 @@
*
*/
-#ifndef SHARE_VM_GC_IMPLEMENTATION_G1_VM_OPERATIONS_G1_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_G1_VM_OPERATIONS_G1_HPP
+#ifndef SHARE_VM_GC_G1_VM_OPERATIONS_G1_HPP
+#define SHARE_VM_GC_G1_VM_OPERATIONS_G1_HPP
-#include "gc_implementation/g1/g1AllocationContext.hpp"
-#include "gc_implementation/shared/vmGCOperations.hpp"
+#include "gc/g1/g1AllocationContext.hpp"
+#include "gc/shared/vmGCOperations.hpp"
// VM_operations for the G1 collector.
// VM_GC_Operation:
@@ -122,4 +122,4 @@ public:
}
};
-#endif // SHARE_VM_GC_IMPLEMENTATION_G1_VM_OPERATIONS_G1_HPP
+#endif // SHARE_VM_GC_G1_VM_OPERATIONS_G1_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/parallelScavenge/adjoiningGenerations.cpp b/hotspot/src/share/vm/gc/parallel/adjoiningGenerations.cpp
similarity index 97%
rename from hotspot/src/share/vm/gc_implementation/parallelScavenge/adjoiningGenerations.cpp
rename to hotspot/src/share/vm/gc/parallel/adjoiningGenerations.cpp
index 4ad67face5e..9f9361afcad 100644
--- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/adjoiningGenerations.cpp
+++ b/hotspot/src/share/vm/gc/parallel/adjoiningGenerations.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -23,10 +23,10 @@
*/
#include "precompiled.hpp"
-#include "gc_implementation/parallelScavenge/adjoiningGenerations.hpp"
-#include "gc_implementation/parallelScavenge/adjoiningVirtualSpaces.hpp"
-#include "gc_implementation/parallelScavenge/generationSizer.hpp"
-#include "gc_implementation/parallelScavenge/parallelScavengeHeap.hpp"
+#include "gc/parallel/adjoiningGenerations.hpp"
+#include "gc/parallel/adjoiningVirtualSpaces.hpp"
+#include "gc/parallel/generationSizer.hpp"
+#include "gc/parallel/parallelScavengeHeap.hpp"
// If boundary moving is being used, create the young gen and old
// gen with ASPSYoungGen and ASPSOldGen, respectively. Revert to
diff --git a/hotspot/src/share/vm/gc_implementation/parallelScavenge/adjoiningGenerations.hpp b/hotspot/src/share/vm/gc/parallel/adjoiningGenerations.hpp
similarity index 83%
rename from hotspot/src/share/vm/gc_implementation/parallelScavenge/adjoiningGenerations.hpp
rename to hotspot/src/share/vm/gc/parallel/adjoiningGenerations.hpp
index 238802070d5..3c0067a0909 100644
--- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/adjoiningGenerations.hpp
+++ b/hotspot/src/share/vm/gc/parallel/adjoiningGenerations.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,13 +22,13 @@
*
*/
-#ifndef SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_ADJOININGGENERATIONS_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_ADJOININGGENERATIONS_HPP
+#ifndef SHARE_VM_GC_PARALLEL_ADJOININGGENERATIONS_HPP
+#define SHARE_VM_GC_PARALLEL_ADJOININGGENERATIONS_HPP
-#include "gc_implementation/parallelScavenge/adjoiningVirtualSpaces.hpp"
-#include "gc_implementation/parallelScavenge/asPSOldGen.hpp"
-#include "gc_implementation/parallelScavenge/asPSYoungGen.hpp"
-#include "gc_implementation/parallelScavenge/generationSizer.hpp"
+#include "gc/parallel/adjoiningVirtualSpaces.hpp"
+#include "gc/parallel/asPSOldGen.hpp"
+#include "gc/parallel/asPSYoungGen.hpp"
+#include "gc/parallel/generationSizer.hpp"
// Contains two generations that both use an AdjoiningVirtualSpaces.
@@ -77,4 +77,4 @@ class AdjoiningGenerations : public CHeapObj {
size_t reserved_byte_size();
};
-#endif // SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_ADJOININGGENERATIONS_HPP
+#endif // SHARE_VM_GC_PARALLEL_ADJOININGGENERATIONS_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/parallelScavenge/adjoiningVirtualSpaces.cpp b/hotspot/src/share/vm/gc/parallel/adjoiningVirtualSpaces.cpp
similarity index 95%
rename from hotspot/src/share/vm/gc_implementation/parallelScavenge/adjoiningVirtualSpaces.cpp
rename to hotspot/src/share/vm/gc/parallel/adjoiningVirtualSpaces.cpp
index e5ca1f5c097..cce89dd0893 100644
--- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/adjoiningVirtualSpaces.cpp
+++ b/hotspot/src/share/vm/gc/parallel/adjoiningVirtualSpaces.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
*/
#include "precompiled.hpp"
-#include "gc_implementation/parallelScavenge/adjoiningVirtualSpaces.hpp"
+#include "gc/parallel/adjoiningVirtualSpaces.hpp"
#include "memory/allocation.inline.hpp"
#include "runtime/java.hpp"
diff --git a/hotspot/src/share/vm/gc_implementation/parallelScavenge/adjoiningVirtualSpaces.hpp b/hotspot/src/share/vm/gc/parallel/adjoiningVirtualSpaces.hpp
similarity index 91%
rename from hotspot/src/share/vm/gc_implementation/parallelScavenge/adjoiningVirtualSpaces.hpp
rename to hotspot/src/share/vm/gc/parallel/adjoiningVirtualSpaces.hpp
index ed860c204a0..7078ab9db38 100644
--- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/adjoiningVirtualSpaces.hpp
+++ b/hotspot/src/share/vm/gc/parallel/adjoiningVirtualSpaces.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,10 +22,10 @@
*
*/
-#ifndef SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_ADJOININGVIRTUALSPACES_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_ADJOININGVIRTUALSPACES_HPP
+#ifndef SHARE_VM_GC_PARALLEL_ADJOININGVIRTUALSPACES_HPP
+#define SHARE_VM_GC_PARALLEL_ADJOININGVIRTUALSPACES_HPP
-#include "gc_implementation/parallelScavenge/psVirtualspace.hpp"
+#include "gc/parallel/psVirtualspace.hpp"
// Contains two virtual spaces that each can individually span
@@ -112,4 +112,4 @@ class AdjoiningVirtualSpaces {
size_t init_high_byte_size);
};
-#endif // SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_ADJOININGVIRTUALSPACES_HPP
+#endif // SHARE_VM_GC_PARALLEL_ADJOININGVIRTUALSPACES_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/parallelScavenge/asPSOldGen.cpp b/hotspot/src/share/vm/gc/parallel/asPSOldGen.cpp
similarity index 95%
rename from hotspot/src/share/vm/gc_implementation/parallelScavenge/asPSOldGen.cpp
rename to hotspot/src/share/vm/gc/parallel/asPSOldGen.cpp
index 918720df89a..fa5837bcbf6 100644
--- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/asPSOldGen.cpp
+++ b/hotspot/src/share/vm/gc/parallel/asPSOldGen.cpp
@@ -23,11 +23,11 @@
*/
#include "precompiled.hpp"
-#include "gc_implementation/parallelScavenge/asPSOldGen.hpp"
-#include "gc_implementation/parallelScavenge/parallelScavengeHeap.hpp"
-#include "gc_implementation/parallelScavenge/psAdaptiveSizePolicy.hpp"
-#include "gc_implementation/parallelScavenge/psMarkSweepDecorator.hpp"
-#include "memory/cardTableModRefBS.hpp"
+#include "gc/parallel/asPSOldGen.hpp"
+#include "gc/parallel/parallelScavengeHeap.hpp"
+#include "gc/parallel/psAdaptiveSizePolicy.hpp"
+#include "gc/parallel/psMarkSweepDecorator.hpp"
+#include "gc/shared/cardTableModRefBS.hpp"
#include "oops/oop.inline.hpp"
#include "runtime/java.hpp"
diff --git a/hotspot/src/share/vm/gc_implementation/parallelScavenge/asPSOldGen.hpp b/hotspot/src/share/vm/gc/parallel/asPSOldGen.hpp
similarity index 79%
rename from hotspot/src/share/vm/gc_implementation/parallelScavenge/asPSOldGen.hpp
rename to hotspot/src/share/vm/gc/parallel/asPSOldGen.hpp
index 56f215230bb..861ab9a6fa2 100644
--- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/asPSOldGen.hpp
+++ b/hotspot/src/share/vm/gc/parallel/asPSOldGen.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,15 +22,15 @@
*
*/
-#ifndef SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_ASPSOLDGEN_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_ASPSOLDGEN_HPP
+#ifndef SHARE_VM_GC_PARALLEL_ASPSOLDGEN_HPP
+#define SHARE_VM_GC_PARALLEL_ASPSOLDGEN_HPP
-#include "gc_implementation/parallelScavenge/objectStartArray.hpp"
-#include "gc_implementation/parallelScavenge/psOldGen.hpp"
-#include "gc_implementation/parallelScavenge/psVirtualspace.hpp"
-#include "gc_implementation/shared/generationCounters.hpp"
-#include "gc_implementation/shared/mutableSpace.hpp"
-#include "gc_implementation/shared/spaceCounters.hpp"
+#include "gc/parallel/mutableSpace.hpp"
+#include "gc/parallel/objectStartArray.hpp"
+#include "gc/parallel/psOldGen.hpp"
+#include "gc/parallel/psVirtualspace.hpp"
+#include "gc/parallel/spaceCounters.hpp"
+#include "gc/shared/generationCounters.hpp"
class ASPSOldGen : public PSOldGen {
friend class VMStructs;
@@ -68,4 +68,4 @@ class ASPSOldGen : public PSOldGen {
virtual const char* short_name() const { return "ASPSOldGen"; }
};
-#endif // SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_ASPSOLDGEN_HPP
+#endif // SHARE_VM_GC_PARALLEL_ASPSOLDGEN_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/parallelScavenge/asPSYoungGen.cpp b/hotspot/src/share/vm/gc/parallel/asPSYoungGen.cpp
similarity index 98%
rename from hotspot/src/share/vm/gc_implementation/parallelScavenge/asPSYoungGen.cpp
rename to hotspot/src/share/vm/gc/parallel/asPSYoungGen.cpp
index 4395ce6f626..b3e1d83e41f 100644
--- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/asPSYoungGen.cpp
+++ b/hotspot/src/share/vm/gc/parallel/asPSYoungGen.cpp
@@ -23,13 +23,13 @@
*/
#include "precompiled.hpp"
-#include "gc_implementation/parallelScavenge/asPSYoungGen.hpp"
-#include "gc_implementation/parallelScavenge/parallelScavengeHeap.hpp"
-#include "gc_implementation/parallelScavenge/psMarkSweepDecorator.hpp"
-#include "gc_implementation/parallelScavenge/psScavenge.hpp"
-#include "gc_implementation/parallelScavenge/psYoungGen.hpp"
-#include "gc_implementation/shared/gcUtil.hpp"
-#include "gc_implementation/shared/spaceDecorator.hpp"
+#include "gc/parallel/asPSYoungGen.hpp"
+#include "gc/parallel/parallelScavengeHeap.hpp"
+#include "gc/parallel/psMarkSweepDecorator.hpp"
+#include "gc/parallel/psScavenge.hpp"
+#include "gc/parallel/psYoungGen.hpp"
+#include "gc/shared/gcUtil.hpp"
+#include "gc/shared/spaceDecorator.hpp"
#include "oops/oop.inline.hpp"
#include "runtime/java.hpp"
diff --git a/hotspot/src/share/vm/gc_implementation/parallelScavenge/asPSYoungGen.hpp b/hotspot/src/share/vm/gc/parallel/asPSYoungGen.hpp
similarity index 76%
rename from hotspot/src/share/vm/gc_implementation/parallelScavenge/asPSYoungGen.hpp
rename to hotspot/src/share/vm/gc/parallel/asPSYoungGen.hpp
index 6f5409239c7..15db0efe778 100644
--- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/asPSYoungGen.hpp
+++ b/hotspot/src/share/vm/gc/parallel/asPSYoungGen.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,16 +22,16 @@
*
*/
-#ifndef SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_ASPSYOUNGGEN_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_ASPSYOUNGGEN_HPP
+#ifndef SHARE_VM_GC_PARALLEL_ASPSYOUNGGEN_HPP
+#define SHARE_VM_GC_PARALLEL_ASPSYOUNGGEN_HPP
-#include "gc_implementation/parallelScavenge/objectStartArray.hpp"
-#include "gc_implementation/parallelScavenge/psVirtualspace.hpp"
-#include "gc_implementation/parallelScavenge/psYoungGen.hpp"
-#include "gc_implementation/shared/generationCounters.hpp"
-#include "gc_implementation/shared/mutableSpace.hpp"
-#include "gc_implementation/shared/spaceCounters.hpp"
-#include "gc_implementation/shared/spaceDecorator.hpp"
+#include "gc/parallel/mutableSpace.hpp"
+#include "gc/parallel/objectStartArray.hpp"
+#include "gc/parallel/psVirtualspace.hpp"
+#include "gc/parallel/psYoungGen.hpp"
+#include "gc/parallel/spaceCounters.hpp"
+#include "gc/shared/generationCounters.hpp"
+#include "gc/shared/spaceDecorator.hpp"
class ASPSYoungGen : public PSYoungGen {
friend class VMStructs;
@@ -74,4 +74,4 @@ class ASPSYoungGen : public PSYoungGen {
virtual const char* short_name() const { return "ASPSYoungGen"; }
};
-#endif // SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_ASPSYOUNGGEN_HPP
+#endif // SHARE_VM_GC_PARALLEL_ASPSYOUNGGEN_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/parallelScavenge/cardTableExtension.cpp b/hotspot/src/share/vm/gc/parallel/cardTableExtension.cpp
similarity index 98%
rename from hotspot/src/share/vm/gc_implementation/parallelScavenge/cardTableExtension.cpp
rename to hotspot/src/share/vm/gc/parallel/cardTableExtension.cpp
index 2ad1128edba..e4df33ce0be 100644
--- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/cardTableExtension.cpp
+++ b/hotspot/src/share/vm/gc/parallel/cardTableExtension.cpp
@@ -23,13 +23,13 @@
*/
#include "precompiled.hpp"
-#include "gc_implementation/parallelScavenge/cardTableExtension.hpp"
-#include "gc_implementation/parallelScavenge/gcTaskManager.hpp"
-#include "gc_implementation/parallelScavenge/parallelScavengeHeap.hpp"
-#include "gc_implementation/parallelScavenge/psPromotionManager.inline.hpp"
-#include "gc_implementation/parallelScavenge/psScavenge.hpp"
-#include "gc_implementation/parallelScavenge/psTasks.hpp"
-#include "gc_implementation/parallelScavenge/psYoungGen.hpp"
+#include "gc/parallel/cardTableExtension.hpp"
+#include "gc/parallel/gcTaskManager.hpp"
+#include "gc/parallel/parallelScavengeHeap.hpp"
+#include "gc/parallel/psPromotionManager.inline.hpp"
+#include "gc/parallel/psScavenge.hpp"
+#include "gc/parallel/psTasks.hpp"
+#include "gc/parallel/psYoungGen.hpp"
#include "oops/oop.inline.hpp"
#include "runtime/prefetch.inline.hpp"
diff --git a/hotspot/src/share/vm/gc_implementation/parallelScavenge/cardTableExtension.hpp b/hotspot/src/share/vm/gc/parallel/cardTableExtension.hpp
similarity index 94%
rename from hotspot/src/share/vm/gc_implementation/parallelScavenge/cardTableExtension.hpp
rename to hotspot/src/share/vm/gc/parallel/cardTableExtension.hpp
index dd29609e050..dd142cdcb43 100644
--- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/cardTableExtension.hpp
+++ b/hotspot/src/share/vm/gc/parallel/cardTableExtension.hpp
@@ -22,10 +22,10 @@
*
*/
-#ifndef SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_CARDTABLEEXTENSION_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_CARDTABLEEXTENSION_HPP
+#ifndef SHARE_VM_GC_PARALLEL_CARDTABLEEXTENSION_HPP
+#define SHARE_VM_GC_PARALLEL_CARDTABLEEXTENSION_HPP
-#include "memory/cardTableModRefBS.hpp"
+#include "gc/shared/cardTableModRefBS.hpp"
class MutableSpace;
class ObjectStartArray;
@@ -121,4 +121,4 @@ struct BarrierSet::GetName {
static const BarrierSet::Name value = BarrierSet::CardTableExtension;
};
-#endif // SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_CARDTABLEEXTENSION_HPP
+#endif // SHARE_VM_GC_PARALLEL_CARDTABLEEXTENSION_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/shared/gcAdaptivePolicyCounters.cpp b/hotspot/src/share/vm/gc/parallel/gcAdaptivePolicyCounters.cpp
similarity index 98%
rename from hotspot/src/share/vm/gc_implementation/shared/gcAdaptivePolicyCounters.cpp
rename to hotspot/src/share/vm/gc/parallel/gcAdaptivePolicyCounters.cpp
index fe4e8c35f62..4c818571073 100644
--- a/hotspot/src/share/vm/gc_implementation/shared/gcAdaptivePolicyCounters.cpp
+++ b/hotspot/src/share/vm/gc/parallel/gcAdaptivePolicyCounters.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
*/
#include "precompiled.hpp"
-#include "gc_implementation/shared/gcAdaptivePolicyCounters.hpp"
+#include "gc/parallel/gcAdaptivePolicyCounters.hpp"
#include "memory/resourceArea.hpp"
// This class keeps statistical information and computes the
diff --git a/hotspot/src/share/vm/gc_implementation/shared/gcAdaptivePolicyCounters.hpp b/hotspot/src/share/vm/gc/parallel/gcAdaptivePolicyCounters.hpp
similarity index 94%
rename from hotspot/src/share/vm/gc_implementation/shared/gcAdaptivePolicyCounters.hpp
rename to hotspot/src/share/vm/gc/parallel/gcAdaptivePolicyCounters.hpp
index 70e657d2947..3e7202b22dd 100644
--- a/hotspot/src/share/vm/gc_implementation/shared/gcAdaptivePolicyCounters.hpp
+++ b/hotspot/src/share/vm/gc/parallel/gcAdaptivePolicyCounters.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,14 +22,12 @@
*
*/
-#ifndef SHARE_VM_GC_IMPLEMENTATION_SHARED_GCADAPTIVEPOLICYCOUNTERS_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_SHARED_GCADAPTIVEPOLICYCOUNTERS_HPP
+#ifndef SHARE_VM_GC_PARALLEL_GCADAPTIVEPOLICYCOUNTERS_HPP
+#define SHARE_VM_GC_PARALLEL_GCADAPTIVEPOLICYCOUNTERS_HPP
+#include "gc/shared/adaptiveSizePolicy.hpp"
+#include "gc/shared/gcPolicyCounters.hpp"
#include "utilities/macros.hpp"
-#if INCLUDE_ALL_GCS
-#include "gc_implementation/shared/adaptiveSizePolicy.hpp"
-#include "gc_implementation/shared/gcPolicyCounters.hpp"
-#endif // INCLUDE_ALL_GCS
// This class keeps statistical information and computes the
// size of the heap.
@@ -232,4 +230,4 @@ class GCAdaptivePolicyCounters : public GCPolicyCounters {
}
};
-#endif // SHARE_VM_GC_IMPLEMENTATION_SHARED_GCADAPTIVEPOLICYCOUNTERS_HPP
+#endif // SHARE_VM_GC_PARALLEL_GCADAPTIVEPOLICYCOUNTERS_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/parallelScavenge/gcTaskManager.cpp b/hotspot/src/share/vm/gc/parallel/gcTaskManager.cpp
similarity index 99%
rename from hotspot/src/share/vm/gc_implementation/parallelScavenge/gcTaskManager.cpp
rename to hotspot/src/share/vm/gc/parallel/gcTaskManager.cpp
index d9f38a0e2c8..1f7de932857 100644
--- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/gcTaskManager.cpp
+++ b/hotspot/src/share/vm/gc/parallel/gcTaskManager.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -23,9 +23,9 @@
*/
#include "precompiled.hpp"
-#include "gc_implementation/parallelScavenge/gcTaskManager.hpp"
-#include "gc_implementation/parallelScavenge/gcTaskThread.hpp"
-#include "gc_implementation/shared/adaptiveSizePolicy.hpp"
+#include "gc/parallel/gcTaskManager.hpp"
+#include "gc/parallel/gcTaskThread.hpp"
+#include "gc/shared/adaptiveSizePolicy.hpp"
#include "memory/allocation.hpp"
#include "memory/allocation.inline.hpp"
#include "runtime/mutex.hpp"
diff --git a/hotspot/src/share/vm/gc_implementation/parallelScavenge/gcTaskManager.hpp b/hotspot/src/share/vm/gc/parallel/gcTaskManager.hpp
similarity index 98%
rename from hotspot/src/share/vm/gc_implementation/parallelScavenge/gcTaskManager.hpp
rename to hotspot/src/share/vm/gc/parallel/gcTaskManager.hpp
index 01e3c9363de..6dee6763723 100644
--- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/gcTaskManager.hpp
+++ b/hotspot/src/share/vm/gc/parallel/gcTaskManager.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_GCTASKMANAGER_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_GCTASKMANAGER_HPP
+#ifndef SHARE_VM_GC_PARALLEL_GCTASKMANAGER_HPP
+#define SHARE_VM_GC_PARALLEL_GCTASKMANAGER_HPP
#include "runtime/mutex.hpp"
#include "utilities/growableArray.hpp"
@@ -783,4 +783,4 @@ private:
}
};
-#endif // SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_GCTASKMANAGER_HPP
+#endif // SHARE_VM_GC_PARALLEL_GCTASKMANAGER_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/parallelScavenge/gcTaskThread.cpp b/hotspot/src/share/vm/gc/parallel/gcTaskThread.cpp
similarity index 97%
rename from hotspot/src/share/vm/gc_implementation/parallelScavenge/gcTaskThread.cpp
rename to hotspot/src/share/vm/gc/parallel/gcTaskThread.cpp
index 13060a4a12c..dced20a3284 100644
--- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/gcTaskThread.cpp
+++ b/hotspot/src/share/vm/gc/parallel/gcTaskThread.cpp
@@ -24,8 +24,8 @@
*/
#include "precompiled.hpp"
-#include "gc_implementation/parallelScavenge/gcTaskManager.hpp"
-#include "gc_implementation/parallelScavenge/gcTaskThread.hpp"
+#include "gc/parallel/gcTaskManager.hpp"
+#include "gc/parallel/gcTaskThread.hpp"
#include "memory/allocation.hpp"
#include "memory/allocation.inline.hpp"
#include "memory/resourceArea.hpp"
diff --git a/hotspot/src/share/vm/gc_implementation/parallelScavenge/gcTaskThread.hpp b/hotspot/src/share/vm/gc/parallel/gcTaskThread.hpp
similarity index 92%
rename from hotspot/src/share/vm/gc_implementation/parallelScavenge/gcTaskThread.hpp
rename to hotspot/src/share/vm/gc/parallel/gcTaskThread.hpp
index 0c17989a7d5..49f9bd07fbf 100644
--- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/gcTaskThread.hpp
+++ b/hotspot/src/share/vm/gc/parallel/gcTaskThread.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_GCTASKTHREAD_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_GCTASKTHREAD_HPP
+#ifndef SHARE_VM_GC_PARALLEL_GCTASKTHREAD_HPP
+#define SHARE_VM_GC_PARALLEL_GCTASKTHREAD_HPP
#include "runtime/thread.hpp"
@@ -105,4 +105,4 @@ class GCTaskTimeStamp : public CHeapObj
void set_name(char* name) { _name = name; }
};
-#endif // SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_GCTASKTHREAD_HPP
+#endif // SHARE_VM_GC_PARALLEL_GCTASKTHREAD_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/parallelScavenge/generationSizer.cpp b/hotspot/src/share/vm/gc/parallel/generationSizer.cpp
similarity index 94%
rename from hotspot/src/share/vm/gc_implementation/parallelScavenge/generationSizer.cpp
rename to hotspot/src/share/vm/gc/parallel/generationSizer.cpp
index a6cef462ad9..03067d9bdae 100644
--- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/generationSizer.cpp
+++ b/hotspot/src/share/vm/gc/parallel/generationSizer.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -23,8 +23,8 @@
*/
#include "precompiled.hpp"
-#include "gc_implementation/parallelScavenge/generationSizer.hpp"
-#include "memory/collectorPolicy.hpp"
+#include "gc/parallel/generationSizer.hpp"
+#include "gc/shared/collectorPolicy.hpp"
void GenerationSizer::trace_gen_sizes(const char* const str) {
if (TracePageSizes) {
diff --git a/hotspot/src/share/vm/gc_implementation/parallelScavenge/generationSizer.hpp b/hotspot/src/share/vm/gc/parallel/generationSizer.hpp
similarity index 82%
rename from hotspot/src/share/vm/gc_implementation/parallelScavenge/generationSizer.hpp
rename to hotspot/src/share/vm/gc/parallel/generationSizer.hpp
index 70309a7fd59..9db480f0bb7 100644
--- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/generationSizer.hpp
+++ b/hotspot/src/share/vm/gc/parallel/generationSizer.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,10 +22,10 @@
*
*/
-#ifndef SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_GENERATIONSIZER_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_GENERATIONSIZER_HPP
+#ifndef SHARE_VM_GC_PARALLEL_GENERATIONSIZER_HPP
+#define SHARE_VM_GC_PARALLEL_GENERATIONSIZER_HPP
-#include "memory/collectorPolicy.hpp"
+#include "gc/shared/collectorPolicy.hpp"
// There is a nice batch of tested generation sizing code in
// GenCollectorPolicy. Lets reuse it!
@@ -44,4 +44,4 @@ class GenerationSizer : public GenCollectorPolicy {
void initialize_flags();
void initialize_size_info();
};
-#endif // SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_GENERATIONSIZER_HPP
+#endif // SHARE_VM_GC_PARALLEL_GENERATIONSIZER_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/shared/immutableSpace.cpp b/hotspot/src/share/vm/gc/parallel/immutableSpace.cpp
similarity index 93%
rename from hotspot/src/share/vm/gc_implementation/shared/immutableSpace.cpp
rename to hotspot/src/share/vm/gc/parallel/immutableSpace.cpp
index 477680727ba..b9b415afddd 100644
--- a/hotspot/src/share/vm/gc_implementation/shared/immutableSpace.cpp
+++ b/hotspot/src/share/vm/gc/parallel/immutableSpace.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -23,12 +23,10 @@
*/
#include "precompiled.hpp"
-#include "utilities/macros.hpp"
-#if INCLUDE_ALL_GCS
-#include "gc_implementation/shared/immutableSpace.hpp"
+#include "gc/parallel/immutableSpace.hpp"
#include "memory/universe.hpp"
#include "oops/oop.inline.hpp"
-#endif // INCLUDE_ALL_GCS
+#include "utilities/macros.hpp"
void ImmutableSpace::initialize(MemRegion mr) {
HeapWord* bottom = mr.start();
diff --git a/hotspot/src/share/vm/gc_implementation/shared/immutableSpace.hpp b/hotspot/src/share/vm/gc/parallel/immutableSpace.hpp
similarity index 90%
rename from hotspot/src/share/vm/gc_implementation/shared/immutableSpace.hpp
rename to hotspot/src/share/vm/gc/parallel/immutableSpace.hpp
index 5e77da249e8..b42923a01c2 100644
--- a/hotspot/src/share/vm/gc_implementation/shared/immutableSpace.hpp
+++ b/hotspot/src/share/vm/gc/parallel/immutableSpace.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_IMPLEMENTATION_SHARED_IMMUTABLESPACE_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_SHARED_IMMUTABLESPACE_HPP
+#ifndef SHARE_VM_GC_PARALLEL_IMMUTABLESPACE_HPP
+#define SHARE_VM_GC_PARALLEL_IMMUTABLESPACE_HPP
#include "memory/iterator.hpp"
@@ -68,4 +68,4 @@ class ImmutableSpace: public CHeapObj {
virtual void verify();
};
-#endif // SHARE_VM_GC_IMPLEMENTATION_SHARED_IMMUTABLESPACE_HPP
+#endif // SHARE_VM_GC_PARALLEL_IMMUTABLESPACE_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/shared/mutableNUMASpace.cpp b/hotspot/src/share/vm/gc/parallel/mutableNUMASpace.cpp
similarity index 99%
rename from hotspot/src/share/vm/gc_implementation/shared/mutableNUMASpace.cpp
rename to hotspot/src/share/vm/gc/parallel/mutableNUMASpace.cpp
index b6c68fd4808..b64da1c2804 100644
--- a/hotspot/src/share/vm/gc_implementation/shared/mutableNUMASpace.cpp
+++ b/hotspot/src/share/vm/gc/parallel/mutableNUMASpace.cpp
@@ -1,6 +1,6 @@
/*
- * Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -24,9 +24,9 @@
*/
#include "precompiled.hpp"
-#include "gc_implementation/shared/mutableNUMASpace.hpp"
-#include "gc_implementation/shared/spaceDecorator.hpp"
-#include "gc_interface/collectedHeap.hpp"
+#include "gc/parallel/mutableNUMASpace.hpp"
+#include "gc/shared/collectedHeap.hpp"
+#include "gc/shared/spaceDecorator.hpp"
#include "oops/oop.inline.hpp"
#include "runtime/atomic.inline.hpp"
#include "runtime/thread.inline.hpp"
diff --git a/hotspot/src/share/vm/gc_implementation/shared/mutableNUMASpace.hpp b/hotspot/src/share/vm/gc/parallel/mutableNUMASpace.hpp
similarity index 96%
rename from hotspot/src/share/vm/gc_implementation/shared/mutableNUMASpace.hpp
rename to hotspot/src/share/vm/gc/parallel/mutableNUMASpace.hpp
index fcc68a99029..c8b626a45b3 100644
--- a/hotspot/src/share/vm/gc_implementation/shared/mutableNUMASpace.hpp
+++ b/hotspot/src/share/vm/gc/parallel/mutableNUMASpace.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,14 +22,12 @@
*
*/
-#ifndef SHARE_VM_GC_IMPLEMENTATION_SHARED_MUTABLENUMASPACE_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_SHARED_MUTABLENUMASPACE_HPP
+#ifndef SHARE_VM_GC_PARALLEL_MUTABLENUMASPACE_HPP
+#define SHARE_VM_GC_PARALLEL_MUTABLENUMASPACE_HPP
+#include "gc/parallel/mutableSpace.hpp"
+#include "gc/shared/gcUtil.hpp"
#include "utilities/macros.hpp"
-#if INCLUDE_ALL_GCS
-#include "gc_implementation/shared/gcUtil.hpp"
-#include "gc_implementation/shared/mutableSpace.hpp"
-#endif // INCLUDE_ALL_GCS
/*
* The NUMA-aware allocator (MutableNUMASpace) is basically a modification
@@ -232,4 +230,4 @@ class MutableNUMASpace : public MutableSpace {
virtual void set_top(HeapWord* value);
};
-#endif // SHARE_VM_GC_IMPLEMENTATION_SHARED_MUTABLENUMASPACE_HPP
+#endif // SHARE_VM_GC_PARALLEL_MUTABLENUMASPACE_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/shared/mutableSpace.cpp b/hotspot/src/share/vm/gc/parallel/mutableSpace.cpp
similarity index 98%
rename from hotspot/src/share/vm/gc_implementation/shared/mutableSpace.cpp
rename to hotspot/src/share/vm/gc/parallel/mutableSpace.cpp
index a0884bf36a2..fedce2d8e36 100644
--- a/hotspot/src/share/vm/gc_implementation/shared/mutableSpace.cpp
+++ b/hotspot/src/share/vm/gc/parallel/mutableSpace.cpp
@@ -23,15 +23,13 @@
*/
#include "precompiled.hpp"
-#include "runtime/atomic.inline.hpp"
-#include "utilities/macros.hpp"
-#if INCLUDE_ALL_GCS
-#include "gc_implementation/shared/mutableSpace.hpp"
-#include "gc_implementation/shared/spaceDecorator.hpp"
+#include "gc/parallel/mutableSpace.hpp"
+#include "gc/shared/spaceDecorator.hpp"
#include "oops/oop.inline.hpp"
+#include "runtime/atomic.inline.hpp"
#include "runtime/safepoint.hpp"
#include "runtime/thread.hpp"
-#endif // INCLUDE_ALL_GCS
+#include "utilities/macros.hpp"
MutableSpace::MutableSpace(size_t alignment): ImmutableSpace(), _top(NULL), _alignment(alignment) {
assert(MutableSpace::alignment() % os::vm_page_size() == 0,
diff --git a/hotspot/src/share/vm/gc_implementation/shared/mutableSpace.hpp b/hotspot/src/share/vm/gc/parallel/mutableSpace.hpp
similarity index 95%
rename from hotspot/src/share/vm/gc_implementation/shared/mutableSpace.hpp
rename to hotspot/src/share/vm/gc/parallel/mutableSpace.hpp
index 09e3f316fca..8ab9804fe7b 100644
--- a/hotspot/src/share/vm/gc_implementation/shared/mutableSpace.hpp
+++ b/hotspot/src/share/vm/gc/parallel/mutableSpace.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,10 +22,10 @@
*
*/
-#ifndef SHARE_VM_GC_IMPLEMENTATION_SHARED_MUTABLESPACE_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_SHARED_MUTABLESPACE_HPP
+#ifndef SHARE_VM_GC_PARALLEL_MUTABLESPACE_HPP
+#define SHARE_VM_GC_PARALLEL_MUTABLESPACE_HPP
-#include "gc_implementation/shared/immutableSpace.hpp"
+#include "gc/parallel/immutableSpace.hpp"
#include "memory/memRegion.hpp"
#include "utilities/copy.hpp"
@@ -146,4 +146,4 @@ class MutableSpace: public ImmutableSpace {
virtual void verify();
};
-#endif // SHARE_VM_GC_IMPLEMENTATION_SHARED_MUTABLESPACE_HPP
+#endif // SHARE_VM_GC_PARALLEL_MUTABLESPACE_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/parallelScavenge/objectStartArray.cpp b/hotspot/src/share/vm/gc/parallel/objectStartArray.cpp
similarity index 96%
rename from hotspot/src/share/vm/gc_implementation/parallelScavenge/objectStartArray.cpp
rename to hotspot/src/share/vm/gc/parallel/objectStartArray.cpp
index d713519126c..6b599e6f521 100644
--- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/objectStartArray.cpp
+++ b/hotspot/src/share/vm/gc/parallel/objectStartArray.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -23,9 +23,9 @@
*/
#include "precompiled.hpp"
-#include "gc_implementation/parallelScavenge/objectStartArray.hpp"
+#include "gc/parallel/objectStartArray.hpp"
+#include "gc/shared/cardTableModRefBS.hpp"
#include "memory/allocation.inline.hpp"
-#include "memory/cardTableModRefBS.hpp"
#include "oops/oop.inline.hpp"
#include "runtime/java.hpp"
#include "services/memTracker.hpp"
diff --git a/hotspot/src/share/vm/gc_implementation/parallelScavenge/objectStartArray.hpp b/hotspot/src/share/vm/gc/parallel/objectStartArray.hpp
similarity index 94%
rename from hotspot/src/share/vm/gc_implementation/parallelScavenge/objectStartArray.hpp
rename to hotspot/src/share/vm/gc/parallel/objectStartArray.hpp
index da5a6dcbc6f..7cbb37eabf5 100644
--- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/objectStartArray.hpp
+++ b/hotspot/src/share/vm/gc/parallel/objectStartArray.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,10 +22,10 @@
*
*/
-#ifndef SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_OBJECTSTARTARRAY_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_OBJECTSTARTARRAY_HPP
+#ifndef SHARE_VM_GC_PARALLEL_OBJECTSTARTARRAY_HPP
+#define SHARE_VM_GC_PARALLEL_OBJECTSTARTARRAY_HPP
-#include "gc_implementation/parallelScavenge/psVirtualspace.hpp"
+#include "gc/parallel/psVirtualspace.hpp"
#include "memory/allocation.hpp"
#include "memory/memRegion.hpp"
#include "oops/oop.hpp"
@@ -173,4 +173,4 @@ class ObjectStartArray : public CHeapObj {
bool object_starts_in_range(HeapWord* start_addr, HeapWord* end_addr) const;
};
-#endif // SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_OBJECTSTARTARRAY_HPP
+#endif // SHARE_VM_GC_PARALLEL_OBJECTSTARTARRAY_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.cpp b/hotspot/src/share/vm/gc/parallel/parMarkBitMap.cpp
similarity index 97%
rename from hotspot/src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.cpp
rename to hotspot/src/share/vm/gc/parallel/parMarkBitMap.cpp
index 33e8f3f9b9c..0e6ec57b18c 100644
--- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.cpp
+++ b/hotspot/src/share/vm/gc/parallel/parMarkBitMap.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -23,13 +23,13 @@
*/
#include "precompiled.hpp"
-#include "gc_implementation/parallelScavenge/parMarkBitMap.hpp"
-#include "gc_implementation/parallelScavenge/psParallelCompact.hpp"
+#include "gc/parallel/parMarkBitMap.hpp"
+#include "gc/parallel/psParallelCompact.hpp"
#include "oops/oop.inline.hpp"
#include "runtime/atomic.inline.hpp"
#include "runtime/os.hpp"
-#include "utilities/bitMap.inline.hpp"
#include "services/memTracker.hpp"
+#include "utilities/bitMap.inline.hpp"
bool
ParMarkBitMap::initialize(MemRegion covered_region)
diff --git a/hotspot/src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.hpp b/hotspot/src/share/vm/gc/parallel/parMarkBitMap.hpp
similarity index 97%
rename from hotspot/src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.hpp
rename to hotspot/src/share/vm/gc/parallel/parMarkBitMap.hpp
index 8d0153d485d..be56e7ac7e3 100644
--- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.hpp
+++ b/hotspot/src/share/vm/gc/parallel/parMarkBitMap.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PARMARKBITMAP_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PARMARKBITMAP_HPP
+#ifndef SHARE_VM_GC_PARALLEL_PARMARKBITMAP_HPP
+#define SHARE_VM_GC_PARALLEL_PARMARKBITMAP_HPP
#include "memory/memRegion.hpp"
#include "oops/oop.hpp"
@@ -396,4 +396,4 @@ inline void ParMarkBitMap::verify_addr(HeapWord* addr) const {
}
#endif // #ifdef ASSERT
-#endif // SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PARMARKBITMAP_HPP
+#endif // SHARE_VM_GC_PARALLEL_PARMARKBITMAP_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.cpp b/hotspot/src/share/vm/gc/parallel/parallelScavengeHeap.cpp
similarity index 96%
rename from hotspot/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.cpp
rename to hotspot/src/share/vm/gc/parallel/parallelScavengeHeap.cpp
index 6f35768cfea..a1c94ad4b86 100644
--- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.cpp
+++ b/hotspot/src/share/vm/gc/parallel/parallelScavengeHeap.cpp
@@ -23,21 +23,21 @@
*/
#include "precompiled.hpp"
-#include "gc_implementation/parallelScavenge/adjoiningGenerations.hpp"
-#include "gc_implementation/parallelScavenge/adjoiningVirtualSpaces.hpp"
-#include "gc_implementation/parallelScavenge/cardTableExtension.hpp"
-#include "gc_implementation/parallelScavenge/gcTaskManager.hpp"
-#include "gc_implementation/parallelScavenge/generationSizer.hpp"
-#include "gc_implementation/parallelScavenge/parallelScavengeHeap.inline.hpp"
-#include "gc_implementation/parallelScavenge/psAdaptiveSizePolicy.hpp"
-#include "gc_implementation/parallelScavenge/psMarkSweep.hpp"
-#include "gc_implementation/parallelScavenge/psParallelCompact.hpp"
-#include "gc_implementation/parallelScavenge/psPromotionManager.hpp"
-#include "gc_implementation/parallelScavenge/psScavenge.hpp"
-#include "gc_implementation/parallelScavenge/vmPSOperations.hpp"
-#include "gc_implementation/shared/gcHeapSummary.hpp"
-#include "gc_implementation/shared/gcWhen.hpp"
-#include "memory/gcLocker.inline.hpp"
+#include "gc/parallel/adjoiningGenerations.hpp"
+#include "gc/parallel/adjoiningVirtualSpaces.hpp"
+#include "gc/parallel/cardTableExtension.hpp"
+#include "gc/parallel/gcTaskManager.hpp"
+#include "gc/parallel/generationSizer.hpp"
+#include "gc/parallel/parallelScavengeHeap.inline.hpp"
+#include "gc/parallel/psAdaptiveSizePolicy.hpp"
+#include "gc/parallel/psMarkSweep.hpp"
+#include "gc/parallel/psParallelCompact.hpp"
+#include "gc/parallel/psPromotionManager.hpp"
+#include "gc/parallel/psScavenge.hpp"
+#include "gc/parallel/vmPSOperations.hpp"
+#include "gc/shared/gcHeapSummary.hpp"
+#include "gc/shared/gcLocker.inline.hpp"
+#include "gc/shared/gcWhen.hpp"
#include "oops/oop.inline.hpp"
#include "runtime/handles.inline.hpp"
#include "runtime/java.hpp"
diff --git a/hotspot/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.hpp b/hotspot/src/share/vm/gc/parallel/parallelScavengeHeap.hpp
similarity index 91%
rename from hotspot/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.hpp
rename to hotspot/src/share/vm/gc/parallel/parallelScavengeHeap.hpp
index d8bb56ae0a1..b8e4879a801 100644
--- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.hpp
+++ b/hotspot/src/share/vm/gc/parallel/parallelScavengeHeap.hpp
@@ -22,19 +22,19 @@
*
*/
-#ifndef SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PARALLELSCAVENGEHEAP_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PARALLELSCAVENGEHEAP_HPP
+#ifndef SHARE_VM_GC_PARALLEL_PARALLELSCAVENGEHEAP_HPP
+#define SHARE_VM_GC_PARALLEL_PARALLELSCAVENGEHEAP_HPP
-#include "gc_implementation/parallelScavenge/generationSizer.hpp"
-#include "gc_implementation/parallelScavenge/objectStartArray.hpp"
-#include "gc_implementation/parallelScavenge/psGCAdaptivePolicyCounters.hpp"
-#include "gc_implementation/parallelScavenge/psOldGen.hpp"
-#include "gc_implementation/parallelScavenge/psYoungGen.hpp"
-#include "gc_implementation/shared/gcPolicyCounters.hpp"
-#include "gc_implementation/shared/gcWhen.hpp"
-#include "gc_interface/collectedHeap.hpp"
-#include "memory/collectorPolicy.hpp"
-#include "memory/strongRootsScope.hpp"
+#include "gc/parallel/generationSizer.hpp"
+#include "gc/parallel/objectStartArray.hpp"
+#include "gc/parallel/psGCAdaptivePolicyCounters.hpp"
+#include "gc/parallel/psOldGen.hpp"
+#include "gc/parallel/psYoungGen.hpp"
+#include "gc/shared/collectedHeap.hpp"
+#include "gc/shared/collectorPolicy.hpp"
+#include "gc/shared/gcPolicyCounters.hpp"
+#include "gc/shared/gcWhen.hpp"
+#include "gc/shared/strongRootsScope.hpp"
#include "utilities/ostream.hpp"
class AdjoiningGenerations;
@@ -241,4 +241,4 @@ class ParallelScavengeHeap : public CollectedHeap {
};
};
-#endif // SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PARALLELSCAVENGEHEAP_HPP
+#endif // SHARE_VM_GC_PARALLEL_PARALLELSCAVENGEHEAP_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.inline.hpp b/hotspot/src/share/vm/gc/parallel/parallelScavengeHeap.inline.hpp
similarity index 75%
rename from hotspot/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.inline.hpp
rename to hotspot/src/share/vm/gc/parallel/parallelScavengeHeap.inline.hpp
index 1c646fe3e1d..5d098a2c119 100644
--- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.inline.hpp
+++ b/hotspot/src/share/vm/gc/parallel/parallelScavengeHeap.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,13 +22,13 @@
*
*/
-#ifndef SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PARALLELSCAVENGEHEAP_INLINE_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PARALLELSCAVENGEHEAP_INLINE_HPP
+#ifndef SHARE_VM_GC_PARALLEL_PARALLELSCAVENGEHEAP_INLINE_HPP
+#define SHARE_VM_GC_PARALLEL_PARALLELSCAVENGEHEAP_INLINE_HPP
-#include "gc_implementation/parallelScavenge/parallelScavengeHeap.hpp"
-#include "gc_implementation/parallelScavenge/psMarkSweep.hpp"
-#include "gc_implementation/parallelScavenge/psParallelCompact.hpp"
-#include "gc_implementation/parallelScavenge/psScavenge.hpp"
+#include "gc/parallel/parallelScavengeHeap.hpp"
+#include "gc/parallel/psMarkSweep.hpp"
+#include "gc/parallel/psParallelCompact.hpp"
+#include "gc/parallel/psScavenge.hpp"
inline size_t ParallelScavengeHeap::total_invocations()
{
@@ -55,4 +55,4 @@ inline bool ParallelScavengeHeap::is_in_young(oop p) {
err_msg("incorrect test - result=%d, p=" PTR_FORMAT, result, p2i((void*)p)));
return result;
}
-#endif // SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PARALLELSCAVENGEHEAP_INLINE_HPP
+#endif // SHARE_VM_GC_PARALLEL_PARALLELSCAVENGEHEAP_INLINE_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/parallelScavenge/pcTasks.cpp b/hotspot/src/share/vm/gc/parallel/pcTasks.cpp
similarity index 96%
rename from hotspot/src/share/vm/gc_implementation/parallelScavenge/pcTasks.cpp
rename to hotspot/src/share/vm/gc/parallel/pcTasks.cpp
index bb1caa063fb..1e8fbd4f4af 100644
--- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/pcTasks.cpp
+++ b/hotspot/src/share/vm/gc/parallel/pcTasks.cpp
@@ -25,13 +25,13 @@
#include "precompiled.hpp"
#include "classfile/systemDictionary.hpp"
#include "code/codeCache.hpp"
-#include "gc_implementation/parallelScavenge/parallelScavengeHeap.hpp"
-#include "gc_implementation/parallelScavenge/pcTasks.hpp"
-#include "gc_implementation/parallelScavenge/psCompactionManager.inline.hpp"
-#include "gc_implementation/parallelScavenge/psParallelCompact.hpp"
-#include "gc_implementation/shared/gcTimer.hpp"
-#include "gc_implementation/shared/gcTraceTime.hpp"
-#include "gc_interface/collectedHeap.hpp"
+#include "gc/parallel/parallelScavengeHeap.hpp"
+#include "gc/parallel/pcTasks.hpp"
+#include "gc/parallel/psCompactionManager.inline.hpp"
+#include "gc/parallel/psParallelCompact.hpp"
+#include "gc/shared/collectedHeap.hpp"
+#include "gc/shared/gcTimer.hpp"
+#include "gc/shared/gcTraceTime.hpp"
#include "memory/universe.hpp"
#include "oops/objArrayKlass.inline.hpp"
#include "oops/oop.inline.hpp"
diff --git a/hotspot/src/share/vm/gc_implementation/parallelScavenge/pcTasks.hpp b/hotspot/src/share/vm/gc/parallel/pcTasks.hpp
similarity index 94%
rename from hotspot/src/share/vm/gc_implementation/parallelScavenge/pcTasks.hpp
rename to hotspot/src/share/vm/gc/parallel/pcTasks.hpp
index 40e7fb9d3db..40a2009a2c5 100644
--- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/pcTasks.hpp
+++ b/hotspot/src/share/vm/gc/parallel/pcTasks.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,12 +22,12 @@
*
*/
-#ifndef SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PCTASKS_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PCTASKS_HPP
+#ifndef SHARE_VM_GC_PARALLEL_PCTASKS_HPP
+#define SHARE_VM_GC_PARALLEL_PCTASKS_HPP
-#include "gc_implementation/parallelScavenge/gcTaskManager.hpp"
-#include "gc_implementation/parallelScavenge/psParallelCompact.hpp"
-#include "gc_implementation/parallelScavenge/psTasks.hpp"
+#include "gc/parallel/gcTaskManager.hpp"
+#include "gc/parallel/psParallelCompact.hpp"
+#include "gc/parallel/psTasks.hpp"
// Tasks for parallel compaction of the old generation
@@ -257,4 +257,4 @@ class DrainStacksCompactionTask : public GCTask {
virtual void do_it(GCTaskManager* manager, uint which);
};
-#endif // SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PCTASKS_HPP
+#endif // SHARE_VM_GC_PARALLEL_PCTASKS_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psAdaptiveSizePolicy.cpp b/hotspot/src/share/vm/gc/parallel/psAdaptiveSizePolicy.cpp
similarity index 99%
rename from hotspot/src/share/vm/gc_implementation/parallelScavenge/psAdaptiveSizePolicy.cpp
rename to hotspot/src/share/vm/gc/parallel/psAdaptiveSizePolicy.cpp
index bf979b9e420..2992f8d22dc 100644
--- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psAdaptiveSizePolicy.cpp
+++ b/hotspot/src/share/vm/gc/parallel/psAdaptiveSizePolicy.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -23,13 +23,13 @@
*/
#include "precompiled.hpp"
-#include "gc_implementation/parallelScavenge/parallelScavengeHeap.hpp"
-#include "gc_implementation/parallelScavenge/psAdaptiveSizePolicy.hpp"
-#include "gc_implementation/parallelScavenge/psGCAdaptivePolicyCounters.hpp"
-#include "gc_implementation/parallelScavenge/psScavenge.hpp"
-#include "gc_implementation/shared/gcPolicyCounters.hpp"
-#include "gc_interface/gcCause.hpp"
-#include "memory/collectorPolicy.hpp"
+#include "gc/parallel/parallelScavengeHeap.hpp"
+#include "gc/parallel/psAdaptiveSizePolicy.hpp"
+#include "gc/parallel/psGCAdaptivePolicyCounters.hpp"
+#include "gc/parallel/psScavenge.hpp"
+#include "gc/shared/collectorPolicy.hpp"
+#include "gc/shared/gcCause.hpp"
+#include "gc/shared/gcPolicyCounters.hpp"
#include "runtime/timer.hpp"
#include "utilities/top.hpp"
diff --git a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psAdaptiveSizePolicy.hpp b/hotspot/src/share/vm/gc/parallel/psAdaptiveSizePolicy.hpp
similarity index 96%
rename from hotspot/src/share/vm/gc_implementation/parallelScavenge/psAdaptiveSizePolicy.hpp
rename to hotspot/src/share/vm/gc/parallel/psAdaptiveSizePolicy.hpp
index 24f0ed473b9..696ec8868cf 100644
--- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psAdaptiveSizePolicy.hpp
+++ b/hotspot/src/share/vm/gc/parallel/psAdaptiveSizePolicy.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,13 +22,13 @@
*
*/
-#ifndef SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PSADAPTIVESIZEPOLICY_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PSADAPTIVESIZEPOLICY_HPP
+#ifndef SHARE_VM_GC_PARALLEL_PSADAPTIVESIZEPOLICY_HPP
+#define SHARE_VM_GC_PARALLEL_PSADAPTIVESIZEPOLICY_HPP
-#include "gc_implementation/shared/adaptiveSizePolicy.hpp"
-#include "gc_implementation/shared/gcStats.hpp"
-#include "gc_implementation/shared/gcUtil.hpp"
-#include "gc_interface/gcCause.hpp"
+#include "gc/shared/adaptiveSizePolicy.hpp"
+#include "gc/shared/gcCause.hpp"
+#include "gc/shared/gcStats.hpp"
+#include "gc/shared/gcUtil.hpp"
// This class keeps statistical information and computes the
// optimal free space for both the young and old generation
@@ -405,4 +405,4 @@ class PSAdaptiveSizePolicy : public AdaptiveSizePolicy {
void decay_supplemental_growth(bool is_full_gc);
};
-#endif // SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PSADAPTIVESIZEPOLICY_HPP
+#endif // SHARE_VM_GC_PARALLEL_PSADAPTIVESIZEPOLICY_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psCompactionManager.cpp b/hotspot/src/share/vm/gc/parallel/psCompactionManager.cpp
similarity index 95%
rename from hotspot/src/share/vm/gc_implementation/parallelScavenge/psCompactionManager.cpp
rename to hotspot/src/share/vm/gc/parallel/psCompactionManager.cpp
index 2351e4d9444..c828caa7265 100644
--- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psCompactionManager.cpp
+++ b/hotspot/src/share/vm/gc/parallel/psCompactionManager.cpp
@@ -24,20 +24,20 @@
#include "precompiled.hpp"
#include "classfile/systemDictionary.hpp"
-#include "gc_implementation/parallelScavenge/gcTaskManager.hpp"
-#include "gc_implementation/parallelScavenge/objectStartArray.hpp"
-#include "gc_implementation/parallelScavenge/parMarkBitMap.hpp"
-#include "gc_implementation/parallelScavenge/parallelScavengeHeap.hpp"
-#include "gc_implementation/parallelScavenge/psCompactionManager.inline.hpp"
-#include "gc_implementation/parallelScavenge/psOldGen.hpp"
-#include "gc_implementation/parallelScavenge/psParallelCompact.inline.hpp"
+#include "gc/parallel/gcTaskManager.hpp"
+#include "gc/parallel/objectStartArray.hpp"
+#include "gc/parallel/parMarkBitMap.hpp"
+#include "gc/parallel/parallelScavengeHeap.hpp"
+#include "gc/parallel/psCompactionManager.inline.hpp"
+#include "gc/parallel/psOldGen.hpp"
+#include "gc/parallel/psParallelCompact.inline.hpp"
+#include "gc/shared/taskqueue.inline.hpp"
#include "memory/iterator.inline.hpp"
#include "oops/instanceKlass.inline.hpp"
#include "oops/instanceMirrorKlass.inline.hpp"
#include "oops/objArrayKlass.inline.hpp"
#include "oops/oop.inline.hpp"
#include "runtime/atomic.inline.hpp"
-#include "utilities/taskqueue.inline.hpp"
PSOldGen* ParCompactionManager::_old_gen = NULL;
ParCompactionManager** ParCompactionManager::_manager_array = NULL;
diff --git a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psCompactionManager.hpp b/hotspot/src/share/vm/gc/parallel/psCompactionManager.hpp
similarity index 96%
rename from hotspot/src/share/vm/gc_implementation/parallelScavenge/psCompactionManager.hpp
rename to hotspot/src/share/vm/gc/parallel/psCompactionManager.hpp
index 45cd344571b..5cdbe19d913 100644
--- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psCompactionManager.hpp
+++ b/hotspot/src/share/vm/gc/parallel/psCompactionManager.hpp
@@ -22,12 +22,12 @@
*
*/
-#ifndef SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PSCOMPACTIONMANAGER_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PSCOMPACTIONMANAGER_HPP
+#ifndef SHARE_VM_GC_PARALLEL_PSCOMPACTIONMANAGER_HPP
+#define SHARE_VM_GC_PARALLEL_PSCOMPACTIONMANAGER_HPP
+#include "gc/shared/taskqueue.hpp"
#include "memory/allocation.hpp"
#include "utilities/stack.hpp"
-#include "utilities/taskqueue.hpp"
class MutableSpace;
class PSOldGen;
@@ -240,4 +240,4 @@ bool ParCompactionManager::marking_stacks_empty() const {
return _marking_stack.is_empty() && _objarray_stack.is_empty();
}
-#endif // SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PSCOMPACTIONMANAGER_HPP
+#endif // SHARE_VM_GC_PARALLEL_PSCOMPACTIONMANAGER_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psCompactionManager.inline.hpp b/hotspot/src/share/vm/gc/parallel/psCompactionManager.inline.hpp
similarity index 90%
rename from hotspot/src/share/vm/gc_implementation/parallelScavenge/psCompactionManager.inline.hpp
rename to hotspot/src/share/vm/gc/parallel/psCompactionManager.inline.hpp
index f1f4a570e11..7ba99f95ede 100644
--- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psCompactionManager.inline.hpp
+++ b/hotspot/src/share/vm/gc/parallel/psCompactionManager.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2015 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,16 +22,16 @@
*
*/
-#ifndef SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PSCOMPACTIONMANAGER_INLINE_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PSCOMPACTIONMANAGER_INLINE_HPP
+#ifndef SHARE_VM_GC_PARALLEL_PSCOMPACTIONMANAGER_INLINE_HPP
+#define SHARE_VM_GC_PARALLEL_PSCOMPACTIONMANAGER_INLINE_HPP
-#include "gc_implementation/parallelScavenge/psCompactionManager.hpp"
-#include "gc_implementation/parallelScavenge/psParallelCompact.inline.hpp"
+#include "gc/parallel/psCompactionManager.hpp"
+#include "gc/parallel/psParallelCompact.inline.hpp"
+#include "gc/shared/taskqueue.inline.hpp"
#include "oops/objArrayOop.hpp"
#include "oops/oop.inline.hpp"
#include "utilities/debug.hpp"
#include "utilities/globalDefinitions.hpp"
-#include "utilities/taskqueue.inline.hpp"
inline bool ParCompactionManager::steal(int queue_num, int* seed, oop& t) {
return stack_array()->steal(queue_num, seed, t);
@@ -147,4 +147,4 @@ inline void ParCompactionManager::update_contents(oop obj) {
obj->pc_update_contents();
}
-#endif // SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PSCOMPACTIONMANAGER_INLINE_HPP
+#endif // SHARE_VM_GC_PARALLEL_PSCOMPACTIONMANAGER_INLINE_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psGCAdaptivePolicyCounters.cpp b/hotspot/src/share/vm/gc/parallel/psGCAdaptivePolicyCounters.cpp
similarity index 98%
rename from hotspot/src/share/vm/gc_implementation/parallelScavenge/psGCAdaptivePolicyCounters.cpp
rename to hotspot/src/share/vm/gc/parallel/psGCAdaptivePolicyCounters.cpp
index 7e5bc9aab9a..f9a108de985 100644
--- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psGCAdaptivePolicyCounters.cpp
+++ b/hotspot/src/share/vm/gc/parallel/psGCAdaptivePolicyCounters.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
*/
#include "precompiled.hpp"
-#include "gc_implementation/parallelScavenge/psGCAdaptivePolicyCounters.hpp"
+#include "gc/parallel/psGCAdaptivePolicyCounters.hpp"
#include "memory/resourceArea.hpp"
#include "runtime/arguments.hpp"
diff --git a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psGCAdaptivePolicyCounters.hpp b/hotspot/src/share/vm/gc/parallel/psGCAdaptivePolicyCounters.hpp
similarity index 93%
rename from hotspot/src/share/vm/gc_implementation/parallelScavenge/psGCAdaptivePolicyCounters.hpp
rename to hotspot/src/share/vm/gc/parallel/psGCAdaptivePolicyCounters.hpp
index 4c8bd4a7fd7..7a56f0c389c 100644
--- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psGCAdaptivePolicyCounters.hpp
+++ b/hotspot/src/share/vm/gc/parallel/psGCAdaptivePolicyCounters.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,12 +22,12 @@
*
*/
-#ifndef SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PSGCADAPTIVEPOLICYCOUNTERS_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PSGCADAPTIVEPOLICYCOUNTERS_HPP
+#ifndef SHARE_VM_GC_PARALLEL_PSGCADAPTIVEPOLICYCOUNTERS_HPP
+#define SHARE_VM_GC_PARALLEL_PSGCADAPTIVEPOLICYCOUNTERS_HPP
-#include "gc_implementation/parallelScavenge/psAdaptiveSizePolicy.hpp"
-#include "gc_implementation/shared/gcAdaptivePolicyCounters.hpp"
-#include "gc_implementation/shared/gcPolicyCounters.hpp"
+#include "gc/parallel/gcAdaptivePolicyCounters.hpp"
+#include "gc/parallel/psAdaptiveSizePolicy.hpp"
+#include "gc/shared/gcPolicyCounters.hpp"
// PSGCAdaptivePolicyCounters is a holder class for performance counters
// that track the data and decisions for the ergonomics policy for the
@@ -208,4 +208,4 @@ class PSGCAdaptivePolicyCounters : public GCAdaptivePolicyCounters {
}
};
-#endif // SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PSGCADAPTIVEPOLICYCOUNTERS_HPP
+#endif // SHARE_VM_GC_PARALLEL_PSGCADAPTIVEPOLICYCOUNTERS_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psGenerationCounters.cpp b/hotspot/src/share/vm/gc/parallel/psGenerationCounters.cpp
similarity index 94%
rename from hotspot/src/share/vm/gc_implementation/parallelScavenge/psGenerationCounters.cpp
rename to hotspot/src/share/vm/gc/parallel/psGenerationCounters.cpp
index 8e9b2a594ab..d200258acdf 100644
--- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psGenerationCounters.cpp
+++ b/hotspot/src/share/vm/gc/parallel/psGenerationCounters.cpp
@@ -1,6 +1,6 @@
/*
- * Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -24,7 +24,7 @@
*/
#include "precompiled.hpp"
-#include "gc_implementation/parallelScavenge/psGenerationCounters.hpp"
+#include "gc/parallel/psGenerationCounters.hpp"
#include "memory/resourceArea.hpp"
diff --git a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psGenerationCounters.hpp b/hotspot/src/share/vm/gc/parallel/psGenerationCounters.hpp
similarity index 79%
rename from hotspot/src/share/vm/gc_implementation/parallelScavenge/psGenerationCounters.hpp
rename to hotspot/src/share/vm/gc/parallel/psGenerationCounters.hpp
index 7028f1b1986..67d506857f3 100644
--- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psGenerationCounters.hpp
+++ b/hotspot/src/share/vm/gc/parallel/psGenerationCounters.hpp
@@ -1,6 +1,6 @@
/*
- * Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -23,11 +23,11 @@
*
*/
-#ifndef SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PSGENERATIONCOUNTERS_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PSGENERATIONCOUNTERS_HPP
+#ifndef SHARE_VM_GC_PARALLEL_PSGENERATIONCOUNTERS_HPP
+#define SHARE_VM_GC_PARALLEL_PSGENERATIONCOUNTERS_HPP
-#include "gc_implementation/parallelScavenge/psVirtualspace.hpp"
-#include "gc_implementation/shared/generationCounters.hpp"
+#include "gc/parallel/psVirtualspace.hpp"
+#include "gc/shared/generationCounters.hpp"
#include "runtime/perfData.hpp"
// A PSGenerationCounter is a holder class for performance counters
@@ -49,4 +49,4 @@ class PSGenerationCounters: public GenerationCounters {
}
};
-#endif // SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PSGENERATIONCOUNTERS_HPP
+#endif // SHARE_VM_GC_PARALLEL_PSGENERATIONCOUNTERS_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.cpp b/hotspot/src/share/vm/gc/parallel/psMarkSweep.cpp
similarity index 96%
rename from hotspot/src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.cpp
rename to hotspot/src/share/vm/gc/parallel/psMarkSweep.cpp
index d676ddec86e..cc8b33e064d 100644
--- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.cpp
+++ b/hotspot/src/share/vm/gc/parallel/psMarkSweep.cpp
@@ -26,24 +26,24 @@
#include "classfile/stringTable.hpp"
#include "classfile/systemDictionary.hpp"
#include "code/codeCache.hpp"
-#include "gc_implementation/parallelScavenge/parallelScavengeHeap.hpp"
-#include "gc_implementation/parallelScavenge/psAdaptiveSizePolicy.hpp"
-#include "gc_implementation/parallelScavenge/psMarkSweep.hpp"
-#include "gc_implementation/parallelScavenge/psMarkSweepDecorator.hpp"
-#include "gc_implementation/parallelScavenge/psOldGen.hpp"
-#include "gc_implementation/parallelScavenge/psScavenge.hpp"
-#include "gc_implementation/parallelScavenge/psYoungGen.hpp"
-#include "gc_implementation/shared/gcHeapSummary.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_implementation/shared/markSweep.hpp"
-#include "gc_implementation/shared/spaceDecorator.hpp"
-#include "gc_interface/gcCause.hpp"
-#include "memory/gcLocker.inline.hpp"
-#include "memory/referencePolicy.hpp"
-#include "memory/referenceProcessor.hpp"
+#include "gc/parallel/parallelScavengeHeap.hpp"
+#include "gc/parallel/psAdaptiveSizePolicy.hpp"
+#include "gc/parallel/psMarkSweep.hpp"
+#include "gc/parallel/psMarkSweepDecorator.hpp"
+#include "gc/parallel/psOldGen.hpp"
+#include "gc/parallel/psScavenge.hpp"
+#include "gc/parallel/psYoungGen.hpp"
+#include "gc/serial/markSweep.hpp"
+#include "gc/shared/gcCause.hpp"
+#include "gc/shared/gcHeapSummary.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/isGCActiveMark.hpp"
+#include "gc/shared/referencePolicy.hpp"
+#include "gc/shared/referenceProcessor.hpp"
+#include "gc/shared/spaceDecorator.hpp"
#include "oops/oop.inline.hpp"
#include "runtime/biasedLocking.hpp"
#include "runtime/fprofiler.hpp"
diff --git a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.hpp b/hotspot/src/share/vm/gc/parallel/psMarkSweep.hpp
similarity index 90%
rename from hotspot/src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.hpp
rename to hotspot/src/share/vm/gc/parallel/psMarkSweep.hpp
index 2c97a150cb0..f23512c1e26 100644
--- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.hpp
+++ b/hotspot/src/share/vm/gc/parallel/psMarkSweep.hpp
@@ -22,11 +22,11 @@
*
*/
-#ifndef SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PSMARKSWEEP_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PSMARKSWEEP_HPP
+#ifndef SHARE_VM_GC_PARALLEL_PSMARKSWEEP_HPP
+#define SHARE_VM_GC_PARALLEL_PSMARKSWEEP_HPP
-#include "gc_implementation/shared/collectorCounters.hpp"
-#include "gc_implementation/shared/markSweep.hpp"
+#include "gc/serial/markSweep.hpp"
+#include "gc/shared/collectorCounters.hpp"
#include "utilities/stack.hpp"
class PSAdaptiveSizePolicy;
@@ -83,4 +83,4 @@ class PSMarkSweep : public MarkSweep {
static jlong millis_since_last_gc();
};
-#endif // SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PSMARKSWEEP_HPP
+#endif // SHARE_VM_GC_PARALLEL_PSMARKSWEEP_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psMarkSweepDecorator.cpp b/hotspot/src/share/vm/gc/parallel/psMarkSweepDecorator.cpp
similarity index 97%
rename from hotspot/src/share/vm/gc_implementation/parallelScavenge/psMarkSweepDecorator.cpp
rename to hotspot/src/share/vm/gc/parallel/psMarkSweepDecorator.cpp
index e1231c2999a..74a1f3e639c 100644
--- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psMarkSweepDecorator.cpp
+++ b/hotspot/src/share/vm/gc/parallel/psMarkSweepDecorator.cpp
@@ -24,13 +24,13 @@
#include "precompiled.hpp"
#include "classfile/systemDictionary.hpp"
-#include "gc_implementation/parallelScavenge/objectStartArray.hpp"
-#include "gc_implementation/parallelScavenge/parallelScavengeHeap.hpp"
-#include "gc_implementation/parallelScavenge/psMarkSweep.hpp"
-#include "gc_implementation/parallelScavenge/psMarkSweepDecorator.hpp"
-#include "gc_implementation/shared/liveRange.hpp"
-#include "gc_implementation/shared/markSweep.inline.hpp"
-#include "gc_implementation/shared/spaceDecorator.hpp"
+#include "gc/parallel/objectStartArray.hpp"
+#include "gc/parallel/parallelScavengeHeap.hpp"
+#include "gc/parallel/psMarkSweep.hpp"
+#include "gc/parallel/psMarkSweepDecorator.hpp"
+#include "gc/serial/markSweep.inline.hpp"
+#include "gc/shared/liveRange.hpp"
+#include "gc/shared/spaceDecorator.hpp"
#include "oops/oop.inline.hpp"
#include "runtime/prefetch.inline.hpp"
diff --git a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psMarkSweepDecorator.hpp b/hotspot/src/share/vm/gc/parallel/psMarkSweepDecorator.hpp
similarity index 88%
rename from hotspot/src/share/vm/gc_implementation/parallelScavenge/psMarkSweepDecorator.hpp
rename to hotspot/src/share/vm/gc/parallel/psMarkSweepDecorator.hpp
index 285599f2538..126f3d976af 100644
--- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psMarkSweepDecorator.hpp
+++ b/hotspot/src/share/vm/gc/parallel/psMarkSweepDecorator.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,10 +22,10 @@
*
*/
-#ifndef SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PSMARKSWEEPDECORATOR_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PSMARKSWEEPDECORATOR_HPP
+#ifndef SHARE_VM_GC_PARALLEL_PSMARKSWEEPDECORATOR_HPP
+#define SHARE_VM_GC_PARALLEL_PSMARKSWEEPDECORATOR_HPP
-#include "gc_implementation/shared/mutableSpace.hpp"
+#include "gc/parallel/mutableSpace.hpp"
//
// A PSMarkSweepDecorator is used to add "ParallelScavenge" style mark sweep operations
@@ -78,4 +78,4 @@ class PSMarkSweepDecorator: public CHeapObj {
void compact(bool mangle_free_space);
};
-#endif // SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PSMARKSWEEPDECORATOR_HPP
+#endif // SHARE_VM_GC_PARALLEL_PSMARKSWEEPDECORATOR_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psOldGen.cpp b/hotspot/src/share/vm/gc/parallel/psOldGen.cpp
similarity index 97%
rename from hotspot/src/share/vm/gc_implementation/parallelScavenge/psOldGen.cpp
rename to hotspot/src/share/vm/gc/parallel/psOldGen.cpp
index 35c2ff91848..5041780fb5b 100644
--- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psOldGen.cpp
+++ b/hotspot/src/share/vm/gc/parallel/psOldGen.cpp
@@ -23,13 +23,13 @@
*/
#include "precompiled.hpp"
-#include "gc_implementation/parallelScavenge/parallelScavengeHeap.hpp"
-#include "gc_implementation/parallelScavenge/psAdaptiveSizePolicy.hpp"
-#include "gc_implementation/parallelScavenge/psMarkSweepDecorator.hpp"
-#include "gc_implementation/parallelScavenge/psOldGen.hpp"
-#include "gc_implementation/shared/spaceDecorator.hpp"
-#include "memory/cardTableModRefBS.hpp"
-#include "memory/gcLocker.inline.hpp"
+#include "gc/parallel/parallelScavengeHeap.hpp"
+#include "gc/parallel/psAdaptiveSizePolicy.hpp"
+#include "gc/parallel/psMarkSweepDecorator.hpp"
+#include "gc/parallel/psOldGen.hpp"
+#include "gc/shared/cardTableModRefBS.hpp"
+#include "gc/shared/gcLocker.inline.hpp"
+#include "gc/shared/spaceDecorator.hpp"
#include "oops/oop.inline.hpp"
#include "runtime/java.hpp"
diff --git a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psOldGen.hpp b/hotspot/src/share/vm/gc/parallel/psOldGen.hpp
similarity index 94%
rename from hotspot/src/share/vm/gc_implementation/parallelScavenge/psOldGen.hpp
rename to hotspot/src/share/vm/gc/parallel/psOldGen.hpp
index 9322672680d..f5af1592727 100644
--- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psOldGen.hpp
+++ b/hotspot/src/share/vm/gc/parallel/psOldGen.hpp
@@ -22,14 +22,14 @@
*
*/
-#ifndef SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PSOLDGEN_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PSOLDGEN_HPP
+#ifndef SHARE_VM_GC_PARALLEL_PSOLDGEN_HPP
+#define SHARE_VM_GC_PARALLEL_PSOLDGEN_HPP
-#include "gc_implementation/parallelScavenge/objectStartArray.hpp"
-#include "gc_implementation/parallelScavenge/psGenerationCounters.hpp"
-#include "gc_implementation/parallelScavenge/psVirtualspace.hpp"
-#include "gc_implementation/shared/mutableSpace.hpp"
-#include "gc_implementation/shared/spaceCounters.hpp"
+#include "gc/parallel/mutableSpace.hpp"
+#include "gc/parallel/objectStartArray.hpp"
+#include "gc/parallel/psGenerationCounters.hpp"
+#include "gc/parallel/psVirtualspace.hpp"
+#include "gc/parallel/spaceCounters.hpp"
#include "runtime/safepoint.hpp"
class PSMarkSweepDecorator;
@@ -217,4 +217,4 @@ class PSOldGen : public CHeapObj {
void record_spaces_top() PRODUCT_RETURN;
};
-#endif // SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PSOLDGEN_HPP
+#endif // SHARE_VM_GC_PARALLEL_PSOLDGEN_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp b/hotspot/src/share/vm/gc/parallel/psParallelCompact.cpp
similarity index 99%
rename from hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp
rename to hotspot/src/share/vm/gc/parallel/psParallelCompact.cpp
index bba6c1fd340..b928f956e24 100644
--- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp
+++ b/hotspot/src/share/vm/gc/parallel/psParallelCompact.cpp
@@ -26,28 +26,28 @@
#include "classfile/stringTable.hpp"
#include "classfile/systemDictionary.hpp"
#include "code/codeCache.hpp"
-#include "gc_implementation/parallelScavenge/gcTaskManager.hpp"
-#include "gc_implementation/parallelScavenge/parallelScavengeHeap.inline.hpp"
-#include "gc_implementation/parallelScavenge/pcTasks.hpp"
-#include "gc_implementation/parallelScavenge/psAdaptiveSizePolicy.hpp"
-#include "gc_implementation/parallelScavenge/psCompactionManager.inline.hpp"
-#include "gc_implementation/parallelScavenge/psMarkSweep.hpp"
-#include "gc_implementation/parallelScavenge/psMarkSweepDecorator.hpp"
-#include "gc_implementation/parallelScavenge/psOldGen.hpp"
-#include "gc_implementation/parallelScavenge/psParallelCompact.inline.hpp"
-#include "gc_implementation/parallelScavenge/psPromotionManager.inline.hpp"
-#include "gc_implementation/parallelScavenge/psScavenge.hpp"
-#include "gc_implementation/parallelScavenge/psYoungGen.hpp"
-#include "gc_implementation/shared/gcHeapSummary.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_implementation/shared/spaceDecorator.hpp"
-#include "gc_interface/gcCause.hpp"
-#include "memory/gcLocker.inline.hpp"
-#include "memory/referencePolicy.hpp"
-#include "memory/referenceProcessor.hpp"
+#include "gc/parallel/gcTaskManager.hpp"
+#include "gc/parallel/parallelScavengeHeap.inline.hpp"
+#include "gc/parallel/pcTasks.hpp"
+#include "gc/parallel/psAdaptiveSizePolicy.hpp"
+#include "gc/parallel/psCompactionManager.inline.hpp"
+#include "gc/parallel/psMarkSweep.hpp"
+#include "gc/parallel/psMarkSweepDecorator.hpp"
+#include "gc/parallel/psOldGen.hpp"
+#include "gc/parallel/psParallelCompact.inline.hpp"
+#include "gc/parallel/psPromotionManager.inline.hpp"
+#include "gc/parallel/psScavenge.hpp"
+#include "gc/parallel/psYoungGen.hpp"
+#include "gc/shared/gcCause.hpp"
+#include "gc/shared/gcHeapSummary.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/isGCActiveMark.hpp"
+#include "gc/shared/referencePolicy.hpp"
+#include "gc/shared/referenceProcessor.hpp"
+#include "gc/shared/spaceDecorator.hpp"
#include "oops/instanceKlass.inline.hpp"
#include "oops/instanceMirrorKlass.inline.hpp"
#include "oops/methodData.hpp"
@@ -58,8 +58,8 @@
#include "runtime/safepoint.hpp"
#include "runtime/vmThread.hpp"
#include "services/management.hpp"
-#include "services/memoryService.hpp"
#include "services/memTracker.hpp"
+#include "services/memoryService.hpp"
#include "utilities/events.hpp"
#include "utilities/stack.inline.hpp"
diff --git a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.hpp b/hotspot/src/share/vm/gc/parallel/psParallelCompact.hpp
similarity index 98%
rename from hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.hpp
rename to hotspot/src/share/vm/gc/parallel/psParallelCompact.hpp
index 8530bb07091..44641a30b37 100644
--- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.hpp
+++ b/hotspot/src/share/vm/gc/parallel/psParallelCompact.hpp
@@ -22,15 +22,15 @@
*
*/
-#ifndef SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PSPARALLELCOMPACT_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PSPARALLELCOMPACT_HPP
+#ifndef SHARE_VM_GC_PARALLEL_PSPARALLELCOMPACT_HPP
+#define SHARE_VM_GC_PARALLEL_PSPARALLELCOMPACT_HPP
-#include "gc_implementation/parallelScavenge/objectStartArray.hpp"
-#include "gc_implementation/parallelScavenge/parallelScavengeHeap.hpp"
-#include "gc_implementation/parallelScavenge/parMarkBitMap.hpp"
-#include "gc_implementation/shared/collectorCounters.hpp"
-#include "gc_implementation/shared/mutableSpace.hpp"
-#include "gc_interface/collectedHeap.hpp"
+#include "gc/parallel/mutableSpace.hpp"
+#include "gc/parallel/objectStartArray.hpp"
+#include "gc/parallel/parMarkBitMap.hpp"
+#include "gc/parallel/parallelScavengeHeap.hpp"
+#include "gc/shared/collectedHeap.hpp"
+#include "gc/shared/collectorCounters.hpp"
#include "oops/oop.hpp"
class ParallelScavengeHeap;
@@ -1435,4 +1435,4 @@ private:
ObjectStartArray* const _start_array;
};
-#endif // SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PSPARALLELCOMPACT_HPP
+#endif // SHARE_VM_GC_PARALLEL_PSPARALLELCOMPACT_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.inline.hpp b/hotspot/src/share/vm/gc/parallel/psParallelCompact.inline.hpp
similarity index 83%
rename from hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.inline.hpp
rename to hotspot/src/share/vm/gc/parallel/psParallelCompact.inline.hpp
index 5a18e1712a3..43063fd154e 100644
--- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.inline.hpp
+++ b/hotspot/src/share/vm/gc/parallel/psParallelCompact.inline.hpp
@@ -22,12 +22,12 @@
*
*/
-#ifndef SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PSPARALLELCOMPACT_INLINE_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PSPARALLELCOMPACT_INLINE_HPP
+#ifndef SHARE_VM_GC_PARALLEL_PSPARALLELCOMPACT_INLINE_HPP
+#define SHARE_VM_GC_PARALLEL_PSPARALLELCOMPACT_INLINE_HPP
-#include "gc_implementation/parallelScavenge/parallelScavengeHeap.hpp"
-#include "gc_implementation/parallelScavenge/psParallelCompact.hpp"
-#include "gc_interface/collectedHeap.hpp"
+#include "gc/parallel/parallelScavengeHeap.hpp"
+#include "gc/parallel/psParallelCompact.hpp"
+#include "gc/shared/collectedHeap.hpp"
#include "oops/klass.hpp"
#include "oops/oop.inline.hpp"
@@ -58,4 +58,4 @@ void PSParallelCompact::AdjustPointerClosure::do_oop_nv(T* p) {
inline void PSParallelCompact::AdjustPointerClosure::do_oop(oop* p) { do_oop_nv(p); }
inline void PSParallelCompact::AdjustPointerClosure::do_oop(narrowOop* p) { do_oop_nv(p); }
-#endif // SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PSPARALLELCOMPACT_INLINE_HPP
+#endif // SHARE_VM_GC_PARALLEL_PSPARALLELCOMPACT_INLINE_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPromotionLAB.cpp b/hotspot/src/share/vm/gc/parallel/psPromotionLAB.cpp
similarity index 96%
rename from hotspot/src/share/vm/gc_implementation/parallelScavenge/psPromotionLAB.cpp
rename to hotspot/src/share/vm/gc/parallel/psPromotionLAB.cpp
index 6786be2146a..1bade48ff57 100644
--- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPromotionLAB.cpp
+++ b/hotspot/src/share/vm/gc/parallel/psPromotionLAB.cpp
@@ -23,9 +23,9 @@
*/
#include "precompiled.hpp"
-#include "gc_implementation/parallelScavenge/parallelScavengeHeap.hpp"
-#include "gc_implementation/parallelScavenge/psPromotionLAB.hpp"
-#include "gc_implementation/shared/mutableSpace.hpp"
+#include "gc/parallel/mutableSpace.hpp"
+#include "gc/parallel/parallelScavengeHeap.hpp"
+#include "gc/parallel/psPromotionLAB.hpp"
#include "oops/oop.inline.hpp"
size_t PSPromotionLAB::filler_header_size;
diff --git a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPromotionLAB.hpp b/hotspot/src/share/vm/gc/parallel/psPromotionLAB.hpp
similarity index 92%
rename from hotspot/src/share/vm/gc_implementation/parallelScavenge/psPromotionLAB.hpp
rename to hotspot/src/share/vm/gc/parallel/psPromotionLAB.hpp
index c214a13a0dd..ec65f644026 100644
--- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPromotionLAB.hpp
+++ b/hotspot/src/share/vm/gc/parallel/psPromotionLAB.hpp
@@ -22,11 +22,11 @@
*
*/
-#ifndef SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PSPROMOTIONLAB_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PSPROMOTIONLAB_HPP
+#ifndef SHARE_VM_GC_PARALLEL_PSPROMOTIONLAB_HPP
+#define SHARE_VM_GC_PARALLEL_PSPROMOTIONLAB_HPP
-#include "gc_implementation/parallelScavenge/objectStartArray.hpp"
-#include "gc_interface/collectedHeap.hpp"
+#include "gc/parallel/objectStartArray.hpp"
+#include "gc/shared/collectedHeap.hpp"
#include "memory/allocation.hpp"
//
@@ -134,4 +134,4 @@ class PSOldPromotionLAB : public PSPromotionLAB {
debug_only(virtual bool lab_is_valid(MemRegion lab));
};
-#endif // SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PSPROMOTIONLAB_HPP
+#endif // SHARE_VM_GC_PARALLEL_PSPROMOTIONLAB_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPromotionLAB.inline.hpp b/hotspot/src/share/vm/gc/parallel/psPromotionLAB.inline.hpp
similarity index 79%
rename from hotspot/src/share/vm/gc_implementation/parallelScavenge/psPromotionLAB.inline.hpp
rename to hotspot/src/share/vm/gc/parallel/psPromotionLAB.inline.hpp
index 0e5d7e7f7f2..8987ae92923 100644
--- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPromotionLAB.inline.hpp
+++ b/hotspot/src/share/vm/gc/parallel/psPromotionLAB.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,11 +22,11 @@
*
*/
-#ifndef SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PSPROMOTIONLAB_INLINE_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PSPROMOTIONLAB_INLINE_HPP
+#ifndef SHARE_VM_GC_PARALLEL_PSPROMOTIONLAB_INLINE_HPP
+#define SHARE_VM_GC_PARALLEL_PSPROMOTIONLAB_INLINE_HPP
-#include "gc_implementation/parallelScavenge/psPromotionLAB.hpp"
-#include "gc_interface/collectedHeap.inline.hpp"
+#include "gc/parallel/psPromotionLAB.hpp"
+#include "gc/shared/collectedHeap.inline.hpp"
HeapWord* PSYoungPromotionLAB::allocate(size_t size) {
// Can't assert this, when young fills, we keep the LAB around, but flushed.
@@ -49,4 +49,4 @@ HeapWord* PSYoungPromotionLAB::allocate(size_t size) {
}
}
-#endif // SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PSPROMOTIONLAB_INLINE_HPP
+#endif // SHARE_VM_GC_PARALLEL_PSPROMOTIONLAB_INLINE_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.cpp b/hotspot/src/share/vm/gc/parallel/psPromotionManager.cpp
similarity index 97%
rename from hotspot/src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.cpp
rename to hotspot/src/share/vm/gc/parallel/psPromotionManager.cpp
index 0d15eaadaa4..37a32af7773 100644
--- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.cpp
+++ b/hotspot/src/share/vm/gc/parallel/psPromotionManager.cpp
@@ -23,12 +23,13 @@
*/
#include "precompiled.hpp"
-#include "gc_implementation/parallelScavenge/parallelScavengeHeap.hpp"
-#include "gc_implementation/parallelScavenge/psOldGen.hpp"
-#include "gc_implementation/parallelScavenge/psPromotionManager.inline.hpp"
-#include "gc_implementation/parallelScavenge/psScavenge.inline.hpp"
-#include "gc_implementation/shared/gcTrace.hpp"
-#include "gc_implementation/shared/mutableSpace.hpp"
+#include "gc/parallel/mutableSpace.hpp"
+#include "gc/parallel/parallelScavengeHeap.hpp"
+#include "gc/parallel/psOldGen.hpp"
+#include "gc/parallel/psPromotionManager.inline.hpp"
+#include "gc/parallel/psScavenge.inline.hpp"
+#include "gc/shared/gcTrace.hpp"
+#include "gc/shared/taskqueue.inline.hpp"
#include "memory/allocation.inline.hpp"
#include "memory/memRegion.hpp"
#include "memory/padded.inline.hpp"
@@ -36,7 +37,6 @@
#include "oops/instanceMirrorKlass.inline.hpp"
#include "oops/objArrayKlass.inline.hpp"
#include "oops/oop.inline.hpp"
-#include "utilities/taskqueue.inline.hpp"
PaddedEnd* PSPromotionManager::_manager_array = NULL;
OopStarTaskQueueSet* PSPromotionManager::_stack_array_depth = NULL;
diff --git a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.hpp b/hotspot/src/share/vm/gc/parallel/psPromotionManager.hpp
similarity index 94%
rename from hotspot/src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.hpp
rename to hotspot/src/share/vm/gc/parallel/psPromotionManager.hpp
index 1612d9a85bb..d726814ba58 100644
--- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.hpp
+++ b/hotspot/src/share/vm/gc/parallel/psPromotionManager.hpp
@@ -22,16 +22,16 @@
*
*/
-#ifndef SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PSPROMOTIONMANAGER_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PSPROMOTIONMANAGER_HPP
+#ifndef SHARE_VM_GC_PARALLEL_PSPROMOTIONMANAGER_HPP
+#define SHARE_VM_GC_PARALLEL_PSPROMOTIONMANAGER_HPP
-#include "gc_implementation/parallelScavenge/psPromotionLAB.hpp"
-#include "gc_implementation/shared/gcTrace.hpp"
-#include "gc_implementation/shared/copyFailedInfo.hpp"
+#include "gc/parallel/psPromotionLAB.hpp"
+#include "gc/shared/copyFailedInfo.hpp"
+#include "gc/shared/gcTrace.hpp"
+#include "gc/shared/taskqueue.hpp"
#include "memory/allocation.hpp"
#include "memory/padded.hpp"
#include "utilities/globalDefinitions.hpp"
-#include "utilities/taskqueue.hpp"
//
// psPromotionManager is used by a single thread to manage object survival
@@ -208,4 +208,4 @@ class PSPromotionManager VALUE_OBJ_CLASS_SPEC {
void push_contents(oop obj);
};
-#endif // SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PSPROMOTIONMANAGER_HPP
+#endif // SHARE_VM_GC_PARALLEL_PSPROMOTIONMANAGER_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.inline.hpp b/hotspot/src/share/vm/gc/parallel/psPromotionManager.inline.hpp
similarity index 95%
rename from hotspot/src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.inline.hpp
rename to hotspot/src/share/vm/gc/parallel/psPromotionManager.inline.hpp
index 0354a0bb961..115808bb7d1 100644
--- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.inline.hpp
+++ b/hotspot/src/share/vm/gc/parallel/psPromotionManager.inline.hpp
@@ -22,16 +22,16 @@
*
*/
-#ifndef SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PSPROMOTIONMANAGER_INLINE_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PSPROMOTIONMANAGER_INLINE_HPP
+#ifndef SHARE_VM_GC_PARALLEL_PSPROMOTIONMANAGER_INLINE_HPP
+#define SHARE_VM_GC_PARALLEL_PSPROMOTIONMANAGER_INLINE_HPP
-#include "gc_implementation/parallelScavenge/parallelScavengeHeap.hpp"
-#include "gc_implementation/parallelScavenge/psOldGen.hpp"
-#include "gc_implementation/parallelScavenge/psPromotionManager.hpp"
-#include "gc_implementation/parallelScavenge/psPromotionLAB.inline.hpp"
-#include "gc_implementation/parallelScavenge/psScavenge.hpp"
+#include "gc/parallel/parallelScavengeHeap.hpp"
+#include "gc/parallel/psOldGen.hpp"
+#include "gc/parallel/psPromotionLAB.inline.hpp"
+#include "gc/parallel/psPromotionManager.hpp"
+#include "gc/parallel/psScavenge.hpp"
+#include "gc/shared/taskqueue.inline.hpp"
#include "oops/oop.inline.hpp"
-#include "utilities/taskqueue.inline.hpp"
inline PSPromotionManager* PSPromotionManager::manager_array(int index) {
assert(_manager_array != NULL, "access of NULL manager_array");
@@ -335,4 +335,4 @@ void PSPromotionManager::record_steal(StarTask& p) {
}
#endif // TASKQUEUE_STATS
-#endif // SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PSPROMOTIONMANAGER_INLINE_HPP
+#endif // SHARE_VM_GC_PARALLEL_PSPROMOTIONMANAGER_INLINE_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psScavenge.cpp b/hotspot/src/share/vm/gc/parallel/psScavenge.cpp
similarity index 96%
rename from hotspot/src/share/vm/gc_implementation/parallelScavenge/psScavenge.cpp
rename to hotspot/src/share/vm/gc/parallel/psScavenge.cpp
index 10585b53024..cb75197b321 100644
--- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psScavenge.cpp
+++ b/hotspot/src/share/vm/gc/parallel/psScavenge.cpp
@@ -25,25 +25,25 @@
#include "precompiled.hpp"
#include "classfile/stringTable.hpp"
#include "code/codeCache.hpp"
-#include "gc_implementation/parallelScavenge/cardTableExtension.hpp"
-#include "gc_implementation/parallelScavenge/gcTaskManager.hpp"
-#include "gc_implementation/parallelScavenge/parallelScavengeHeap.hpp"
-#include "gc_implementation/parallelScavenge/psAdaptiveSizePolicy.hpp"
-#include "gc_implementation/parallelScavenge/psMarkSweep.hpp"
-#include "gc_implementation/parallelScavenge/psParallelCompact.hpp"
-#include "gc_implementation/parallelScavenge/psScavenge.inline.hpp"
-#include "gc_implementation/parallelScavenge/psTasks.hpp"
-#include "gc_implementation/shared/gcHeapSummary.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_implementation/shared/spaceDecorator.hpp"
-#include "gc_interface/gcCause.hpp"
-#include "memory/collectorPolicy.hpp"
-#include "memory/gcLocker.inline.hpp"
-#include "memory/referencePolicy.hpp"
-#include "memory/referenceProcessor.hpp"
+#include "gc/parallel/cardTableExtension.hpp"
+#include "gc/parallel/gcTaskManager.hpp"
+#include "gc/parallel/parallelScavengeHeap.hpp"
+#include "gc/parallel/psAdaptiveSizePolicy.hpp"
+#include "gc/parallel/psMarkSweep.hpp"
+#include "gc/parallel/psParallelCompact.hpp"
+#include "gc/parallel/psScavenge.inline.hpp"
+#include "gc/parallel/psTasks.hpp"
+#include "gc/shared/collectorPolicy.hpp"
+#include "gc/shared/gcCause.hpp"
+#include "gc/shared/gcHeapSummary.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/isGCActiveMark.hpp"
+#include "gc/shared/referencePolicy.hpp"
+#include "gc/shared/referenceProcessor.hpp"
+#include "gc/shared/spaceDecorator.hpp"
#include "memory/resourceArea.hpp"
#include "oops/oop.inline.hpp"
#include "runtime/biasedLocking.hpp"
diff --git a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psScavenge.hpp b/hotspot/src/share/vm/gc/parallel/psScavenge.hpp
similarity index 92%
rename from hotspot/src/share/vm/gc_implementation/parallelScavenge/psScavenge.hpp
rename to hotspot/src/share/vm/gc/parallel/psScavenge.hpp
index f7551439e33..dfabc1b81bc 100644
--- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psScavenge.hpp
+++ b/hotspot/src/share/vm/gc/parallel/psScavenge.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,13 +22,13 @@
*
*/
-#ifndef SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PSSCAVENGE_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PSSCAVENGE_HPP
+#ifndef SHARE_VM_GC_PARALLEL_PSSCAVENGE_HPP
+#define SHARE_VM_GC_PARALLEL_PSSCAVENGE_HPP
-#include "gc_implementation/parallelScavenge/cardTableExtension.hpp"
-#include "gc_implementation/parallelScavenge/psVirtualspace.hpp"
-#include "gc_implementation/shared/collectorCounters.hpp"
-#include "gc_implementation/shared/gcTrace.hpp"
+#include "gc/parallel/cardTableExtension.hpp"
+#include "gc/parallel/psVirtualspace.hpp"
+#include "gc/shared/collectorCounters.hpp"
+#include "gc/shared/gcTrace.hpp"
#include "memory/allocation.hpp"
#include "oops/oop.hpp"
#include "utilities/stack.hpp"
@@ -163,4 +163,4 @@ class PSScavenge: AllStatic {
}
};
-#endif // SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PSSCAVENGE_HPP
+#endif // SHARE_VM_GC_PARALLEL_PSSCAVENGE_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psScavenge.inline.hpp b/hotspot/src/share/vm/gc/parallel/psScavenge.inline.hpp
similarity index 91%
rename from hotspot/src/share/vm/gc_implementation/parallelScavenge/psScavenge.inline.hpp
rename to hotspot/src/share/vm/gc/parallel/psScavenge.inline.hpp
index e995a618208..1881e01a342 100644
--- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psScavenge.inline.hpp
+++ b/hotspot/src/share/vm/gc/parallel/psScavenge.inline.hpp
@@ -22,13 +22,13 @@
*
*/
-#ifndef SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PSSCAVENGE_INLINE_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PSSCAVENGE_INLINE_HPP
+#ifndef SHARE_VM_GC_PARALLEL_PSSCAVENGE_INLINE_HPP
+#define SHARE_VM_GC_PARALLEL_PSSCAVENGE_INLINE_HPP
-#include "gc_implementation/parallelScavenge/cardTableExtension.hpp"
-#include "gc_implementation/parallelScavenge/parallelScavengeHeap.hpp"
-#include "gc_implementation/parallelScavenge/psPromotionManager.inline.hpp"
-#include "gc_implementation/parallelScavenge/psScavenge.hpp"
+#include "gc/parallel/cardTableExtension.hpp"
+#include "gc/parallel/parallelScavengeHeap.hpp"
+#include "gc/parallel/psPromotionManager.inline.hpp"
+#include "gc/parallel/psScavenge.hpp"
#include "memory/iterator.hpp"
#include "utilities/globalDefinitions.hpp"
@@ -163,4 +163,4 @@ class PSScavengeKlassClosure: public KlassClosure {
}
};
-#endif // SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PSSCAVENGE_INLINE_HPP
+#endif // SHARE_VM_GC_PARALLEL_PSSCAVENGE_INLINE_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psTasks.cpp b/hotspot/src/share/vm/gc/parallel/psTasks.cpp
similarity index 91%
rename from hotspot/src/share/vm/gc_implementation/parallelScavenge/psTasks.cpp
rename to hotspot/src/share/vm/gc/parallel/psTasks.cpp
index d9ec123368c..7bcae82ffdd 100644
--- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psTasks.cpp
+++ b/hotspot/src/share/vm/gc/parallel/psTasks.cpp
@@ -25,13 +25,14 @@
#include "precompiled.hpp"
#include "classfile/systemDictionary.hpp"
#include "code/codeCache.hpp"
-#include "gc_implementation/parallelScavenge/cardTableExtension.hpp"
-#include "gc_implementation/parallelScavenge/gcTaskManager.hpp"
-#include "gc_implementation/parallelScavenge/psMarkSweep.hpp"
-#include "gc_implementation/parallelScavenge/psPromotionManager.hpp"
-#include "gc_implementation/parallelScavenge/psPromotionManager.inline.hpp"
-#include "gc_implementation/parallelScavenge/psScavenge.inline.hpp"
-#include "gc_implementation/parallelScavenge/psTasks.hpp"
+#include "gc/parallel/cardTableExtension.hpp"
+#include "gc/parallel/gcTaskManager.hpp"
+#include "gc/parallel/psMarkSweep.hpp"
+#include "gc/parallel/psPromotionManager.hpp"
+#include "gc/parallel/psPromotionManager.inline.hpp"
+#include "gc/parallel/psScavenge.inline.hpp"
+#include "gc/parallel/psTasks.hpp"
+#include "gc/shared/taskqueue.inline.hpp"
#include "memory/iterator.hpp"
#include "memory/universe.hpp"
#include "oops/oop.inline.hpp"
@@ -39,7 +40,6 @@
#include "runtime/thread.hpp"
#include "runtime/vmThread.hpp"
#include "services/management.hpp"
-#include "utilities/taskqueue.inline.hpp"
//
// ScavengeRootsTask
diff --git a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psTasks.hpp b/hotspot/src/share/vm/gc/parallel/psTasks.hpp
similarity index 95%
rename from hotspot/src/share/vm/gc_implementation/parallelScavenge/psTasks.hpp
rename to hotspot/src/share/vm/gc/parallel/psTasks.hpp
index 24be15a4912..e6a06c10e76 100644
--- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psTasks.hpp
+++ b/hotspot/src/share/vm/gc/parallel/psTasks.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PSTASKS_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PSTASKS_HPP
+#ifndef SHARE_VM_GC_PARALLEL_PSTASKS_HPP
+#define SHARE_VM_GC_PARALLEL_PSTASKS_HPP
#include "memory/allocation.hpp"
#include "utilities/growableArray.hpp"
@@ -180,4 +180,4 @@ class OldToYoungRootsTask : public GCTask {
virtual void do_it(GCTaskManager* manager, uint which);
};
-#endif // SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PSTASKS_HPP
+#endif // SHARE_VM_GC_PARALLEL_PSTASKS_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psVirtualspace.cpp b/hotspot/src/share/vm/gc/parallel/psVirtualspace.cpp
similarity index 99%
rename from hotspot/src/share/vm/gc_implementation/parallelScavenge/psVirtualspace.cpp
rename to hotspot/src/share/vm/gc/parallel/psVirtualspace.cpp
index baf8e2dd661..a74eb32d2d7 100644
--- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psVirtualspace.cpp
+++ b/hotspot/src/share/vm/gc/parallel/psVirtualspace.cpp
@@ -23,7 +23,7 @@
*/
#include "precompiled.hpp"
-#include "gc_implementation/parallelScavenge/psVirtualspace.hpp"
+#include "gc/parallel/psVirtualspace.hpp"
#include "memory/virtualspace.hpp"
#include "runtime/os.hpp"
diff --git a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psVirtualspace.hpp b/hotspot/src/share/vm/gc/parallel/psVirtualspace.hpp
similarity index 96%
rename from hotspot/src/share/vm/gc_implementation/parallelScavenge/psVirtualspace.hpp
rename to hotspot/src/share/vm/gc/parallel/psVirtualspace.hpp
index 52d77402df1..d39e59ee8c5 100644
--- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psVirtualspace.hpp
+++ b/hotspot/src/share/vm/gc/parallel/psVirtualspace.hpp
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PSVIRTUALSPACE_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PSVIRTUALSPACE_HPP
+#ifndef SHARE_VM_GC_PARALLEL_PSVIRTUALSPACE_HPP
+#define SHARE_VM_GC_PARALLEL_PSVIRTUALSPACE_HPP
#include "memory/virtualspace.hpp"
@@ -179,4 +179,4 @@ inline void PSVirtualSpace::set_committed(char* low_addr, char* high_addr) {
_committed_high_addr = high_addr;
}
-#endif // SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PSVIRTUALSPACE_HPP
+#endif // SHARE_VM_GC_PARALLEL_PSVIRTUALSPACE_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psYoungGen.cpp b/hotspot/src/share/vm/gc/parallel/psYoungGen.cpp
similarity index 98%
rename from hotspot/src/share/vm/gc_implementation/parallelScavenge/psYoungGen.cpp
rename to hotspot/src/share/vm/gc/parallel/psYoungGen.cpp
index 08bdea7bf4c..047443ff054 100644
--- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psYoungGen.cpp
+++ b/hotspot/src/share/vm/gc/parallel/psYoungGen.cpp
@@ -23,13 +23,13 @@
*/
#include "precompiled.hpp"
-#include "gc_implementation/parallelScavenge/parallelScavengeHeap.hpp"
-#include "gc_implementation/parallelScavenge/psMarkSweepDecorator.hpp"
-#include "gc_implementation/parallelScavenge/psScavenge.hpp"
-#include "gc_implementation/parallelScavenge/psYoungGen.hpp"
-#include "gc_implementation/shared/gcUtil.hpp"
-#include "gc_implementation/shared/mutableNUMASpace.hpp"
-#include "gc_implementation/shared/spaceDecorator.hpp"
+#include "gc/parallel/mutableNUMASpace.hpp"
+#include "gc/parallel/parallelScavengeHeap.hpp"
+#include "gc/parallel/psMarkSweepDecorator.hpp"
+#include "gc/parallel/psScavenge.hpp"
+#include "gc/parallel/psYoungGen.hpp"
+#include "gc/shared/gcUtil.hpp"
+#include "gc/shared/spaceDecorator.hpp"
#include "oops/oop.inline.hpp"
#include "runtime/java.hpp"
diff --git a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psYoungGen.hpp b/hotspot/src/share/vm/gc/parallel/psYoungGen.hpp
similarity index 91%
rename from hotspot/src/share/vm/gc_implementation/parallelScavenge/psYoungGen.hpp
rename to hotspot/src/share/vm/gc/parallel/psYoungGen.hpp
index e3da6bdf2b8..1b51c435a53 100644
--- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psYoungGen.hpp
+++ b/hotspot/src/share/vm/gc/parallel/psYoungGen.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,14 +22,14 @@
*
*/
-#ifndef SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PSYOUNGGEN_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PSYOUNGGEN_HPP
+#ifndef SHARE_VM_GC_PARALLEL_PSYOUNGGEN_HPP
+#define SHARE_VM_GC_PARALLEL_PSYOUNGGEN_HPP
-#include "gc_implementation/parallelScavenge/objectStartArray.hpp"
-#include "gc_implementation/parallelScavenge/psGenerationCounters.hpp"
-#include "gc_implementation/parallelScavenge/psVirtualspace.hpp"
-#include "gc_implementation/shared/mutableSpace.hpp"
-#include "gc_implementation/shared/spaceCounters.hpp"
+#include "gc/parallel/mutableSpace.hpp"
+#include "gc/parallel/objectStartArray.hpp"
+#include "gc/parallel/psGenerationCounters.hpp"
+#include "gc/parallel/psVirtualspace.hpp"
+#include "gc/parallel/spaceCounters.hpp"
class PSMarkSweepDecorator;
@@ -195,4 +195,4 @@ class PSYoungGen : public CHeapObj {
void record_spaces_top() PRODUCT_RETURN;
};
-#endif // SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PSYOUNGGEN_HPP
+#endif // SHARE_VM_GC_PARALLEL_PSYOUNGGEN_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/shared/spaceCounters.cpp b/hotspot/src/share/vm/gc/parallel/spaceCounters.cpp
similarity index 94%
rename from hotspot/src/share/vm/gc_implementation/shared/spaceCounters.cpp
rename to hotspot/src/share/vm/gc/parallel/spaceCounters.cpp
index 5a20c0dd4b9..36cb8099523 100644
--- a/hotspot/src/share/vm/gc_implementation/shared/spaceCounters.cpp
+++ b/hotspot/src/share/vm/gc/parallel/spaceCounters.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -23,11 +23,9 @@
*/
#include "precompiled.hpp"
-#include "utilities/macros.hpp"
-#if INCLUDE_ALL_GCS
-#include "gc_implementation/shared/spaceCounters.hpp"
+#include "gc/parallel/spaceCounters.hpp"
#include "memory/resourceArea.hpp"
-#endif // INCLUDE_ALL_GCS
+#include "utilities/macros.hpp"
SpaceCounters::SpaceCounters(const char* name, int ordinal, size_t max_size,
MutableSpace* m, GenerationCounters* gc) :
diff --git a/hotspot/src/share/vm/gc_implementation/shared/spaceCounters.hpp b/hotspot/src/share/vm/gc/parallel/spaceCounters.hpp
similarity index 83%
rename from hotspot/src/share/vm/gc_implementation/shared/spaceCounters.hpp
rename to hotspot/src/share/vm/gc/parallel/spaceCounters.hpp
index 893bba88c66..38e6542085f 100644
--- a/hotspot/src/share/vm/gc_implementation/shared/spaceCounters.hpp
+++ b/hotspot/src/share/vm/gc/parallel/spaceCounters.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,16 +22,14 @@
*
*/
-#ifndef SHARE_VM_GC_IMPLEMENTATION_SHARED_SPACECOUNTERS_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_SHARED_SPACECOUNTERS_HPP
+#ifndef SHARE_VM_GC_PARALLEL_SPACECOUNTERS_HPP
+#define SHARE_VM_GC_PARALLEL_SPACECOUNTERS_HPP
-#include "utilities/macros.hpp"
-#if INCLUDE_ALL_GCS
-#include "gc_implementation/shared/generationCounters.hpp"
-#include "gc_implementation/shared/immutableSpace.hpp"
-#include "gc_implementation/shared/mutableSpace.hpp"
+#include "gc/parallel/immutableSpace.hpp"
+#include "gc/parallel/mutableSpace.hpp"
+#include "gc/shared/generationCounters.hpp"
#include "runtime/perfData.hpp"
-#endif // INCLUDE_ALL_GCS
+#include "utilities/macros.hpp"
// A SpaceCounter is a holder class for performance counters
// that track a space;
@@ -87,4 +85,4 @@ class MutableSpaceUsedHelper: public PerfLongSampleHelper {
}
};
-#endif // SHARE_VM_GC_IMPLEMENTATION_SHARED_SPACECOUNTERS_HPP
+#endif // SHARE_VM_GC_PARALLEL_SPACECOUNTERS_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/parallelScavenge/vmPSOperations.cpp b/hotspot/src/share/vm/gc/parallel/vmPSOperations.cpp
similarity index 89%
rename from hotspot/src/share/vm/gc_implementation/parallelScavenge/vmPSOperations.cpp
rename to hotspot/src/share/vm/gc/parallel/vmPSOperations.cpp
index cc5e1226344..931ec86313d 100644
--- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/vmPSOperations.cpp
+++ b/hotspot/src/share/vm/gc/parallel/vmPSOperations.cpp
@@ -23,11 +23,11 @@
*/
#include "precompiled.hpp"
-#include "gc_implementation/parallelScavenge/parallelScavengeHeap.inline.hpp"
-#include "gc_implementation/parallelScavenge/psMarkSweep.hpp"
-#include "gc_implementation/parallelScavenge/psScavenge.hpp"
-#include "gc_implementation/parallelScavenge/vmPSOperations.hpp"
-#include "memory/gcLocker.inline.hpp"
+#include "gc/parallel/parallelScavengeHeap.inline.hpp"
+#include "gc/parallel/psMarkSweep.hpp"
+#include "gc/parallel/psScavenge.hpp"
+#include "gc/parallel/vmPSOperations.hpp"
+#include "gc/shared/gcLocker.inline.hpp"
#include "utilities/dtrace.hpp"
// The following methods are used by the parallel scavenge collector
diff --git a/hotspot/src/share/vm/gc_implementation/parallelScavenge/vmPSOperations.hpp b/hotspot/src/share/vm/gc/parallel/vmPSOperations.hpp
similarity index 80%
rename from hotspot/src/share/vm/gc_implementation/parallelScavenge/vmPSOperations.hpp
rename to hotspot/src/share/vm/gc/parallel/vmPSOperations.hpp
index 7ffe251618a..af7be6e93f0 100644
--- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/vmPSOperations.hpp
+++ b/hotspot/src/share/vm/gc/parallel/vmPSOperations.hpp
@@ -22,12 +22,12 @@
*
*/
-#ifndef SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_VMPSOPERATIONS_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_VMPSOPERATIONS_HPP
+#ifndef SHARE_VM_GC_PARALLEL_VMPSOPERATIONS_HPP
+#define SHARE_VM_GC_PARALLEL_VMPSOPERATIONS_HPP
-#include "gc_implementation/parallelScavenge/parallelScavengeHeap.hpp"
-#include "gc_implementation/shared/vmGCOperations.hpp"
-#include "gc_interface/gcCause.hpp"
+#include "gc/parallel/parallelScavengeHeap.hpp"
+#include "gc/shared/gcCause.hpp"
+#include "gc/shared/vmGCOperations.hpp"
class VM_ParallelGCFailedAllocation : public VM_CollectForAllocation {
public:
@@ -46,4 +46,4 @@ class VM_ParallelGCSystemGC: public VM_GC_Operation {
virtual void doit();
};
-#endif // SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_VMPSOPERATIONS_HPP
+#endif // SHARE_VM_GC_PARALLEL_VMPSOPERATIONS_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/parallelScavenge/vmStructs_parallelgc.hpp b/hotspot/src/share/vm/gc/parallel/vmStructs_parallelgc.hpp
similarity index 97%
rename from hotspot/src/share/vm/gc_implementation/parallelScavenge/vmStructs_parallelgc.hpp
rename to hotspot/src/share/vm/gc/parallel/vmStructs_parallelgc.hpp
index fa79b31a13e..65d2f092171 100644
--- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/vmStructs_parallelgc.hpp
+++ b/hotspot/src/share/vm/gc/parallel/vmStructs_parallelgc.hpp
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_VMSTRUCTS_PARALLELGC_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_VMSTRUCTS_PARALLELGC_HPP
+#ifndef SHARE_VM_GC_PARALLEL_VMSTRUCTS_PARALLELGC_HPP
+#define SHARE_VM_GC_PARALLEL_VMSTRUCTS_PARALLELGC_HPP
#define VM_STRUCTS_PARALLELGC(nonstatic_field, \
static_field) \
@@ -92,4 +92,4 @@
declare_toplevel_type(ASPSOldGen*) \
declare_toplevel_type(ParallelScavengeHeap*)
-#endif // SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_VMSTRUCTS_PARALLELGC_HPP
+#endif // SHARE_VM_GC_PARALLEL_VMSTRUCTS_PARALLELGC_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/shared/cSpaceCounters.cpp b/hotspot/src/share/vm/gc/serial/cSpaceCounters.cpp
similarity index 98%
rename from hotspot/src/share/vm/gc_implementation/shared/cSpaceCounters.cpp
rename to hotspot/src/share/vm/gc/serial/cSpaceCounters.cpp
index 9b371987e1d..84e9c96bd4e 100644
--- a/hotspot/src/share/vm/gc_implementation/shared/cSpaceCounters.cpp
+++ b/hotspot/src/share/vm/gc/serial/cSpaceCounters.cpp
@@ -23,7 +23,7 @@
*/
#include "precompiled.hpp"
-#include "gc_implementation/shared/cSpaceCounters.hpp"
+#include "gc/serial/cSpaceCounters.hpp"
#include "memory/metaspace.hpp"
#include "memory/resourceArea.hpp"
diff --git a/hotspot/src/share/vm/gc_implementation/shared/cSpaceCounters.hpp b/hotspot/src/share/vm/gc/serial/cSpaceCounters.hpp
similarity index 88%
rename from hotspot/src/share/vm/gc_implementation/shared/cSpaceCounters.hpp
rename to hotspot/src/share/vm/gc/serial/cSpaceCounters.hpp
index e30044bc5e3..ffe43ab14a2 100644
--- a/hotspot/src/share/vm/gc_implementation/shared/cSpaceCounters.hpp
+++ b/hotspot/src/share/vm/gc/serial/cSpaceCounters.hpp
@@ -22,11 +22,11 @@
*
*/
-#ifndef SHARE_VM_GC_IMPLEMENTATION_SHARED_CSPACECOUNTERS_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_SHARED_CSPACECOUNTERS_HPP
+#ifndef SHARE_VM_GC_SERIAL_CSPACECOUNTERS_HPP
+#define SHARE_VM_GC_SERIAL_CSPACECOUNTERS_HPP
-#include "gc_implementation/shared/generationCounters.hpp"
-#include "memory/space.hpp"
+#include "gc/shared/generationCounters.hpp"
+#include "gc/shared/space.hpp"
#include "runtime/perfData.hpp"
// A CSpaceCounters is a holder class for performance counters
@@ -73,4 +73,4 @@ class ContiguousSpaceUsedHelper : public PerfLongSampleHelper {
jlong take_sample();
};
-#endif // SHARE_VM_GC_IMPLEMENTATION_SHARED_CSPACECOUNTERS_HPP
+#endif // SHARE_VM_GC_SERIAL_CSPACECOUNTERS_HPP
diff --git a/hotspot/src/share/vm/memory/defNewGeneration.cpp b/hotspot/src/share/vm/gc/serial/defNewGeneration.cpp
similarity index 98%
rename from hotspot/src/share/vm/memory/defNewGeneration.cpp
rename to hotspot/src/share/vm/gc/serial/defNewGeneration.cpp
index b414621db29..65ac2fd911e 100644
--- a/hotspot/src/share/vm/memory/defNewGeneration.cpp
+++ b/hotspot/src/share/vm/gc/serial/defNewGeneration.cpp
@@ -23,22 +23,22 @@
*/
#include "precompiled.hpp"
-#include "gc_implementation/shared/collectorCounters.hpp"
-#include "gc_implementation/shared/gcPolicyCounters.hpp"
-#include "gc_implementation/shared/gcHeapSummary.hpp"
-#include "gc_implementation/shared/gcTimer.hpp"
-#include "gc_implementation/shared/gcTraceTime.hpp"
-#include "gc_implementation/shared/gcTrace.hpp"
-#include "gc_implementation/shared/spaceDecorator.hpp"
-#include "memory/defNewGeneration.inline.hpp"
-#include "memory/gcLocker.inline.hpp"
-#include "memory/genCollectedHeap.hpp"
-#include "memory/genOopClosures.inline.hpp"
-#include "memory/genRemSet.hpp"
-#include "memory/generationSpec.hpp"
+#include "gc/serial/defNewGeneration.inline.hpp"
+#include "gc/shared/collectorCounters.hpp"
+#include "gc/shared/gcHeapSummary.hpp"
+#include "gc/shared/gcLocker.inline.hpp"
+#include "gc/shared/gcPolicyCounters.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/genRemSet.hpp"
+#include "gc/shared/generationSpec.hpp"
+#include "gc/shared/referencePolicy.hpp"
+#include "gc/shared/space.inline.hpp"
+#include "gc/shared/spaceDecorator.hpp"
#include "memory/iterator.hpp"
-#include "memory/referencePolicy.hpp"
-#include "memory/space.inline.hpp"
#include "oops/instanceRefKlass.hpp"
#include "oops/oop.inline.hpp"
#include "runtime/atomic.inline.hpp"
@@ -49,7 +49,7 @@
#include "utilities/globalDefinitions.hpp"
#include "utilities/stack.inline.hpp"
#if INCLUDE_ALL_GCS
-#include "gc_implementation/parNew/parOopClosures.hpp"
+#include "gc/cms/parOopClosures.hpp"
#endif
//
diff --git a/hotspot/src/share/vm/memory/defNewGeneration.hpp b/hotspot/src/share/vm/gc/serial/defNewGeneration.hpp
similarity index 96%
rename from hotspot/src/share/vm/memory/defNewGeneration.hpp
rename to hotspot/src/share/vm/gc/serial/defNewGeneration.hpp
index 4d12a022359..1975114aefb 100644
--- a/hotspot/src/share/vm/memory/defNewGeneration.hpp
+++ b/hotspot/src/share/vm/gc/serial/defNewGeneration.hpp
@@ -22,14 +22,14 @@
*
*/
-#ifndef SHARE_VM_MEMORY_DEFNEWGENERATION_HPP
-#define SHARE_VM_MEMORY_DEFNEWGENERATION_HPP
+#ifndef SHARE_VM_GC_SERIAL_DEFNEWGENERATION_HPP
+#define SHARE_VM_GC_SERIAL_DEFNEWGENERATION_HPP
-#include "gc_implementation/shared/ageTable.hpp"
-#include "gc_implementation/shared/cSpaceCounters.hpp"
-#include "gc_implementation/shared/generationCounters.hpp"
-#include "gc_implementation/shared/copyFailedInfo.hpp"
-#include "memory/generation.hpp"
+#include "gc/serial/cSpaceCounters.hpp"
+#include "gc/shared/ageTable.hpp"
+#include "gc/shared/copyFailedInfo.hpp"
+#include "gc/shared/generation.hpp"
+#include "gc/shared/generationCounters.hpp"
#include "utilities/stack.hpp"
class ContiguousSpace;
@@ -362,4 +362,4 @@ protected:
void swap_spaces();
};
-#endif // SHARE_VM_MEMORY_DEFNEWGENERATION_HPP
+#endif // SHARE_VM_GC_SERIAL_DEFNEWGENERATION_HPP
diff --git a/hotspot/src/share/vm/memory/defNewGeneration.inline.hpp b/hotspot/src/share/vm/gc/serial/defNewGeneration.inline.hpp
similarity index 89%
rename from hotspot/src/share/vm/memory/defNewGeneration.inline.hpp
rename to hotspot/src/share/vm/gc/serial/defNewGeneration.inline.hpp
index b10d6d9e783..4ddb46becc7 100644
--- a/hotspot/src/share/vm/memory/defNewGeneration.inline.hpp
+++ b/hotspot/src/share/vm/gc/serial/defNewGeneration.inline.hpp
@@ -22,14 +22,14 @@
*
*/
-#ifndef SHARE_VM_MEMORY_DEFNEWGENERATION_INLINE_HPP
-#define SHARE_VM_MEMORY_DEFNEWGENERATION_INLINE_HPP
+#ifndef SHARE_VM_GC_SERIAL_DEFNEWGENERATION_INLINE_HPP
+#define SHARE_VM_GC_SERIAL_DEFNEWGENERATION_INLINE_HPP
-#include "memory/cardTableRS.hpp"
-#include "memory/defNewGeneration.hpp"
-#include "memory/genCollectedHeap.hpp"
-#include "memory/genOopClosures.inline.hpp"
-#include "memory/space.hpp"
+#include "gc/serial/defNewGeneration.hpp"
+#include "gc/shared/cardTableRS.hpp"
+#include "gc/shared/genCollectedHeap.hpp"
+#include "gc/shared/genOopClosures.inline.hpp"
+#include "gc/shared/space.hpp"
// Methods of protected closure types
@@ -89,4 +89,4 @@ inline void DefNewGeneration::FastKeepAliveClosure::do_oop_work(T* p) {
}
}
-#endif // SHARE_VM_MEMORY_DEFNEWGENERATION_INLINE_HPP
+#endif // SHARE_VM_GC_SERIAL_DEFNEWGENERATION_INLINE_HPP
diff --git a/hotspot/src/share/vm/memory/genMarkSweep.cpp b/hotspot/src/share/vm/gc/serial/genMarkSweep.cpp
similarity index 96%
rename from hotspot/src/share/vm/memory/genMarkSweep.cpp
rename to hotspot/src/share/vm/gc/serial/genMarkSweep.cpp
index 94100be74d4..d355e9ac7aa 100644
--- a/hotspot/src/share/vm/memory/genMarkSweep.cpp
+++ b/hotspot/src/share/vm/gc/serial/genMarkSweep.cpp
@@ -29,17 +29,17 @@
#include "classfile/vmSymbols.hpp"
#include "code/codeCache.hpp"
#include "code/icBuffer.hpp"
-#include "gc_implementation/shared/gcHeapSummary.hpp"
-#include "gc_implementation/shared/gcTimer.hpp"
-#include "gc_implementation/shared/gcTrace.hpp"
-#include "gc_implementation/shared/gcTraceTime.hpp"
-#include "gc_interface/collectedHeap.inline.hpp"
-#include "memory/genCollectedHeap.hpp"
-#include "memory/genMarkSweep.hpp"
-#include "memory/genOopClosures.inline.hpp"
-#include "memory/modRefBarrierSet.hpp"
-#include "memory/referencePolicy.hpp"
-#include "memory/space.hpp"
+#include "gc/serial/genMarkSweep.hpp"
+#include "gc/shared/collectedHeap.inline.hpp"
+#include "gc/shared/gcHeapSummary.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/modRefBarrierSet.hpp"
+#include "gc/shared/referencePolicy.hpp"
+#include "gc/shared/space.hpp"
#include "oops/instanceRefKlass.hpp"
#include "oops/oop.inline.hpp"
#include "prims/jvmtiExport.hpp"
diff --git a/hotspot/src/share/vm/memory/genMarkSweep.hpp b/hotspot/src/share/vm/gc/serial/genMarkSweep.hpp
similarity index 87%
rename from hotspot/src/share/vm/memory/genMarkSweep.hpp
rename to hotspot/src/share/vm/gc/serial/genMarkSweep.hpp
index b6147ab5bed..c1934995c36 100644
--- a/hotspot/src/share/vm/memory/genMarkSweep.hpp
+++ b/hotspot/src/share/vm/gc/serial/genMarkSweep.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,10 +22,10 @@
*
*/
-#ifndef SHARE_VM_MEMORY_GENMARKSWEEP_HPP
-#define SHARE_VM_MEMORY_GENMARKSWEEP_HPP
+#ifndef SHARE_VM_GC_SERIAL_GENMARKSWEEP_HPP
+#define SHARE_VM_GC_SERIAL_GENMARKSWEEP_HPP
-#include "gc_implementation/shared/markSweep.hpp"
+#include "gc/serial/markSweep.hpp"
class GenMarkSweep : public MarkSweep {
friend class VM_MarkSweep;
@@ -50,4 +50,4 @@ class GenMarkSweep : public MarkSweep {
static void deallocate_stacks();
};
-#endif // SHARE_VM_MEMORY_GENMARKSWEEP_HPP
+#endif // SHARE_VM_GC_SERIAL_GENMARKSWEEP_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/shared/markSweep.cpp b/hotspot/src/share/vm/gc/serial/markSweep.cpp
similarity index 98%
rename from hotspot/src/share/vm/gc_implementation/shared/markSweep.cpp
rename to hotspot/src/share/vm/gc/serial/markSweep.cpp
index 6808460d362..14fa7fe60cf 100644
--- a/hotspot/src/share/vm/gc_implementation/shared/markSweep.cpp
+++ b/hotspot/src/share/vm/gc/serial/markSweep.cpp
@@ -24,10 +24,10 @@
#include "precompiled.hpp"
#include "compiler/compileBroker.hpp"
-#include "gc_implementation/shared/gcTimer.hpp"
-#include "gc_implementation/shared/gcTrace.hpp"
-#include "gc_implementation/shared/markSweep.inline.hpp"
-#include "gc_interface/collectedHeap.inline.hpp"
+#include "gc/serial/markSweep.inline.hpp"
+#include "gc/shared/collectedHeap.inline.hpp"
+#include "gc/shared/gcTimer.hpp"
+#include "gc/shared/gcTrace.hpp"
#include "oops/instanceKlass.inline.hpp"
#include "oops/instanceMirrorKlass.inline.hpp"
#include "oops/methodData.hpp"
diff --git a/hotspot/src/share/vm/gc_implementation/shared/markSweep.hpp b/hotspot/src/share/vm/gc/serial/markSweep.hpp
similarity index 95%
rename from hotspot/src/share/vm/gc_implementation/shared/markSweep.hpp
rename to hotspot/src/share/vm/gc/serial/markSweep.hpp
index 6ffd76af54d..0e8e1235415 100644
--- a/hotspot/src/share/vm/gc_implementation/shared/markSweep.hpp
+++ b/hotspot/src/share/vm/gc/serial/markSweep.hpp
@@ -22,18 +22,18 @@
*
*/
-#ifndef SHARE_VM_GC_IMPLEMENTATION_SHARED_MARKSWEEP_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_SHARED_MARKSWEEP_HPP
+#ifndef SHARE_VM_GC_SERIAL_MARKSWEEP_HPP
+#define SHARE_VM_GC_SERIAL_MARKSWEEP_HPP
-#include "gc_interface/collectedHeap.hpp"
-#include "memory/genOopClosures.hpp"
+#include "gc/shared/collectedHeap.hpp"
+#include "gc/shared/genOopClosures.hpp"
+#include "gc/shared/taskqueue.hpp"
#include "memory/iterator.hpp"
#include "oops/markOop.hpp"
#include "oops/oop.hpp"
#include "runtime/timer.hpp"
#include "utilities/growableArray.hpp"
#include "utilities/stack.hpp"
-#include "utilities/taskqueue.hpp"
class ReferenceProcessor;
class DataLayout;
@@ -195,4 +195,4 @@ public:
void restore();
};
-#endif // SHARE_VM_GC_IMPLEMENTATION_SHARED_MARKSWEEP_HPP
+#endif // SHARE_VM_GC_SERIAL_MARKSWEEP_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/shared/markSweep.inline.hpp b/hotspot/src/share/vm/gc/serial/markSweep.inline.hpp
similarity index 92%
rename from hotspot/src/share/vm/gc_implementation/shared/markSweep.inline.hpp
rename to hotspot/src/share/vm/gc/serial/markSweep.inline.hpp
index 39201f76440..9d8e578dd69 100644
--- a/hotspot/src/share/vm/gc_implementation/shared/markSweep.inline.hpp
+++ b/hotspot/src/share/vm/gc/serial/markSweep.inline.hpp
@@ -22,21 +22,21 @@
*
*/
-#ifndef SHARE_VM_GC_IMPLEMENTATION_SHARED_MARKSWEEP_INLINE_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_SHARED_MARKSWEEP_INLINE_HPP
+#ifndef SHARE_VM_GC_SERIAL_MARKSWEEP_INLINE_HPP
+#define SHARE_VM_GC_SERIAL_MARKSWEEP_INLINE_HPP
-#include "gc_implementation/shared/markSweep.hpp"
-#include "gc_interface/collectedHeap.hpp"
-#include "oops/markOop.inline.hpp"
-#include "oops/instanceKlass.inline.hpp"
+#include "gc/serial/markSweep.hpp"
+#include "gc/shared/collectedHeap.hpp"
#include "oops/instanceClassLoaderKlass.inline.hpp"
+#include "oops/instanceKlass.inline.hpp"
#include "oops/instanceMirrorKlass.inline.hpp"
#include "oops/instanceRefKlass.inline.hpp"
+#include "oops/markOop.inline.hpp"
#include "oops/objArrayKlass.inline.hpp"
-#include "utilities/stack.inline.hpp"
#include "utilities/macros.hpp"
+#include "utilities/stack.inline.hpp"
#if INCLUDE_ALL_GCS
-#include "gc_implementation/g1/g1StringDedup.hpp"
+#include "gc/g1/g1StringDedup.hpp"
#endif // INCLUDE_ALL_GCS
inline void MarkSweep::mark_object(oop obj) {
@@ -128,4 +128,4 @@ template inline void MarkSweep::KeepAliveClosure::do_oop_work(T* p) {
mark_and_push(p);
}
-#endif // SHARE_VM_GC_IMPLEMENTATION_SHARED_MARKSWEEP_INLINE_HPP
+#endif // SHARE_VM_GC_SERIAL_MARKSWEEP_INLINE_HPP
diff --git a/hotspot/src/share/vm/memory/tenuredGeneration.cpp b/hotspot/src/share/vm/gc/serial/tenuredGeneration.cpp
similarity index 95%
rename from hotspot/src/share/vm/memory/tenuredGeneration.cpp
rename to hotspot/src/share/vm/gc/serial/tenuredGeneration.cpp
index 63026205c1a..7ae2590b497 100644
--- a/hotspot/src/share/vm/memory/tenuredGeneration.cpp
+++ b/hotspot/src/share/vm/gc/serial/tenuredGeneration.cpp
@@ -23,21 +23,21 @@
*/
#include "precompiled.hpp"
-#include "gc_implementation/shared/collectorCounters.hpp"
-#include "gc_implementation/shared/gcTimer.hpp"
+#include "gc/serial/genMarkSweep.hpp"
+#include "gc/serial/tenuredGeneration.inline.hpp"
+#include "gc/shared/blockOffsetTable.inline.hpp"
+#include "gc/shared/cardGeneration.inline.hpp"
+#include "gc/shared/collectorCounters.hpp"
+#include "gc/shared/gcTimer.hpp"
+#include "gc/shared/genOopClosures.inline.hpp"
+#include "gc/shared/generationSpec.hpp"
+#include "gc/shared/space.hpp"
#include "memory/allocation.inline.hpp"
-#include "memory/blockOffsetTable.inline.hpp"
-#include "memory/cardGeneration.inline.hpp"
-#include "memory/generationSpec.hpp"
-#include "memory/genMarkSweep.hpp"
-#include "memory/genOopClosures.inline.hpp"
-#include "memory/space.hpp"
-#include "memory/tenuredGeneration.inline.hpp"
#include "oops/oop.inline.hpp"
#include "runtime/java.hpp"
#include "utilities/macros.hpp"
#if INCLUDE_ALL_GCS
-#include "gc_implementation/parNew/parOopClosures.hpp"
+#include "gc/cms/parOopClosures.hpp"
#endif
TenuredGeneration::TenuredGeneration(ReservedSpace rs,
diff --git a/hotspot/src/share/vm/memory/tenuredGeneration.hpp b/hotspot/src/share/vm/gc/serial/tenuredGeneration.hpp
similarity index 91%
rename from hotspot/src/share/vm/memory/tenuredGeneration.hpp
rename to hotspot/src/share/vm/gc/serial/tenuredGeneration.hpp
index 5417e69cb7f..250abaaacf6 100644
--- a/hotspot/src/share/vm/memory/tenuredGeneration.hpp
+++ b/hotspot/src/share/vm/gc/serial/tenuredGeneration.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,13 +22,13 @@
*
*/
-#ifndef SHARE_VM_MEMORY_TENUREDGENERATION_HPP
-#define SHARE_VM_MEMORY_TENUREDGENERATION_HPP
+#ifndef SHARE_VM_GC_SERIAL_TENUREDGENERATION_HPP
+#define SHARE_VM_GC_SERIAL_TENUREDGENERATION_HPP
-#include "gc_implementation/shared/cSpaceCounters.hpp"
-#include "gc_implementation/shared/gcStats.hpp"
-#include "gc_implementation/shared/generationCounters.hpp"
-#include "memory/cardGeneration.hpp"
+#include "gc/serial/cSpaceCounters.hpp"
+#include "gc/shared/cardGeneration.hpp"
+#include "gc/shared/gcStats.hpp"
+#include "gc/shared/generationCounters.hpp"
#include "utilities/macros.hpp"
// TenuredGeneration models the heap containing old (promoted/tenured) objects
@@ -128,4 +128,4 @@ class TenuredGeneration: public CardGeneration {
virtual void print_on(outputStream* st) const;
};
-#endif // SHARE_VM_MEMORY_TENUREDGENERATION_HPP
+#endif // SHARE_VM_GC_SERIAL_TENUREDGENERATION_HPP
diff --git a/hotspot/src/share/vm/memory/tenuredGeneration.inline.hpp b/hotspot/src/share/vm/gc/serial/tenuredGeneration.inline.hpp
similarity index 85%
rename from hotspot/src/share/vm/memory/tenuredGeneration.inline.hpp
rename to hotspot/src/share/vm/gc/serial/tenuredGeneration.inline.hpp
index aea97ea317a..490f0abaa48 100644
--- a/hotspot/src/share/vm/memory/tenuredGeneration.inline.hpp
+++ b/hotspot/src/share/vm/gc/serial/tenuredGeneration.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,11 +22,11 @@
*
*/
-#ifndef SHARE_VM_MEMORY_TENUREDGENERATION_INLINE_HPP
-#define SHARE_VM_MEMORY_TENUREDGENERATION_INLINE_HPP
+#ifndef SHARE_VM_GC_SERIAL_TENUREDGENERATION_INLINE_HPP
+#define SHARE_VM_GC_SERIAL_TENUREDGENERATION_INLINE_HPP
-#include "memory/space.hpp"
-#include "memory/tenuredGeneration.hpp"
+#include "gc/serial/tenuredGeneration.hpp"
+#include "gc/shared/space.hpp"
HeapWord* TenuredGeneration::allocate(size_t word_size,
bool is_tlab) {
@@ -53,4 +53,4 @@ bool TenuredGeneration::block_is_obj(const HeapWord* addr) const {
return addr < _the_space ->top();
}
-#endif // SHARE_VM_MEMORY_TENUREDGENERATION_INLINE_HPP
+#endif // SHARE_VM_GC_SERIAL_TENUREDGENERATION_INLINE_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/shared/adaptiveSizePolicy.cpp b/hotspot/src/share/vm/gc/shared/adaptiveSizePolicy.cpp
similarity index 99%
rename from hotspot/src/share/vm/gc_implementation/shared/adaptiveSizePolicy.cpp
rename to hotspot/src/share/vm/gc/shared/adaptiveSizePolicy.cpp
index 44a49acc2da..78d9a39e8f4 100644
--- a/hotspot/src/share/vm/gc_implementation/shared/adaptiveSizePolicy.cpp
+++ b/hotspot/src/share/vm/gc/shared/adaptiveSizePolicy.cpp
@@ -23,12 +23,12 @@
*/
#include "precompiled.hpp"
-#include "gc_implementation/shared/adaptiveSizePolicy.hpp"
-#include "gc_interface/gcCause.hpp"
-#include "memory/collectorPolicy.hpp"
+#include "gc/shared/adaptiveSizePolicy.hpp"
+#include "gc/shared/collectorPolicy.hpp"
+#include "gc/shared/gcCause.hpp"
+#include "gc/shared/workgroup.hpp"
#include "runtime/timer.hpp"
#include "utilities/ostream.hpp"
-#include "utilities/workgroup.hpp"
elapsedTimer AdaptiveSizePolicy::_minor_timer;
elapsedTimer AdaptiveSizePolicy::_major_timer;
bool AdaptiveSizePolicy::_debug_perturbation = false;
diff --git a/hotspot/src/share/vm/gc_implementation/shared/adaptiveSizePolicy.hpp b/hotspot/src/share/vm/gc/shared/adaptiveSizePolicy.hpp
similarity index 98%
rename from hotspot/src/share/vm/gc_implementation/shared/adaptiveSizePolicy.hpp
rename to hotspot/src/share/vm/gc/shared/adaptiveSizePolicy.hpp
index b7ded0fb4cb..f9a0b7ce5a7 100644
--- a/hotspot/src/share/vm/gc_implementation/shared/adaptiveSizePolicy.hpp
+++ b/hotspot/src/share/vm/gc/shared/adaptiveSizePolicy.hpp
@@ -22,12 +22,12 @@
*
*/
-#ifndef SHARE_VM_GC_IMPLEMENTATION_SHARED_ADAPTIVESIZEPOLICY_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_SHARED_ADAPTIVESIZEPOLICY_HPP
+#ifndef SHARE_VM_GC_SHARED_ADAPTIVESIZEPOLICY_HPP
+#define SHARE_VM_GC_SHARED_ADAPTIVESIZEPOLICY_HPP
-#include "gc_implementation/shared/gcUtil.hpp"
-#include "gc_interface/collectedHeap.hpp"
-#include "gc_interface/gcCause.hpp"
+#include "gc/shared/collectedHeap.hpp"
+#include "gc/shared/gcCause.hpp"
+#include "gc/shared/gcUtil.hpp"
#include "memory/allocation.hpp"
#include "memory/universe.hpp"
@@ -542,4 +542,4 @@ class AdaptiveSizePolicyOutput : StackObj {
}
};
-#endif // SHARE_VM_GC_IMPLEMENTATION_SHARED_ADAPTIVESIZEPOLICY_HPP
+#endif // SHARE_VM_GC_SHARED_ADAPTIVESIZEPOLICY_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/shared/ageTable.cpp b/hotspot/src/share/vm/gc/shared/ageTable.cpp
similarity index 93%
rename from hotspot/src/share/vm/gc_implementation/shared/ageTable.cpp
rename to hotspot/src/share/vm/gc/shared/ageTable.cpp
index 709d3e18b27..0a6c189f94f 100644
--- a/hotspot/src/share/vm/gc_implementation/shared/ageTable.cpp
+++ b/hotspot/src/share/vm/gc/shared/ageTable.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -23,15 +23,15 @@
*/
#include "precompiled.hpp"
-#include "gc_implementation/shared/ageTable.hpp"
-#include "gc_implementation/shared/gcPolicyCounters.hpp"
-#include "gc_interface/collectedHeap.hpp"
-#include "memory/collectorPolicy.hpp"
+#include "gc/shared/ageTable.hpp"
+#include "gc/shared/collectedHeap.hpp"
+#include "gc/shared/collectorPolicy.hpp"
+#include "gc/shared/gcPolicyCounters.hpp"
#include "memory/resourceArea.hpp"
#include "runtime/atomic.inline.hpp"
#include "utilities/copy.hpp"
-/* Copyright (c) 1992-2009 Oracle and/or its affiliates, and Stanford University.
+/* Copyright (c) 1992, 2015, Oracle and/or its affiliates, and Stanford University.
See the LICENSE file for license information. */
ageTable::ageTable(bool global) {
diff --git a/hotspot/src/share/vm/gc_implementation/shared/ageTable.hpp b/hotspot/src/share/vm/gc/shared/ageTable.hpp
similarity index 87%
rename from hotspot/src/share/vm/gc_implementation/shared/ageTable.hpp
rename to hotspot/src/share/vm/gc/shared/ageTable.hpp
index 44587d99d62..2902822006b 100644
--- a/hotspot/src/share/vm/gc_implementation/shared/ageTable.hpp
+++ b/hotspot/src/share/vm/gc/shared/ageTable.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_IMPLEMENTATION_SHARED_AGETABLE_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_SHARED_AGETABLE_HPP
+#ifndef SHARE_VM_GC_SHARED_AGETABLE_HPP
+#define SHARE_VM_GC_SHARED_AGETABLE_HPP
#include "oops/markOop.hpp"
#include "oops/oop.hpp"
@@ -31,7 +31,7 @@
class GCPolicyCounters;
-/* Copyright (c) 1992-2009 Oracle and/or its affiliates, and Stanford University.
+/* Copyright (c) 1992, 2015, Oracle and/or its affiliates, and Stanford University.
See the LICENSE file for license information. */
// Age table for adaptive feedback-mediated tenuring (scavenging)
@@ -77,4 +77,4 @@ class ageTable VALUE_OBJ_CLASS_SPEC {
PerfVariable* _perf_sizes[table_size];
};
-#endif // SHARE_VM_GC_IMPLEMENTATION_SHARED_AGETABLE_HPP
+#endif // SHARE_VM_GC_SHARED_AGETABLE_HPP
diff --git a/hotspot/src/share/vm/gc_interface/allocTracer.cpp b/hotspot/src/share/vm/gc/shared/allocTracer.cpp
similarity index 93%
rename from hotspot/src/share/vm/gc_interface/allocTracer.cpp
rename to hotspot/src/share/vm/gc/shared/allocTracer.cpp
index d3440cd8534..4c6c30d75fd 100644
--- a/hotspot/src/share/vm/gc_interface/allocTracer.cpp
+++ b/hotspot/src/share/vm/gc/shared/allocTracer.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -23,9 +23,9 @@
*/
#include "precompiled.hpp"
-#include "gc_interface/allocTracer.hpp"
-#include "trace/tracing.hpp"
+#include "gc/shared/allocTracer.hpp"
#include "runtime/handles.hpp"
+#include "trace/tracing.hpp"
#include "utilities/globalDefinitions.hpp"
void AllocTracer::send_allocation_outside_tlab_event(KlassHandle klass, size_t alloc_size) {
diff --git a/hotspot/src/share/vm/gc_interface/allocTracer.hpp b/hotspot/src/share/vm/gc/shared/allocTracer.hpp
similarity index 85%
rename from hotspot/src/share/vm/gc_interface/allocTracer.hpp
rename to hotspot/src/share/vm/gc/shared/allocTracer.hpp
index 33e6f19f3a8..9271ff3fbe1 100644
--- a/hotspot/src/share/vm/gc_interface/allocTracer.hpp
+++ b/hotspot/src/share/vm/gc/shared/allocTracer.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_INTERFACE_ALLOCTRACER_HPP
-#define SHARE_VM_GC_INTERFACE_ALLOCTRACER_HPP
+#ifndef SHARE_VM_GC_SHARED_ALLOCTRACER_HPP
+#define SHARE_VM_GC_SHARED_ALLOCTRACER_HPP
#include "memory/allocation.hpp"
#include "runtime/handles.hpp"
@@ -34,4 +34,4 @@ class AllocTracer : AllStatic {
static void send_allocation_in_new_tlab_event(KlassHandle klass, size_t tlab_size, size_t alloc_size);
};
-#endif /* SHARE_VM_GC_INTERFACE_ALLOCTRACER_HPP */
+#endif /* SHARE_VM_GC_SHARED_ALLOCTRACER_HPP */
diff --git a/hotspot/src/share/vm/memory/barrierSet.cpp b/hotspot/src/share/vm/gc/shared/barrierSet.cpp
similarity index 92%
rename from hotspot/src/share/vm/memory/barrierSet.cpp
rename to hotspot/src/share/vm/gc/shared/barrierSet.cpp
index 8cd966f5fc9..6b60fed1aaa 100644
--- a/hotspot/src/share/vm/memory/barrierSet.cpp
+++ b/hotspot/src/share/vm/gc/shared/barrierSet.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -23,8 +23,8 @@
*/
#include "precompiled.hpp"
-#include "gc_interface/collectedHeap.hpp"
-#include "memory/barrierSet.inline.hpp"
+#include "gc/shared/barrierSet.inline.hpp"
+#include "gc/shared/collectedHeap.hpp"
#include "memory/universe.hpp"
// count is number of array elements being written
diff --git a/hotspot/src/share/vm/memory/barrierSet.hpp b/hotspot/src/share/vm/gc/shared/barrierSet.hpp
similarity index 98%
rename from hotspot/src/share/vm/memory/barrierSet.hpp
rename to hotspot/src/share/vm/gc/shared/barrierSet.hpp
index 12591db754b..0267ef63b30 100644
--- a/hotspot/src/share/vm/memory/barrierSet.hpp
+++ b/hotspot/src/share/vm/gc/shared/barrierSet.hpp
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_MEMORY_BARRIERSET_HPP
-#define SHARE_VM_MEMORY_BARRIERSET_HPP
+#ifndef SHARE_VM_GC_SHARED_BARRIERSET_HPP
+#define SHARE_VM_GC_SHARED_BARRIERSET_HPP
#include "memory/memRegion.hpp"
#include "oops/oopsHierarchy.hpp"
@@ -218,4 +218,4 @@ inline T* barrier_set_cast(BarrierSet* bs) {
return static_cast(bs);
}
-#endif // SHARE_VM_MEMORY_BARRIERSET_HPP
+#endif // SHARE_VM_GC_SHARED_BARRIERSET_HPP
diff --git a/hotspot/src/share/vm/memory/barrierSet.inline.hpp b/hotspot/src/share/vm/gc/shared/barrierSet.inline.hpp
similarity index 93%
rename from hotspot/src/share/vm/memory/barrierSet.inline.hpp
rename to hotspot/src/share/vm/gc/shared/barrierSet.inline.hpp
index 98437abf188..14bc00cc104 100644
--- a/hotspot/src/share/vm/memory/barrierSet.inline.hpp
+++ b/hotspot/src/share/vm/gc/shared/barrierSet.inline.hpp
@@ -22,11 +22,11 @@
*
*/
-#ifndef SHARE_VM_MEMORY_BARRIERSET_INLINE_HPP
-#define SHARE_VM_MEMORY_BARRIERSET_INLINE_HPP
+#ifndef SHARE_VM_GC_SHARED_BARRIERSET_INLINE_HPP
+#define SHARE_VM_GC_SHARED_BARRIERSET_INLINE_HPP
-#include "memory/barrierSet.hpp"
-#include "memory/cardTableModRefBS.inline.hpp"
+#include "gc/shared/barrierSet.hpp"
+#include "gc/shared/cardTableModRefBS.inline.hpp"
// Inline functions of BarrierSet, which de-virtualize certain
// performance-critical calls when the barrier is the most common
@@ -84,4 +84,4 @@ inline void BarrierSet::write_region(MemRegion mr) {
}
}
-#endif // SHARE_VM_MEMORY_BARRIERSET_INLINE_HPP
+#endif // SHARE_VM_GC_SHARED_BARRIERSET_INLINE_HPP
diff --git a/hotspot/src/share/vm/memory/blockOffsetTable.cpp b/hotspot/src/share/vm/gc/shared/blockOffsetTable.cpp
similarity index 99%
rename from hotspot/src/share/vm/memory/blockOffsetTable.cpp
rename to hotspot/src/share/vm/gc/shared/blockOffsetTable.cpp
index b02d4d12c00..dee7be12306 100644
--- a/hotspot/src/share/vm/memory/blockOffsetTable.cpp
+++ b/hotspot/src/share/vm/gc/shared/blockOffsetTable.cpp
@@ -23,10 +23,10 @@
*/
#include "precompiled.hpp"
-#include "gc_interface/collectedHeap.inline.hpp"
-#include "memory/blockOffsetTable.inline.hpp"
+#include "gc/shared/blockOffsetTable.inline.hpp"
+#include "gc/shared/collectedHeap.inline.hpp"
+#include "gc/shared/space.inline.hpp"
#include "memory/iterator.hpp"
-#include "memory/space.inline.hpp"
#include "memory/universe.hpp"
#include "oops/oop.inline.hpp"
#include "runtime/java.hpp"
diff --git a/hotspot/src/share/vm/memory/blockOffsetTable.hpp b/hotspot/src/share/vm/gc/shared/blockOffsetTable.hpp
similarity index 99%
rename from hotspot/src/share/vm/memory/blockOffsetTable.hpp
rename to hotspot/src/share/vm/gc/shared/blockOffsetTable.hpp
index 8f0372941d9..154f36601cf 100644
--- a/hotspot/src/share/vm/memory/blockOffsetTable.hpp
+++ b/hotspot/src/share/vm/gc/shared/blockOffsetTable.hpp
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_MEMORY_BLOCKOFFSETTABLE_HPP
-#define SHARE_VM_MEMORY_BLOCKOFFSETTABLE_HPP
+#ifndef SHARE_VM_GC_SHARED_BLOCKOFFSETTABLE_HPP
+#define SHARE_VM_GC_SHARED_BLOCKOFFSETTABLE_HPP
#include "memory/memRegion.hpp"
#include "memory/virtualspace.hpp"
@@ -557,4 +557,4 @@ class BlockOffsetArrayContigSpace: public BlockOffsetArray {
virtual size_t last_active_index() const;
};
-#endif // SHARE_VM_MEMORY_BLOCKOFFSETTABLE_HPP
+#endif // SHARE_VM_GC_SHARED_BLOCKOFFSETTABLE_HPP
diff --git a/hotspot/src/share/vm/memory/blockOffsetTable.inline.hpp b/hotspot/src/share/vm/gc/shared/blockOffsetTable.inline.hpp
similarity index 92%
rename from hotspot/src/share/vm/memory/blockOffsetTable.inline.hpp
rename to hotspot/src/share/vm/gc/shared/blockOffsetTable.inline.hpp
index 820567c55ee..4014927c6b6 100644
--- a/hotspot/src/share/vm/memory/blockOffsetTable.inline.hpp
+++ b/hotspot/src/share/vm/gc/shared/blockOffsetTable.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,11 +22,11 @@
*
*/
-#ifndef SHARE_VM_MEMORY_BLOCKOFFSETTABLE_INLINE_HPP
-#define SHARE_VM_MEMORY_BLOCKOFFSETTABLE_INLINE_HPP
+#ifndef SHARE_VM_GC_SHARED_BLOCKOFFSETTABLE_INLINE_HPP
+#define SHARE_VM_GC_SHARED_BLOCKOFFSETTABLE_INLINE_HPP
-#include "memory/blockOffsetTable.hpp"
-#include "memory/space.hpp"
+#include "gc/shared/blockOffsetTable.hpp"
+#include "gc/shared/space.hpp"
#include "runtime/safepoint.hpp"
//////////////////////////////////////////////////////////////////////////
@@ -96,4 +96,4 @@ inline void BlockOffsetArrayNonContigSpace::freed(HeapWord* blk_start,
}
}
-#endif // SHARE_VM_MEMORY_BLOCKOFFSETTABLE_INLINE_HPP
+#endif // SHARE_VM_GC_SHARED_BLOCKOFFSETTABLE_INLINE_HPP
diff --git a/hotspot/src/share/vm/memory/cardGeneration.cpp b/hotspot/src/share/vm/gc/shared/cardGeneration.cpp
similarity index 98%
rename from hotspot/src/share/vm/memory/cardGeneration.cpp
rename to hotspot/src/share/vm/gc/shared/cardGeneration.cpp
index 25f317c49bc..09285cf466f 100644
--- a/hotspot/src/share/vm/memory/cardGeneration.cpp
+++ b/hotspot/src/share/vm/gc/shared/cardGeneration.cpp
@@ -24,15 +24,15 @@
#include "precompiled.hpp"
-#include "memory/blockOffsetTable.inline.hpp"
-#include "memory/cardGeneration.inline.hpp"
-#include "memory/gcLocker.hpp"
-#include "memory/generationSpec.hpp"
-#include "memory/genOopClosures.inline.hpp"
-#include "memory/genRemSet.hpp"
+#include "gc/shared/blockOffsetTable.inline.hpp"
+#include "gc/shared/cardGeneration.inline.hpp"
+#include "gc/shared/gcLocker.hpp"
+#include "gc/shared/genOopClosures.inline.hpp"
+#include "gc/shared/genRemSet.hpp"
+#include "gc/shared/generationSpec.hpp"
+#include "gc/shared/space.inline.hpp"
#include "memory/iterator.hpp"
#include "memory/memRegion.hpp"
-#include "memory/space.inline.hpp"
#include "runtime/java.hpp"
CardGeneration::CardGeneration(ReservedSpace rs, size_t initial_byte_size,
diff --git a/hotspot/src/share/vm/memory/cardGeneration.hpp b/hotspot/src/share/vm/gc/shared/cardGeneration.hpp
similarity index 92%
rename from hotspot/src/share/vm/memory/cardGeneration.hpp
rename to hotspot/src/share/vm/gc/shared/cardGeneration.hpp
index 24d0fa0f2c2..efc2656d4f1 100644
--- a/hotspot/src/share/vm/memory/cardGeneration.hpp
+++ b/hotspot/src/share/vm/gc/shared/cardGeneration.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,13 +22,13 @@
*
*/
-#ifndef SHARE_VM_MEMORY_CARDGENERATION_HPP
-#define SHARE_VM_MEMORY_CARDGENERATION_HPP
+#ifndef SHARE_VM_GC_SHARED_CARDGENERATION_HPP
+#define SHARE_VM_GC_SHARED_CARDGENERATION_HPP
// Class CardGeneration is a generation that is covered by a card table,
// and uses a card-size block-offset array to implement block_start.
-#include "memory/generation.hpp"
+#include "gc/shared/generation.hpp"
class BlockOffsetSharedArray;
class CompactibleSpace;
@@ -96,4 +96,4 @@ class CardGeneration: public Generation {
CompactibleSpace* first_compaction_space() const;
};
-#endif // SHARE_VM_MEMORY_CARDGENERATION_HPP
+#endif // SHARE_VM_GC_SHARED_CARDGENERATION_HPP
diff --git a/hotspot/src/share/vm/memory/cardGeneration.inline.hpp b/hotspot/src/share/vm/gc/shared/cardGeneration.inline.hpp
similarity index 82%
rename from hotspot/src/share/vm/memory/cardGeneration.inline.hpp
rename to hotspot/src/share/vm/gc/shared/cardGeneration.inline.hpp
index fb49d0d0718..e24b340c630 100644
--- a/hotspot/src/share/vm/memory/cardGeneration.inline.hpp
+++ b/hotspot/src/share/vm/gc/shared/cardGeneration.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,11 +22,11 @@
*
*/
-#ifndef SHARE_VM_MEMORY_CARDGENERATION_INLINE_HPP
-#define SHARE_VM_MEMORY_CARDGENERATION_INLINE_HPP
+#ifndef SHARE_VM_GC_SHARED_CARDGENERATION_INLINE_HPP
+#define SHARE_VM_GC_SHARED_CARDGENERATION_INLINE_HPP
-#include "memory/cardGeneration.hpp"
-#include "memory/space.hpp"
+#include "gc/shared/cardGeneration.hpp"
+#include "gc/shared/space.hpp"
inline size_t CardGeneration::capacity() const {
return space()->capacity();
@@ -52,4 +52,4 @@ inline CompactibleSpace* CardGeneration::first_compaction_space() const {
return space();
}
-#endif // SHARE_VM_MEMORY_CARDGENERATION_INLINE_HPP
+#endif // SHARE_VM_GC_SHARED_CARDGENERATION_INLINE_HPP
diff --git a/hotspot/src/share/vm/memory/cardTableModRefBS.cpp b/hotspot/src/share/vm/gc/shared/cardTableModRefBS.cpp
similarity index 99%
rename from hotspot/src/share/vm/memory/cardTableModRefBS.cpp
rename to hotspot/src/share/vm/gc/shared/cardTableModRefBS.cpp
index 903b0a0eee3..61d2df3862c 100644
--- a/hotspot/src/share/vm/memory/cardTableModRefBS.cpp
+++ b/hotspot/src/share/vm/gc/shared/cardTableModRefBS.cpp
@@ -23,13 +23,13 @@
*/
#include "precompiled.hpp"
-#include "gc_interface/collectedHeap.hpp"
+#include "gc/shared/cardTableModRefBS.inline.hpp"
+#include "gc/shared/cardTableRS.hpp"
+#include "gc/shared/collectedHeap.hpp"
+#include "gc/shared/genCollectedHeap.hpp"
+#include "gc/shared/space.hpp"
+#include "gc/shared/space.inline.hpp"
#include "memory/allocation.inline.hpp"
-#include "memory/cardTableModRefBS.inline.hpp"
-#include "memory/cardTableRS.hpp"
-#include "memory/genCollectedHeap.hpp"
-#include "memory/space.hpp"
-#include "memory/space.inline.hpp"
#include "memory/universe.hpp"
#include "memory/virtualspace.hpp"
#include "runtime/java.hpp"
diff --git a/hotspot/src/share/vm/memory/cardTableModRefBS.hpp b/hotspot/src/share/vm/gc/shared/cardTableModRefBS.hpp
similarity index 98%
rename from hotspot/src/share/vm/memory/cardTableModRefBS.hpp
rename to hotspot/src/share/vm/gc/shared/cardTableModRefBS.hpp
index 97ce901ab80..abba92ca9e3 100644
--- a/hotspot/src/share/vm/memory/cardTableModRefBS.hpp
+++ b/hotspot/src/share/vm/gc/shared/cardTableModRefBS.hpp
@@ -22,10 +22,10 @@
*
*/
-#ifndef SHARE_VM_MEMORY_CARDTABLEMODREFBS_HPP
-#define SHARE_VM_MEMORY_CARDTABLEMODREFBS_HPP
+#ifndef SHARE_VM_GC_SHARED_CARDTABLEMODREFBS_HPP
+#define SHARE_VM_GC_SHARED_CARDTABLEMODREFBS_HPP
-#include "memory/modRefBarrierSet.hpp"
+#include "gc/shared/modRefBarrierSet.hpp"
#include "oops/oop.hpp"
// This kind of "BarrierSet" allows a "CollectedHeap" to detect and
@@ -465,4 +465,4 @@ struct BarrierSet::GetName {
};
-#endif // SHARE_VM_MEMORY_CARDTABLEMODREFBS_HPP
+#endif // SHARE_VM_GC_SHARED_CARDTABLEMODREFBS_HPP
diff --git a/hotspot/src/share/vm/memory/cardTableModRefBS.inline.hpp b/hotspot/src/share/vm/gc/shared/cardTableModRefBS.inline.hpp
similarity index 87%
rename from hotspot/src/share/vm/memory/cardTableModRefBS.inline.hpp
rename to hotspot/src/share/vm/gc/shared/cardTableModRefBS.inline.hpp
index 0f758afb7b5..7b01a379558 100644
--- a/hotspot/src/share/vm/memory/cardTableModRefBS.inline.hpp
+++ b/hotspot/src/share/vm/gc/shared/cardTableModRefBS.inline.hpp
@@ -22,10 +22,10 @@
*
*/
-#ifndef SHARE_VM_MEMORY_CARDTABLEMODREFBS_INLINE_HPP
-#define SHARE_VM_MEMORY_CARDTABLEMODREFBS_INLINE_HPP
+#ifndef SHARE_VM_GC_SHARED_CARDTABLEMODREFBS_INLINE_HPP
+#define SHARE_VM_GC_SHARED_CARDTABLEMODREFBS_INLINE_HPP
-#include "memory/cardTableModRefBS.hpp"
+#include "gc/shared/cardTableModRefBS.hpp"
#include "oops/oopsHierarchy.hpp"
#include "runtime/orderAccess.inline.hpp"
@@ -39,4 +39,4 @@ template inline void CardTableModRefBS::inline_write_ref_field(T* fiel
}
}
-#endif // SHARE_VM_MEMORY_CARDTABLEMODREFBS_INLINE_HPP
+#endif // SHARE_VM_GC_SHARED_CARDTABLEMODREFBS_INLINE_HPP
diff --git a/hotspot/src/share/vm/memory/cardTableRS.cpp b/hotspot/src/share/vm/gc/shared/cardTableRS.cpp
similarity index 99%
rename from hotspot/src/share/vm/memory/cardTableRS.cpp
rename to hotspot/src/share/vm/gc/shared/cardTableRS.cpp
index bd3604916d8..880effd5b6d 100644
--- a/hotspot/src/share/vm/memory/cardTableRS.cpp
+++ b/hotspot/src/share/vm/gc/shared/cardTableRS.cpp
@@ -23,11 +23,11 @@
*/
#include "precompiled.hpp"
+#include "gc/shared/cardTableRS.hpp"
+#include "gc/shared/genCollectedHeap.hpp"
+#include "gc/shared/generation.hpp"
+#include "gc/shared/space.inline.hpp"
#include "memory/allocation.inline.hpp"
-#include "memory/cardTableRS.hpp"
-#include "memory/genCollectedHeap.hpp"
-#include "memory/generation.hpp"
-#include "memory/space.inline.hpp"
#include "oops/oop.inline.hpp"
#include "runtime/atomic.inline.hpp"
#include "runtime/java.hpp"
diff --git a/hotspot/src/share/vm/memory/cardTableRS.hpp b/hotspot/src/share/vm/gc/shared/cardTableRS.hpp
similarity index 95%
rename from hotspot/src/share/vm/memory/cardTableRS.hpp
rename to hotspot/src/share/vm/gc/shared/cardTableRS.hpp
index cf3288a100d..98a1fca47fc 100644
--- a/hotspot/src/share/vm/memory/cardTableRS.hpp
+++ b/hotspot/src/share/vm/gc/shared/cardTableRS.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,11 +22,11 @@
*
*/
-#ifndef SHARE_VM_MEMORY_CARDTABLERS_HPP
-#define SHARE_VM_MEMORY_CARDTABLERS_HPP
+#ifndef SHARE_VM_GC_SHARED_CARDTABLERS_HPP
+#define SHARE_VM_GC_SHARED_CARDTABLERS_HPP
-#include "memory/cardTableModRefBS.hpp"
-#include "memory/genRemSet.hpp"
+#include "gc/shared/cardTableModRefBS.hpp"
+#include "gc/shared/genRemSet.hpp"
#include "memory/memRegion.hpp"
class Space;
@@ -187,4 +187,4 @@ public:
void do_MemRegion(MemRegion mr);
};
-#endif // SHARE_VM_MEMORY_CARDTABLERS_HPP
+#endif // SHARE_VM_GC_SHARED_CARDTABLERS_HPP
diff --git a/hotspot/src/share/vm/gc_interface/collectedHeap.cpp b/hotspot/src/share/vm/gc/shared/collectedHeap.cpp
similarity index 98%
rename from hotspot/src/share/vm/gc_interface/collectedHeap.cpp
rename to hotspot/src/share/vm/gc/shared/collectedHeap.cpp
index 2698adcd9f6..663588051de 100644
--- a/hotspot/src/share/vm/gc_interface/collectedHeap.cpp
+++ b/hotspot/src/share/vm/gc/shared/collectedHeap.cpp
@@ -24,18 +24,18 @@
#include "precompiled.hpp"
#include "classfile/systemDictionary.hpp"
-#include "gc_implementation/shared/gcHeapSummary.hpp"
-#include "gc_implementation/shared/gcTrace.hpp"
-#include "gc_implementation/shared/gcTraceTime.hpp"
-#include "gc_implementation/shared/gcWhen.hpp"
-#include "gc_implementation/shared/vmGCOperations.hpp"
-#include "gc_interface/allocTracer.hpp"
-#include "gc_interface/collectedHeap.hpp"
-#include "gc_interface/collectedHeap.inline.hpp"
-#include "memory/barrierSet.inline.hpp"
+#include "gc/shared/allocTracer.hpp"
+#include "gc/shared/barrierSet.inline.hpp"
+#include "gc/shared/collectedHeap.hpp"
+#include "gc/shared/collectedHeap.inline.hpp"
+#include "gc/shared/gcHeapSummary.hpp"
+#include "gc/shared/gcTrace.hpp"
+#include "gc/shared/gcTraceTime.hpp"
+#include "gc/shared/gcWhen.hpp"
+#include "gc/shared/vmGCOperations.hpp"
#include "memory/metaspace.hpp"
-#include "oops/oop.inline.hpp"
#include "oops/instanceMirrorKlass.hpp"
+#include "oops/oop.inline.hpp"
#include "runtime/init.hpp"
#include "runtime/thread.inline.hpp"
#include "services/heapDumper.hpp"
diff --git a/hotspot/src/share/vm/gc_interface/collectedHeap.hpp b/hotspot/src/share/vm/gc/shared/collectedHeap.hpp
similarity index 99%
rename from hotspot/src/share/vm/gc_interface/collectedHeap.hpp
rename to hotspot/src/share/vm/gc/shared/collectedHeap.hpp
index ccb8a41c5ac..076fcadf868 100644
--- a/hotspot/src/share/vm/gc_interface/collectedHeap.hpp
+++ b/hotspot/src/share/vm/gc/shared/collectedHeap.hpp
@@ -22,11 +22,11 @@
*
*/
-#ifndef SHARE_VM_GC_INTERFACE_COLLECTEDHEAP_HPP
-#define SHARE_VM_GC_INTERFACE_COLLECTEDHEAP_HPP
+#ifndef SHARE_VM_GC_SHARED_COLLECTEDHEAP_HPP
+#define SHARE_VM_GC_SHARED_COLLECTEDHEAP_HPP
-#include "gc_interface/gcCause.hpp"
-#include "gc_implementation/shared/gcWhen.hpp"
+#include "gc/shared/gcCause.hpp"
+#include "gc/shared/gcWhen.hpp"
#include "memory/allocation.hpp"
#include "runtime/handles.hpp"
#include "runtime/perfData.hpp"
@@ -636,4 +636,4 @@ class GCCauseSetter : StackObj {
}
};
-#endif // SHARE_VM_GC_INTERFACE_COLLECTEDHEAP_HPP
+#endif // SHARE_VM_GC_SHARED_COLLECTEDHEAP_HPP
diff --git a/hotspot/src/share/vm/gc_interface/collectedHeap.inline.hpp b/hotspot/src/share/vm/gc/shared/collectedHeap.inline.hpp
similarity index 96%
rename from hotspot/src/share/vm/gc_interface/collectedHeap.inline.hpp
rename to hotspot/src/share/vm/gc/shared/collectedHeap.inline.hpp
index 2b938a1d194..726990908cc 100644
--- a/hotspot/src/share/vm/gc_interface/collectedHeap.inline.hpp
+++ b/hotspot/src/share/vm/gc/shared/collectedHeap.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,12 +22,12 @@
*
*/
-#ifndef SHARE_VM_GC_INTERFACE_COLLECTEDHEAP_INLINE_HPP
-#define SHARE_VM_GC_INTERFACE_COLLECTEDHEAP_INLINE_HPP
+#ifndef SHARE_VM_GC_SHARED_COLLECTEDHEAP_INLINE_HPP
+#define SHARE_VM_GC_SHARED_COLLECTEDHEAP_INLINE_HPP
-#include "gc_interface/allocTracer.hpp"
-#include "gc_interface/collectedHeap.hpp"
-#include "memory/threadLocalAllocBuffer.inline.hpp"
+#include "gc/shared/allocTracer.hpp"
+#include "gc/shared/collectedHeap.hpp"
+#include "gc/shared/threadLocalAllocBuffer.inline.hpp"
#include "memory/universe.hpp"
#include "oops/arrayOop.hpp"
#include "prims/jvmtiExport.hpp"
@@ -308,4 +308,4 @@ inline void CollectedHeap::reset_promotion_should_fail() {
}
#endif // #ifndef PRODUCT
-#endif // SHARE_VM_GC_INTERFACE_COLLECTEDHEAP_INLINE_HPP
+#endif // SHARE_VM_GC_SHARED_COLLECTEDHEAP_INLINE_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/shared/collectorCounters.cpp b/hotspot/src/share/vm/gc/shared/collectorCounters.cpp
similarity index 95%
rename from hotspot/src/share/vm/gc_implementation/shared/collectorCounters.cpp
rename to hotspot/src/share/vm/gc/shared/collectorCounters.cpp
index 76468b7d1f3..b204a02e272 100644
--- a/hotspot/src/share/vm/gc_implementation/shared/collectorCounters.cpp
+++ b/hotspot/src/share/vm/gc/shared/collectorCounters.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
*/
#include "precompiled.hpp"
-#include "gc_implementation/shared/collectorCounters.hpp"
+#include "gc/shared/collectorCounters.hpp"
#include "memory/resourceArea.hpp"
CollectorCounters::CollectorCounters(const char* name, int ordinal) {
diff --git a/hotspot/src/share/vm/gc_implementation/shared/collectorCounters.hpp b/hotspot/src/share/vm/gc/shared/collectorCounters.hpp
similarity index 90%
rename from hotspot/src/share/vm/gc_implementation/shared/collectorCounters.hpp
rename to hotspot/src/share/vm/gc/shared/collectorCounters.hpp
index 30fe32e6ea8..554d749e0cc 100644
--- a/hotspot/src/share/vm/gc_implementation/shared/collectorCounters.hpp
+++ b/hotspot/src/share/vm/gc/shared/collectorCounters.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_IMPLEMENTATION_SHARED_COLLECTORCOUNTERS_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_SHARED_COLLECTORCOUNTERS_HPP
+#ifndef SHARE_VM_GC_SHARED_COLLECTORCOUNTERS_HPP
+#define SHARE_VM_GC_SHARED_COLLECTORCOUNTERS_HPP
#include "runtime/perfData.hpp"
@@ -84,4 +84,4 @@ class TraceCollectorStats: public PerfTraceTimedEvent {
}
};
-#endif // SHARE_VM_GC_IMPLEMENTATION_SHARED_COLLECTORCOUNTERS_HPP
+#endif // SHARE_VM_GC_SHARED_COLLECTORCOUNTERS_HPP
diff --git a/hotspot/src/share/vm/memory/collectorPolicy.cpp b/hotspot/src/share/vm/gc/shared/collectorPolicy.cpp
similarity index 99%
rename from hotspot/src/share/vm/memory/collectorPolicy.cpp
rename to hotspot/src/share/vm/gc/shared/collectorPolicy.cpp
index 08464c513eb..5b5940250fc 100644
--- a/hotspot/src/share/vm/memory/collectorPolicy.cpp
+++ b/hotspot/src/share/vm/gc/shared/collectorPolicy.cpp
@@ -23,15 +23,15 @@
*/
#include "precompiled.hpp"
-#include "gc_implementation/shared/adaptiveSizePolicy.hpp"
-#include "gc_implementation/shared/gcPolicyCounters.hpp"
-#include "gc_implementation/shared/vmGCOperations.hpp"
-#include "memory/cardTableRS.hpp"
-#include "memory/collectorPolicy.hpp"
-#include "memory/gcLocker.inline.hpp"
-#include "memory/genCollectedHeap.hpp"
-#include "memory/generationSpec.hpp"
-#include "memory/space.hpp"
+#include "gc/shared/adaptiveSizePolicy.hpp"
+#include "gc/shared/cardTableRS.hpp"
+#include "gc/shared/collectorPolicy.hpp"
+#include "gc/shared/gcLocker.inline.hpp"
+#include "gc/shared/gcPolicyCounters.hpp"
+#include "gc/shared/genCollectedHeap.hpp"
+#include "gc/shared/generationSpec.hpp"
+#include "gc/shared/space.hpp"
+#include "gc/shared/vmGCOperations.hpp"
#include "memory/universe.hpp"
#include "runtime/arguments.hpp"
#include "runtime/globals_extension.hpp"
diff --git a/hotspot/src/share/vm/memory/collectorPolicy.hpp b/hotspot/src/share/vm/gc/shared/collectorPolicy.hpp
similarity index 97%
rename from hotspot/src/share/vm/memory/collectorPolicy.hpp
rename to hotspot/src/share/vm/gc/shared/collectorPolicy.hpp
index 365a0ebe734..97713e27a7e 100644
--- a/hotspot/src/share/vm/memory/collectorPolicy.hpp
+++ b/hotspot/src/share/vm/gc/shared/collectorPolicy.hpp
@@ -22,13 +22,13 @@
*
*/
-#ifndef SHARE_VM_MEMORY_COLLECTORPOLICY_HPP
-#define SHARE_VM_MEMORY_COLLECTORPOLICY_HPP
+#ifndef SHARE_VM_GC_SHARED_COLLECTORPOLICY_HPP
+#define SHARE_VM_GC_SHARED_COLLECTORPOLICY_HPP
+#include "gc/shared/barrierSet.hpp"
+#include "gc/shared/genRemSet.hpp"
+#include "gc/shared/generationSpec.hpp"
#include "memory/allocation.hpp"
-#include "memory/barrierSet.hpp"
-#include "memory/generationSpec.hpp"
-#include "memory/genRemSet.hpp"
#include "utilities/macros.hpp"
// This class (or more correctly, subtypes of this class)
@@ -319,4 +319,4 @@ class MarkSweepPolicy : public GenCollectorPolicy {
void initialize_gc_policy_counters();
};
-#endif // SHARE_VM_MEMORY_COLLECTORPOLICY_HPP
+#endif // SHARE_VM_GC_SHARED_COLLECTORPOLICY_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/shared/concurrentGCThread.cpp b/hotspot/src/share/vm/gc/shared/concurrentGCThread.cpp
similarity index 99%
rename from hotspot/src/share/vm/gc_implementation/shared/concurrentGCThread.cpp
rename to hotspot/src/share/vm/gc/shared/concurrentGCThread.cpp
index 9002cd06f26..ce4e74875ca 100644
--- a/hotspot/src/share/vm/gc_implementation/shared/concurrentGCThread.cpp
+++ b/hotspot/src/share/vm/gc/shared/concurrentGCThread.cpp
@@ -24,7 +24,7 @@
#include "precompiled.hpp"
#include "classfile/systemDictionary.hpp"
-#include "gc_implementation/shared/concurrentGCThread.hpp"
+#include "gc/shared/concurrentGCThread.hpp"
#include "oops/instanceRefKlass.hpp"
#include "oops/oop.inline.hpp"
#include "runtime/init.hpp"
diff --git a/hotspot/src/share/vm/gc_implementation/shared/concurrentGCThread.hpp b/hotspot/src/share/vm/gc/shared/concurrentGCThread.hpp
similarity index 90%
rename from hotspot/src/share/vm/gc_implementation/shared/concurrentGCThread.hpp
rename to hotspot/src/share/vm/gc/shared/concurrentGCThread.hpp
index e87228b238c..6689a4e7559 100644
--- a/hotspot/src/share/vm/gc_implementation/shared/concurrentGCThread.hpp
+++ b/hotspot/src/share/vm/gc/shared/concurrentGCThread.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,12 +22,12 @@
*
*/
-#ifndef SHARE_VM_GC_IMPLEMENTATION_SHARED_CONCURRENTGCTHREAD_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_SHARED_CONCURRENTGCTHREAD_HPP
+#ifndef SHARE_VM_GC_SHARED_CONCURRENTGCTHREAD_HPP
+#define SHARE_VM_GC_SHARED_CONCURRENTGCTHREAD_HPP
-#include "utilities/macros.hpp"
-#include "gc_implementation/shared/suspendibleThreadSet.hpp"
+#include "gc/g1/suspendibleThreadSet.hpp"
#include "runtime/thread.hpp"
+#include "utilities/macros.hpp"
class ConcurrentGCThread: public NamedThread {
friend class VMStructs;
@@ -106,4 +106,4 @@ class SurrogateLockerThread: public JavaThread {
};
-#endif // SHARE_VM_GC_IMPLEMENTATION_SHARED_CONCURRENTGCTHREAD_HPP
+#endif // SHARE_VM_GC_SHARED_CONCURRENTGCTHREAD_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/shared/copyFailedInfo.hpp b/hotspot/src/share/vm/gc/shared/copyFailedInfo.hpp
similarity index 91%
rename from hotspot/src/share/vm/gc_implementation/shared/copyFailedInfo.hpp
rename to hotspot/src/share/vm/gc/shared/copyFailedInfo.hpp
index 2f30f5e8f16..7d96a03413b 100644
--- a/hotspot/src/share/vm/gc_implementation/shared/copyFailedInfo.hpp
+++ b/hotspot/src/share/vm/gc/shared/copyFailedInfo.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_IMPLEMENTATION_SHARED_COPYFAILEDINFO_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_SHARED_COPYFAILEDINFO_HPP
+#ifndef SHARE_VM_GC_SHARED_COPYFAILEDINFO_HPP
+#define SHARE_VM_GC_SHARED_COPYFAILEDINFO_HPP
#include "runtime/thread.hpp"
#include "utilities/globalDefinitions.hpp"
@@ -87,4 +87,4 @@ class PromotionFailedInfo : public CopyFailedInfo {
class EvacuationFailedInfo : public CopyFailedInfo {};
-#endif /* SHARE_VM_GC_IMPLEMENTATION_SHARED_COPYFAILEDINFO_HPP */
+#endif /* SHARE_VM_GC_SHARED_COPYFAILEDINFO_HPP */
diff --git a/hotspot/src/share/vm/gc_interface/gcCause.cpp b/hotspot/src/share/vm/gc/shared/gcCause.cpp
similarity index 96%
rename from hotspot/src/share/vm/gc_interface/gcCause.cpp
rename to hotspot/src/share/vm/gc/shared/gcCause.cpp
index a364214bdd2..e7fd667dc0c 100644
--- a/hotspot/src/share/vm/gc_interface/gcCause.cpp
+++ b/hotspot/src/share/vm/gc/shared/gcCause.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
*/
#include "precompiled.hpp"
-#include "gc_interface/gcCause.hpp"
+#include "gc/shared/gcCause.hpp"
const char* GCCause::to_string(GCCause::Cause cause) {
switch (cause) {
diff --git a/hotspot/src/share/vm/gc_interface/gcCause.hpp b/hotspot/src/share/vm/gc/shared/gcCause.hpp
similarity index 95%
rename from hotspot/src/share/vm/gc_interface/gcCause.hpp
rename to hotspot/src/share/vm/gc/shared/gcCause.hpp
index cb304294639..88dc37fe2a2 100644
--- a/hotspot/src/share/vm/gc_interface/gcCause.hpp
+++ b/hotspot/src/share/vm/gc/shared/gcCause.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_INTERFACE_GCCAUSE_HPP
-#define SHARE_VM_GC_INTERFACE_GCCAUSE_HPP
+#ifndef SHARE_VM_GC_SHARED_GCCAUSE_HPP
+#define SHARE_VM_GC_SHARED_GCCAUSE_HPP
#include "memory/allocation.hpp"
@@ -125,4 +125,4 @@ class GCCauseString : StackObj {
}
};
-#endif // SHARE_VM_GC_INTERFACE_GCCAUSE_HPP
+#endif // SHARE_VM_GC_SHARED_GCCAUSE_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/shared/gcHeapSummary.hpp b/hotspot/src/share/vm/gc/shared/gcHeapSummary.hpp
similarity index 96%
rename from hotspot/src/share/vm/gc_implementation/shared/gcHeapSummary.hpp
rename to hotspot/src/share/vm/gc/shared/gcHeapSummary.hpp
index 23cb113c11b..063f2f5a849 100644
--- a/hotspot/src/share/vm/gc_implementation/shared/gcHeapSummary.hpp
+++ b/hotspot/src/share/vm/gc/shared/gcHeapSummary.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_IMPLEMENTATION_SHARED_GCHEAPSUMMARY_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_SHARED_GCHEAPSUMMARY_HPP
+#ifndef SHARE_VM_GC_SHARED_GCHEAPSUMMARY_HPP
+#define SHARE_VM_GC_SHARED_GCHEAPSUMMARY_HPP
#include "memory/allocation.hpp"
#include "memory/metaspaceChunkFreeListSummary.hpp"
@@ -171,4 +171,4 @@ class MetaspaceSummary : public StackObj {
};
-#endif // SHARE_VM_GC_IMPLEMENTATION_SHARED_GCHEAPSUMMARY_HPP
+#endif // SHARE_VM_GC_SHARED_GCHEAPSUMMARY_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/shared/gcId.cpp b/hotspot/src/share/vm/gc/shared/gcId.cpp
similarity index 91%
rename from hotspot/src/share/vm/gc_implementation/shared/gcId.cpp
rename to hotspot/src/share/vm/gc/shared/gcId.cpp
index ced64a46204..811f3988614 100644
--- a/hotspot/src/share/vm/gc_implementation/shared/gcId.cpp
+++ b/hotspot/src/share/vm/gc/shared/gcId.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
*/
#include "precompiled.hpp"
-#include "gc_implementation/shared/gcId.hpp"
+#include "gc/shared/gcId.hpp"
#include "runtime/safepoint.hpp"
uint GCId::_next_id = 0;
diff --git a/hotspot/src/share/vm/gc_implementation/shared/gcId.hpp b/hotspot/src/share/vm/gc/shared/gcId.hpp
similarity index 86%
rename from hotspot/src/share/vm/gc_implementation/shared/gcId.hpp
rename to hotspot/src/share/vm/gc/shared/gcId.hpp
index 1d2decc6bb5..1cc9f3829cb 100644
--- a/hotspot/src/share/vm/gc_implementation/shared/gcId.hpp
+++ b/hotspot/src/share/vm/gc/shared/gcId.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_IMPLEMENTATION_SHARED_GCID_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_SHARED_GCID_HPP
+#ifndef SHARE_VM_GC_SHARED_GCID_HPP
+#define SHARE_VM_GC_SHARED_GCID_HPP
#include "memory/allocation.hpp"
@@ -48,4 +48,4 @@ class GCId VALUE_OBJ_CLASS_SPEC {
static const GCId undefined();
};
-#endif // SHARE_VM_GC_IMPLEMENTATION_SHARED_GCID_HPP
+#endif // SHARE_VM_GC_SHARED_GCID_HPP
diff --git a/hotspot/src/share/vm/memory/gcLocker.cpp b/hotspot/src/share/vm/gc/shared/gcLocker.cpp
similarity index 98%
rename from hotspot/src/share/vm/memory/gcLocker.cpp
rename to hotspot/src/share/vm/gc/shared/gcLocker.cpp
index 6c82777628c..7935ded6ec7 100644
--- a/hotspot/src/share/vm/memory/gcLocker.cpp
+++ b/hotspot/src/share/vm/gc/shared/gcLocker.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -23,8 +23,8 @@
*/
#include "precompiled.hpp"
-#include "gc_interface/collectedHeap.hpp"
-#include "memory/gcLocker.inline.hpp"
+#include "gc/shared/collectedHeap.hpp"
+#include "gc/shared/gcLocker.inline.hpp"
#include "memory/resourceArea.hpp"
#include "runtime/atomic.inline.hpp"
#include "runtime/thread.inline.hpp"
diff --git a/hotspot/src/share/vm/memory/gcLocker.hpp b/hotspot/src/share/vm/gc/shared/gcLocker.hpp
similarity index 97%
rename from hotspot/src/share/vm/memory/gcLocker.hpp
rename to hotspot/src/share/vm/gc/shared/gcLocker.hpp
index aafc03733e1..41ad0aec738 100644
--- a/hotspot/src/share/vm/memory/gcLocker.hpp
+++ b/hotspot/src/share/vm/gc/shared/gcLocker.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,11 +22,11 @@
*
*/
-#ifndef SHARE_VM_MEMORY_GCLOCKER_HPP
-#define SHARE_VM_MEMORY_GCLOCKER_HPP
+#ifndef SHARE_VM_GC_SHARED_GCLOCKER_HPP
+#define SHARE_VM_GC_SHARED_GCLOCKER_HPP
-#include "gc_interface/collectedHeap.hpp"
-#include "memory/genCollectedHeap.hpp"
+#include "gc/shared/collectedHeap.hpp"
+#include "gc/shared/genCollectedHeap.hpp"
#include "memory/universe.hpp"
#include "oops/oop.hpp"
@@ -326,4 +326,4 @@ class No_Alloc_Verifier : public StackObj {
#endif
};
-#endif // SHARE_VM_MEMORY_GCLOCKER_HPP
+#endif // SHARE_VM_GC_SHARED_GCLOCKER_HPP
diff --git a/hotspot/src/share/vm/memory/gcLocker.inline.hpp b/hotspot/src/share/vm/gc/shared/gcLocker.inline.hpp
similarity index 87%
rename from hotspot/src/share/vm/memory/gcLocker.inline.hpp
rename to hotspot/src/share/vm/gc/shared/gcLocker.inline.hpp
index e77d5436b1b..6e677ed529c 100644
--- a/hotspot/src/share/vm/memory/gcLocker.inline.hpp
+++ b/hotspot/src/share/vm/gc/shared/gcLocker.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,10 +22,10 @@
*
*/
-#ifndef SHARE_VM_MEMORY_GCLOCKER_INLINE_HPP
-#define SHARE_VM_MEMORY_GCLOCKER_INLINE_HPP
+#ifndef SHARE_VM_GC_SHARED_GCLOCKER_INLINE_HPP
+#define SHARE_VM_GC_SHARED_GCLOCKER_INLINE_HPP
-#include "memory/gcLocker.hpp"
+#include "gc/shared/gcLocker.hpp"
inline void GC_locker::lock_critical(JavaThread* thread) {
if (!thread->in_critical()) {
@@ -53,4 +53,4 @@ inline void GC_locker::unlock_critical(JavaThread* thread) {
thread->exit_critical();
}
-#endif // SHARE_VM_MEMORY_GCLOCKER_INLINE_HPP
+#endif // SHARE_VM_GC_SHARED_GCLOCKER_INLINE_HPP
diff --git a/hotspot/src/share/vm/gc_interface/gcName.hpp b/hotspot/src/share/vm/gc/shared/gcName.hpp
similarity index 90%
rename from hotspot/src/share/vm/gc_interface/gcName.hpp
rename to hotspot/src/share/vm/gc/shared/gcName.hpp
index c48c2483805..ffdd1b2f364 100644
--- a/hotspot/src/share/vm/gc_interface/gcName.hpp
+++ b/hotspot/src/share/vm/gc/shared/gcName.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_INTERFACE_GCNAME_HPP
-#define SHARE_VM_GC_INTERFACE_GCNAME_HPP
+#ifndef SHARE_VM_GC_SHARED_GCNAME_HPP
+#define SHARE_VM_GC_SHARED_GCNAME_HPP
#include "utilities/debug.hpp"
@@ -58,4 +58,4 @@ class GCNameHelper {
}
};
-#endif // SHARE_VM_GC_INTERFACE_GCNAME_HPP
+#endif // SHARE_VM_GC_SHARED_GCNAME_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/shared/gcPolicyCounters.cpp b/hotspot/src/share/vm/gc/shared/gcPolicyCounters.cpp
similarity index 95%
rename from hotspot/src/share/vm/gc_implementation/shared/gcPolicyCounters.cpp
rename to hotspot/src/share/vm/gc/shared/gcPolicyCounters.cpp
index 23a710b97a6..787a786fa5c 100644
--- a/hotspot/src/share/vm/gc_implementation/shared/gcPolicyCounters.cpp
+++ b/hotspot/src/share/vm/gc/shared/gcPolicyCounters.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
*/
#include "precompiled.hpp"
-#include "gc_implementation/shared/gcPolicyCounters.hpp"
+#include "gc/shared/gcPolicyCounters.hpp"
#include "memory/resourceArea.hpp"
GCPolicyCounters::GCPolicyCounters(const char* name, int collectors,
diff --git a/hotspot/src/share/vm/gc_implementation/shared/gcPolicyCounters.hpp b/hotspot/src/share/vm/gc/shared/gcPolicyCounters.hpp
similarity index 89%
rename from hotspot/src/share/vm/gc_implementation/shared/gcPolicyCounters.hpp
rename to hotspot/src/share/vm/gc/shared/gcPolicyCounters.hpp
index 022a5f0bb0e..5345dca4abe 100644
--- a/hotspot/src/share/vm/gc_implementation/shared/gcPolicyCounters.hpp
+++ b/hotspot/src/share/vm/gc/shared/gcPolicyCounters.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_IMPLEMENTATION_SHARED_GCPOLICYCOUNTERS_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_SHARED_GCPOLICYCOUNTERS_HPP
+#ifndef SHARE_VM_GC_SHARED_GCPOLICYCOUNTERS_HPP
+#define SHARE_VM_GC_SHARED_GCPOLICYCOUNTERS_HPP
#include "runtime/perfData.hpp"
@@ -75,4 +75,4 @@ class GCPolicyCounters: public CHeapObj {
}
};
-#endif // SHARE_VM_GC_IMPLEMENTATION_SHARED_GCPOLICYCOUNTERS_HPP
+#endif // SHARE_VM_GC_SHARED_GCPOLICYCOUNTERS_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/shared/gcStats.cpp b/hotspot/src/share/vm/gc/shared/gcStats.cpp
similarity index 90%
rename from hotspot/src/share/vm/gc_implementation/shared/gcStats.cpp
rename to hotspot/src/share/vm/gc/shared/gcStats.cpp
index 745f8f3ab65..3a050f73066 100644
--- a/hotspot/src/share/vm/gc_implementation/shared/gcStats.cpp
+++ b/hotspot/src/share/vm/gc/shared/gcStats.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -23,8 +23,8 @@
*/
#include "precompiled.hpp"
-#include "gc_implementation/shared/gcStats.hpp"
-#include "gc_implementation/shared/gcUtil.hpp"
+#include "gc/shared/gcStats.hpp"
+#include "gc/shared/gcUtil.hpp"
#include "memory/allocation.inline.hpp"
GCStats::GCStats() {
diff --git a/hotspot/src/share/vm/gc_implementation/shared/gcStats.hpp b/hotspot/src/share/vm/gc/shared/gcStats.hpp
similarity index 86%
rename from hotspot/src/share/vm/gc_implementation/shared/gcStats.hpp
rename to hotspot/src/share/vm/gc/shared/gcStats.hpp
index 4182e275188..e9bd5a06875 100644
--- a/hotspot/src/share/vm/gc_implementation/shared/gcStats.hpp
+++ b/hotspot/src/share/vm/gc/shared/gcStats.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,10 +22,10 @@
*
*/
-#ifndef SHARE_VM_GC_IMPLEMENTATION_SHARED_GCSTATS_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_SHARED_GCSTATS_HPP
+#ifndef SHARE_VM_GC_SHARED_GCSTATS_HPP
+#define SHARE_VM_GC_SHARED_GCSTATS_HPP
-#include "gc_implementation/shared/gcUtil.hpp"
+#include "gc/shared/gcUtil.hpp"
class GCStats : public CHeapObj {
protected:
@@ -67,4 +67,4 @@ class CMSGCStats : public GCStats {
}
};
-#endif // SHARE_VM_GC_IMPLEMENTATION_SHARED_GCSTATS_HPP
+#endif // SHARE_VM_GC_SHARED_GCSTATS_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/shared/gcTimer.cpp b/hotspot/src/share/vm/gc/shared/gcTimer.cpp
similarity index 99%
rename from hotspot/src/share/vm/gc_implementation/shared/gcTimer.cpp
rename to hotspot/src/share/vm/gc/shared/gcTimer.cpp
index 246be3ecc6f..b2ad94bc1ab 100644
--- a/hotspot/src/share/vm/gc_implementation/shared/gcTimer.cpp
+++ b/hotspot/src/share/vm/gc/shared/gcTimer.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
*/
#include "precompiled.hpp"
-#include "gc_implementation/shared/gcTimer.hpp"
+#include "gc/shared/gcTimer.hpp"
#include "utilities/growableArray.hpp"
#include "utilities/ticks.inline.hpp"
diff --git a/hotspot/src/share/vm/gc_implementation/shared/gcTimer.hpp b/hotspot/src/share/vm/gc/shared/gcTimer.hpp
similarity index 95%
rename from hotspot/src/share/vm/gc_implementation/shared/gcTimer.hpp
rename to hotspot/src/share/vm/gc/shared/gcTimer.hpp
index 3826515a92b..a4bd2dd775c 100644
--- a/hotspot/src/share/vm/gc_implementation/shared/gcTimer.hpp
+++ b/hotspot/src/share/vm/gc/shared/gcTimer.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_IMPLEMENTATION_SHARED_GCTIMER_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_SHARED_GCTIMER_HPP
+#ifndef SHARE_VM_GC_SHARED_GCTIMER_HPP
+#define SHARE_VM_GC_SHARED_GCTIMER_HPP
#include "memory/allocation.hpp"
#include "prims/jni_md.h"
@@ -190,4 +190,4 @@ class GCTimerAllTest {
#endif
-#endif // SHARE_VM_GC_IMPLEMENTATION_SHARED_GCTIMER_HPP
+#endif // SHARE_VM_GC_SHARED_GCTIMER_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/shared/gcTrace.cpp b/hotspot/src/share/vm/gc/shared/gcTrace.cpp
similarity index 95%
rename from hotspot/src/share/vm/gc_implementation/shared/gcTrace.cpp
rename to hotspot/src/share/vm/gc/shared/gcTrace.cpp
index b98f8919ab0..5d24660d0cf 100644
--- a/hotspot/src/share/vm/gc_implementation/shared/gcTrace.cpp
+++ b/hotspot/src/share/vm/gc/shared/gcTrace.cpp
@@ -23,21 +23,21 @@
*/
#include "precompiled.hpp"
-#include "gc_implementation/shared/copyFailedInfo.hpp"
-#include "gc_implementation/shared/gcHeapSummary.hpp"
-#include "gc_implementation/shared/gcId.hpp"
-#include "gc_implementation/shared/gcTimer.hpp"
-#include "gc_implementation/shared/gcTrace.hpp"
-#include "gc_implementation/shared/objectCountEventSender.hpp"
+#include "gc/shared/copyFailedInfo.hpp"
+#include "gc/shared/gcHeapSummary.hpp"
+#include "gc/shared/gcId.hpp"
+#include "gc/shared/gcTimer.hpp"
+#include "gc/shared/gcTrace.hpp"
+#include "gc/shared/objectCountEventSender.hpp"
+#include "gc/shared/referenceProcessorStats.hpp"
#include "memory/heapInspection.hpp"
-#include "memory/referenceProcessorStats.hpp"
#include "memory/resourceArea.hpp"
#include "runtime/os.hpp"
#include "utilities/globalDefinitions.hpp"
#include "utilities/macros.hpp"
#include "utilities/ticks.inline.hpp"
#if INCLUDE_ALL_GCS
-#include "gc_implementation/g1/evacuationInfo.hpp"
+#include "gc/g1/evacuationInfo.hpp"
#endif
#define assert_unset_gc_id() assert(_shared_gc_info.gc_id().is_undefined(), "GC already started?")
diff --git a/hotspot/src/share/vm/gc_implementation/shared/gcTrace.hpp b/hotspot/src/share/vm/gc/shared/gcTrace.hpp
similarity index 94%
rename from hotspot/src/share/vm/gc_implementation/shared/gcTrace.hpp
rename to hotspot/src/share/vm/gc/shared/gcTrace.hpp
index 9a16b693262..e21e1c43dbf 100644
--- a/hotspot/src/share/vm/gc_implementation/shared/gcTrace.hpp
+++ b/hotspot/src/share/vm/gc/shared/gcTrace.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,21 +22,21 @@
*
*/
-#ifndef SHARE_VM_GC_IMPLEMENTATION_SHARED_GCTRACE_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_SHARED_GCTRACE_HPP
+#ifndef SHARE_VM_GC_SHARED_GCTRACE_HPP
+#define SHARE_VM_GC_SHARED_GCTRACE_HPP
-#include "gc_interface/gcCause.hpp"
-#include "gc_interface/gcName.hpp"
-#include "gc_implementation/shared/gcId.hpp"
-#include "gc_implementation/shared/gcWhen.hpp"
-#include "gc_implementation/shared/copyFailedInfo.hpp"
+#include "gc/shared/copyFailedInfo.hpp"
+#include "gc/shared/gcCause.hpp"
+#include "gc/shared/gcId.hpp"
+#include "gc/shared/gcName.hpp"
+#include "gc/shared/gcWhen.hpp"
#include "memory/allocation.hpp"
#include "memory/metaspace.hpp"
#include "memory/referenceType.hpp"
#include "utilities/macros.hpp"
#include "utilities/ticks.hpp"
#if INCLUDE_ALL_GCS
-#include "gc_implementation/g1/g1YCTypes.hpp"
+#include "gc/g1/g1YCTypes.hpp"
#endif
class EvacuationInfo;
@@ -266,4 +266,4 @@ class G1OldTracer : public OldGCTracer {
G1OldTracer() : OldGCTracer(G1Old) {}
};
-#endif // SHARE_VM_GC_IMPLEMENTATION_SHARED_GCTRACE_HPP
+#endif // SHARE_VM_GC_SHARED_GCTRACE_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/shared/gcTraceSend.cpp b/hotspot/src/share/vm/gc/shared/gcTraceSend.cpp
similarity index 96%
rename from hotspot/src/share/vm/gc_implementation/shared/gcTraceSend.cpp
rename to hotspot/src/share/vm/gc/shared/gcTraceSend.cpp
index 326625bf1a8..e2f04cba4b7 100644
--- a/hotspot/src/share/vm/gc_implementation/shared/gcTraceSend.cpp
+++ b/hotspot/src/share/vm/gc/shared/gcTraceSend.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -23,18 +23,18 @@
*/
#include "precompiled.hpp"
-#include "gc_implementation/shared/gcHeapSummary.hpp"
-#include "gc_implementation/shared/gcTimer.hpp"
-#include "gc_implementation/shared/gcTrace.hpp"
-#include "gc_implementation/shared/gcWhen.hpp"
-#include "gc_implementation/shared/copyFailedInfo.hpp"
+#include "gc/shared/copyFailedInfo.hpp"
+#include "gc/shared/gcHeapSummary.hpp"
+#include "gc/shared/gcTimer.hpp"
+#include "gc/shared/gcTrace.hpp"
+#include "gc/shared/gcWhen.hpp"
#include "runtime/os.hpp"
-#include "trace/tracing.hpp"
#include "trace/traceBackend.hpp"
+#include "trace/tracing.hpp"
#include "utilities/macros.hpp"
#if INCLUDE_ALL_GCS
-#include "gc_implementation/g1/evacuationInfo.hpp"
-#include "gc_implementation/g1/g1YCTypes.hpp"
+#include "gc/g1/evacuationInfo.hpp"
+#include "gc/g1/g1YCTypes.hpp"
#endif
// All GC dependencies against the trace framework is contained within this file.
diff --git a/hotspot/src/share/vm/gc_implementation/shared/gcTraceTime.cpp b/hotspot/src/share/vm/gc/shared/gcTraceTime.cpp
similarity index 92%
rename from hotspot/src/share/vm/gc_implementation/shared/gcTraceTime.cpp
rename to hotspot/src/share/vm/gc/shared/gcTraceTime.cpp
index fff7eea8ca9..db8755d12aa 100644
--- a/hotspot/src/share/vm/gc_implementation/shared/gcTraceTime.cpp
+++ b/hotspot/src/share/vm/gc/shared/gcTraceTime.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -23,9 +23,9 @@
*/
#include "precompiled.hpp"
-#include "gc_implementation/shared/gcTimer.hpp"
-#include "gc_implementation/shared/gcTrace.hpp"
-#include "gc_implementation/shared/gcTraceTime.hpp"
+#include "gc/shared/gcTimer.hpp"
+#include "gc/shared/gcTrace.hpp"
+#include "gc/shared/gcTraceTime.hpp"
#include "runtime/globals.hpp"
#include "runtime/os.hpp"
#include "runtime/safepoint.hpp"
diff --git a/hotspot/src/share/vm/gc_implementation/shared/gcTraceTime.hpp b/hotspot/src/share/vm/gc/shared/gcTraceTime.hpp
similarity index 81%
rename from hotspot/src/share/vm/gc_implementation/shared/gcTraceTime.hpp
rename to hotspot/src/share/vm/gc/shared/gcTraceTime.hpp
index 30e494baa52..85825a196d9 100644
--- a/hotspot/src/share/vm/gc_implementation/shared/gcTraceTime.hpp
+++ b/hotspot/src/share/vm/gc/shared/gcTraceTime.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,10 +22,10 @@
*
*/
-#ifndef SHARE_VM_GC_IMPLEMENTATION_SHARED_GCTRACETIME_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_SHARED_GCTRACETIME_HPP
+#ifndef SHARE_VM_GC_SHARED_GCTRACETIME_HPP
+#define SHARE_VM_GC_SHARED_GCTRACETIME_HPP
-#include "gc_implementation/shared/gcTrace.hpp"
+#include "gc/shared/gcTrace.hpp"
#include "prims/jni_md.h"
#include "utilities/ticks.hpp"
@@ -43,4 +43,4 @@ class GCTraceTime {
~GCTraceTime();
};
-#endif // SHARE_VM_GC_IMPLEMENTATION_SHARED_GCTRACETIME_HPP
+#endif // SHARE_VM_GC_SHARED_GCTRACETIME_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/shared/gcUtil.cpp b/hotspot/src/share/vm/gc/shared/gcUtil.cpp
similarity index 98%
rename from hotspot/src/share/vm/gc_implementation/shared/gcUtil.cpp
rename to hotspot/src/share/vm/gc/shared/gcUtil.cpp
index fc1662e8b65..8dfdde542e7 100644
--- a/hotspot/src/share/vm/gc_implementation/shared/gcUtil.cpp
+++ b/hotspot/src/share/vm/gc/shared/gcUtil.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
*/
#include "precompiled.hpp"
-#include "gc_implementation/shared/gcUtil.hpp"
+#include "gc/shared/gcUtil.hpp"
// Catch-all file for utility classes
diff --git a/hotspot/src/share/vm/gc_implementation/shared/gcUtil.hpp b/hotspot/src/share/vm/gc/shared/gcUtil.hpp
similarity index 97%
rename from hotspot/src/share/vm/gc_implementation/shared/gcUtil.hpp
rename to hotspot/src/share/vm/gc/shared/gcUtil.hpp
index 07cdff63d2f..6b2f929bb5d 100644
--- a/hotspot/src/share/vm/gc_implementation/shared/gcUtil.hpp
+++ b/hotspot/src/share/vm/gc/shared/gcUtil.hpp
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_IMPLEMENTATION_SHARED_GCUTIL_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_SHARED_GCUTIL_HPP
+#ifndef SHARE_VM_GC_SHARED_GCUTIL_HPP
+#define SHARE_VM_GC_SHARED_GCUTIL_HPP
#include "memory/allocation.hpp"
#include "runtime/timer.hpp"
@@ -216,4 +216,4 @@ class LinearLeastSquareFit : public CHeapObj {
bool increment_will_decrease();
};
-#endif // SHARE_VM_GC_IMPLEMENTATION_SHARED_GCUTIL_HPP
+#endif // SHARE_VM_GC_SHARED_GCUTIL_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/shared/gcWhen.hpp b/hotspot/src/share/vm/gc/shared/gcWhen.hpp
similarity index 85%
rename from hotspot/src/share/vm/gc_implementation/shared/gcWhen.hpp
rename to hotspot/src/share/vm/gc/shared/gcWhen.hpp
index 5713ba4e8ae..84fbcac8da1 100644
--- a/hotspot/src/share/vm/gc_implementation/shared/gcWhen.hpp
+++ b/hotspot/src/share/vm/gc/shared/gcWhen.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_IMPLEMENTATION_SHARED_GCWHEN_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_SHARED_GCWHEN_HPP
+#ifndef SHARE_VM_GC_SHARED_GCWHEN_HPP
+#define SHARE_VM_GC_SHARED_GCWHEN_HPP
#include "memory/allocation.hpp"
#include "utilities/debug.hpp"
@@ -45,4 +45,4 @@ class GCWhen : AllStatic {
}
};
-#endif // SHARE_VM_GC_IMPLEMENTATION_SHARED_GCWHEN_HPP
+#endif // SHARE_VM_GC_SHARED_GCWHEN_HPP
diff --git a/hotspot/src/share/vm/memory/genCollectedHeap.cpp b/hotspot/src/share/vm/gc/shared/genCollectedHeap.cpp
similarity index 98%
rename from hotspot/src/share/vm/memory/genCollectedHeap.cpp
rename to hotspot/src/share/vm/gc/shared/genCollectedHeap.cpp
index edec39a5d0a..28a276d335b 100644
--- a/hotspot/src/share/vm/memory/genCollectedHeap.cpp
+++ b/hotspot/src/share/vm/gc/shared/genCollectedHeap.cpp
@@ -28,19 +28,20 @@
#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 "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/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"
@@ -53,10 +54,9 @@
#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"
+#include "gc/cms/concurrentMarkSweepThread.hpp"
+#include "gc/cms/vmCMSOperations.hpp"
#endif // INCLUDE_ALL_GCS
NOT_PRODUCT(size_t GenCollectedHeap::_skip_header_HeapWords = 0;)
diff --git a/hotspot/src/share/vm/memory/genCollectedHeap.hpp b/hotspot/src/share/vm/gc/shared/genCollectedHeap.hpp
similarity index 98%
rename from hotspot/src/share/vm/memory/genCollectedHeap.hpp
rename to hotspot/src/share/vm/gc/shared/genCollectedHeap.hpp
index 80ba8c18827..2caa66f5615 100644
--- a/hotspot/src/share/vm/memory/genCollectedHeap.hpp
+++ b/hotspot/src/share/vm/gc/shared/genCollectedHeap.hpp
@@ -22,13 +22,13 @@
*
*/
-#ifndef SHARE_VM_MEMORY_GENCOLLECTEDHEAP_HPP
-#define SHARE_VM_MEMORY_GENCOLLECTEDHEAP_HPP
+#ifndef SHARE_VM_GC_SHARED_GENCOLLECTEDHEAP_HPP
+#define SHARE_VM_GC_SHARED_GENCOLLECTEDHEAP_HPP
-#include "gc_implementation/shared/adaptiveSizePolicy.hpp"
-#include "gc_interface/collectedHeap.hpp"
-#include "memory/collectorPolicy.hpp"
-#include "memory/generation.hpp"
+#include "gc/shared/adaptiveSizePolicy.hpp"
+#include "gc/shared/collectedHeap.hpp"
+#include "gc/shared/collectorPolicy.hpp"
+#include "gc/shared/generation.hpp"
class SubTasksDone;
class FlexibleWorkGang;
@@ -515,4 +515,4 @@ protected:
void gc_epilogue(bool full);
};
-#endif // SHARE_VM_MEMORY_GENCOLLECTEDHEAP_HPP
+#endif // SHARE_VM_GC_SHARED_GENCOLLECTEDHEAP_HPP
diff --git a/hotspot/src/share/vm/memory/genOopClosures.cpp b/hotspot/src/share/vm/gc/shared/genOopClosures.cpp
similarity index 92%
rename from hotspot/src/share/vm/memory/genOopClosures.cpp
rename to hotspot/src/share/vm/gc/shared/genOopClosures.cpp
index d076f5ef90f..828a0f93efd 100644
--- a/hotspot/src/share/vm/memory/genOopClosures.cpp
+++ b/hotspot/src/share/vm/gc/shared/genOopClosures.cpp
@@ -22,9 +22,9 @@
*/
#include "precompiled.hpp"
-#include "memory/genOopClosures.inline.hpp"
+#include "gc/shared/genOopClosures.inline.hpp"
+#include "gc/shared/specialized_oop_closures.hpp"
#include "memory/iterator.inline.hpp"
-#include "memory/specialized_oop_closures.hpp"
// Generate Serial GC specialized oop_oop_iterate functions.
SPECIALIZED_OOP_OOP_ITERATE_CLOSURES_S(ALL_KLASS_OOP_OOP_ITERATE_DEFN)
diff --git a/hotspot/src/share/vm/memory/genOopClosures.hpp b/hotspot/src/share/vm/gc/shared/genOopClosures.hpp
similarity index 97%
rename from hotspot/src/share/vm/memory/genOopClosures.hpp
rename to hotspot/src/share/vm/gc/shared/genOopClosures.hpp
index e0d89b767dc..6f49767d89b 100644
--- a/hotspot/src/share/vm/memory/genOopClosures.hpp
+++ b/hotspot/src/share/vm/gc/shared/genOopClosures.hpp
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_MEMORY_GENOOPCLOSURES_HPP
-#define SHARE_VM_MEMORY_GENOOPCLOSURES_HPP
+#ifndef SHARE_VM_GC_SHARED_GENOOPCLOSURES_HPP
+#define SHARE_VM_GC_SHARED_GENOOPCLOSURES_HPP
#include "memory/iterator.hpp"
#include "oops/oop.hpp"
@@ -189,4 +189,4 @@ class ScanWeakRefClosure: public OopClosure {
inline void do_oop_nv(narrowOop* p);
};
-#endif // SHARE_VM_MEMORY_GENOOPCLOSURES_HPP
+#endif // SHARE_VM_GC_SHARED_GENOOPCLOSURES_HPP
diff --git a/hotspot/src/share/vm/memory/genOopClosures.inline.hpp b/hotspot/src/share/vm/gc/shared/genOopClosures.inline.hpp
similarity index 91%
rename from hotspot/src/share/vm/memory/genOopClosures.inline.hpp
rename to hotspot/src/share/vm/gc/shared/genOopClosures.inline.hpp
index 6842d88cb7f..e33c94493a1 100644
--- a/hotspot/src/share/vm/memory/genOopClosures.inline.hpp
+++ b/hotspot/src/share/vm/gc/shared/genOopClosures.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,16 +22,16 @@
*
*/
-#ifndef SHARE_VM_MEMORY_GENOOPCLOSURES_INLINE_HPP
-#define SHARE_VM_MEMORY_GENOOPCLOSURES_INLINE_HPP
+#ifndef SHARE_VM_GC_SHARED_GENOOPCLOSURES_INLINE_HPP
+#define SHARE_VM_GC_SHARED_GENOOPCLOSURES_INLINE_HPP
-#include "memory/cardTableRS.hpp"
-#include "memory/defNewGeneration.hpp"
-#include "memory/genCollectedHeap.hpp"
-#include "memory/genOopClosures.hpp"
-#include "memory/genRemSet.hpp"
-#include "memory/generation.hpp"
-#include "memory/space.hpp"
+#include "gc/serial/defNewGeneration.hpp"
+#include "gc/shared/cardTableRS.hpp"
+#include "gc/shared/genCollectedHeap.hpp"
+#include "gc/shared/genOopClosures.hpp"
+#include "gc/shared/genRemSet.hpp"
+#include "gc/shared/generation.hpp"
+#include "gc/shared/space.hpp"
inline OopsInGenClosure::OopsInGenClosure(Generation* gen) :
ExtendedOopClosure(gen->ref_processor()), _orig_gen(gen), _rs(NULL) {
@@ -143,4 +143,4 @@ template inline void ScanWeakRefClosure::do_oop_work(T* p) {
inline void ScanWeakRefClosure::do_oop_nv(oop* p) { ScanWeakRefClosure::do_oop_work(p); }
inline void ScanWeakRefClosure::do_oop_nv(narrowOop* p) { ScanWeakRefClosure::do_oop_work(p); }
-#endif // SHARE_VM_MEMORY_GENOOPCLOSURES_INLINE_HPP
+#endif // SHARE_VM_GC_SHARED_GENOOPCLOSURES_INLINE_HPP
diff --git a/hotspot/src/share/vm/memory/genRemSet.cpp b/hotspot/src/share/vm/gc/shared/genRemSet.cpp
similarity index 94%
rename from hotspot/src/share/vm/memory/genRemSet.cpp
rename to hotspot/src/share/vm/gc/shared/genRemSet.cpp
index 62189200507..950072f2efd 100644
--- a/hotspot/src/share/vm/memory/genRemSet.cpp
+++ b/hotspot/src/share/vm/gc/shared/genRemSet.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -24,8 +24,8 @@
#include "precompiled.hpp"
#include "classfile/classLoaderData.hpp"
-#include "memory/cardTableRS.hpp"
-#include "memory/genRemSet.hpp"
+#include "gc/shared/cardTableRS.hpp"
+#include "gc/shared/genRemSet.hpp"
#include "oops/klass.hpp"
// This kind of "BarrierSet" allows a "CollectedHeap" to detect and
diff --git a/hotspot/src/share/vm/memory/genRemSet.hpp b/hotspot/src/share/vm/gc/shared/genRemSet.hpp
similarity index 96%
rename from hotspot/src/share/vm/memory/genRemSet.hpp
rename to hotspot/src/share/vm/gc/shared/genRemSet.hpp
index 64a63230b80..9a5db641cb4 100644
--- a/hotspot/src/share/vm/memory/genRemSet.hpp
+++ b/hotspot/src/share/vm/gc/shared/genRemSet.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_MEMORY_GENREMSET_HPP
-#define SHARE_VM_MEMORY_GENREMSET_HPP
+#ifndef SHARE_VM_GC_SHARED_GENREMSET_HPP
+#define SHARE_VM_GC_SHARED_GENREMSET_HPP
#include "oops/oop.hpp"
@@ -131,4 +131,4 @@ public:
virtual void invalidate_or_clear(Generation* old_gen) = 0;
};
-#endif // SHARE_VM_MEMORY_GENREMSET_HPP
+#endif // SHARE_VM_GC_SHARED_GENREMSET_HPP
diff --git a/hotspot/src/share/vm/memory/generation.cpp b/hotspot/src/share/vm/gc/shared/generation.cpp
similarity index 95%
rename from hotspot/src/share/vm/memory/generation.cpp
rename to hotspot/src/share/vm/gc/shared/generation.cpp
index 2518f2c53a6..5210a44517f 100644
--- a/hotspot/src/share/vm/memory/generation.cpp
+++ b/hotspot/src/share/vm/gc/shared/generation.cpp
@@ -23,20 +23,20 @@
*/
#include "precompiled.hpp"
-#include "gc_implementation/shared/gcTimer.hpp"
-#include "gc_implementation/shared/gcTrace.hpp"
-#include "gc_implementation/shared/spaceDecorator.hpp"
-#include "gc_interface/collectedHeap.inline.hpp"
+#include "gc/serial/genMarkSweep.hpp"
+#include "gc/shared/blockOffsetTable.inline.hpp"
+#include "gc/shared/cardTableRS.hpp"
+#include "gc/shared/collectedHeap.inline.hpp"
+#include "gc/shared/gcLocker.inline.hpp"
+#include "gc/shared/gcTimer.hpp"
+#include "gc/shared/gcTrace.hpp"
+#include "gc/shared/genCollectedHeap.hpp"
+#include "gc/shared/genOopClosures.hpp"
+#include "gc/shared/genOopClosures.inline.hpp"
+#include "gc/shared/generation.hpp"
+#include "gc/shared/space.inline.hpp"
+#include "gc/shared/spaceDecorator.hpp"
#include "memory/allocation.inline.hpp"
-#include "memory/blockOffsetTable.inline.hpp"
-#include "memory/cardTableRS.hpp"
-#include "memory/gcLocker.inline.hpp"
-#include "memory/genCollectedHeap.hpp"
-#include "memory/genMarkSweep.hpp"
-#include "memory/genOopClosures.hpp"
-#include "memory/genOopClosures.inline.hpp"
-#include "memory/generation.hpp"
-#include "memory/space.inline.hpp"
#include "oops/oop.inline.hpp"
#include "runtime/java.hpp"
#include "utilities/copy.hpp"
diff --git a/hotspot/src/share/vm/memory/generation.hpp b/hotspot/src/share/vm/gc/shared/generation.hpp
similarity index 98%
rename from hotspot/src/share/vm/memory/generation.hpp
rename to hotspot/src/share/vm/gc/shared/generation.hpp
index 00a7efaca23..6d4f840681c 100644
--- a/hotspot/src/share/vm/memory/generation.hpp
+++ b/hotspot/src/share/vm/gc/shared/generation.hpp
@@ -22,16 +22,16 @@
*
*/
-#ifndef SHARE_VM_MEMORY_GENERATION_HPP
-#define SHARE_VM_MEMORY_GENERATION_HPP
+#ifndef SHARE_VM_GC_SHARED_GENERATION_HPP
+#define SHARE_VM_GC_SHARED_GENERATION_HPP
-#include "gc_implementation/shared/collectorCounters.hpp"
+#include "gc/shared/collectorCounters.hpp"
+#include "gc/shared/referenceProcessor.hpp"
+#include "gc/shared/watermark.hpp"
#include "memory/allocation.hpp"
#include "memory/memRegion.hpp"
-#include "memory/referenceProcessor.hpp"
#include "memory/universe.hpp"
#include "memory/virtualspace.hpp"
-#include "memory/watermark.hpp"
#include "runtime/mutex.hpp"
#include "runtime/perfData.hpp"
@@ -584,4 +584,4 @@ public:
virtual CollectorCounters* counters() { return _gc_counters; }
};
-#endif // SHARE_VM_MEMORY_GENERATION_HPP
+#endif // SHARE_VM_GC_SHARED_GENERATION_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/shared/generationCounters.cpp b/hotspot/src/share/vm/gc/shared/generationCounters.cpp
similarity index 96%
rename from hotspot/src/share/vm/gc_implementation/shared/generationCounters.cpp
rename to hotspot/src/share/vm/gc/shared/generationCounters.cpp
index 333678b225b..134d28765e0 100644
--- a/hotspot/src/share/vm/gc_implementation/shared/generationCounters.cpp
+++ b/hotspot/src/share/vm/gc/shared/generationCounters.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
*/
#include "precompiled.hpp"
-#include "gc_implementation/shared/generationCounters.hpp"
+#include "gc/shared/generationCounters.hpp"
#include "memory/resourceArea.hpp"
void GenerationCounters::initialize(const char* name, int ordinal, int spaces,
diff --git a/hotspot/src/share/vm/gc_implementation/shared/generationCounters.hpp b/hotspot/src/share/vm/gc/shared/generationCounters.hpp
similarity index 93%
rename from hotspot/src/share/vm/gc_implementation/shared/generationCounters.hpp
rename to hotspot/src/share/vm/gc/shared/generationCounters.hpp
index 6e92cd50638..2b53549d575 100644
--- a/hotspot/src/share/vm/gc_implementation/shared/generationCounters.hpp
+++ b/hotspot/src/share/vm/gc/shared/generationCounters.hpp
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_IMPLEMENTATION_SHARED_GENERATIONCOUNTERS_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_SHARED_GENERATIONCOUNTERS_HPP
+#ifndef SHARE_VM_GC_SHARED_GENERATIONCOUNTERS_HPP
+#define SHARE_VM_GC_SHARED_GENERATIONCOUNTERS_HPP
#include "memory/virtualspace.hpp"
#include "runtime/perfData.hpp"
@@ -77,4 +77,4 @@ private:
const char* name_space() const { return _name_space; }
};
-#endif // SHARE_VM_GC_IMPLEMENTATION_SHARED_GENERATIONCOUNTERS_HPP
+#endif // SHARE_VM_GC_SHARED_GENERATIONCOUNTERS_HPP
diff --git a/hotspot/src/share/vm/memory/generationSpec.cpp b/hotspot/src/share/vm/gc/shared/generationSpec.cpp
similarity index 87%
rename from hotspot/src/share/vm/memory/generationSpec.cpp
rename to hotspot/src/share/vm/gc/shared/generationSpec.cpp
index bed0d5484ab..0593ccce7eb 100644
--- a/hotspot/src/share/vm/memory/generationSpec.cpp
+++ b/hotspot/src/share/vm/gc/shared/generationSpec.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -23,17 +23,17 @@
*/
#include "precompiled.hpp"
+#include "gc/serial/defNewGeneration.hpp"
+#include "gc/serial/tenuredGeneration.hpp"
+#include "gc/shared/genRemSet.hpp"
+#include "gc/shared/generationSpec.hpp"
#include "memory/binaryTreeDictionary.hpp"
-#include "memory/defNewGeneration.hpp"
#include "memory/filemap.hpp"
-#include "memory/genRemSet.hpp"
-#include "memory/generationSpec.hpp"
-#include "memory/tenuredGeneration.hpp"
#include "runtime/java.hpp"
#include "utilities/macros.hpp"
#if INCLUDE_ALL_GCS
-#include "gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.hpp"
-#include "gc_implementation/parNew/parNewGeneration.hpp"
+#include "gc/cms/concurrentMarkSweepGeneration.hpp"
+#include "gc/cms/parNewGeneration.hpp"
#endif // INCLUDE_ALL_GCS
Generation* GenerationSpec::init(ReservedSpace rs, int level,
diff --git a/hotspot/src/share/vm/memory/generationSpec.hpp b/hotspot/src/share/vm/gc/shared/generationSpec.hpp
similarity index 92%
rename from hotspot/src/share/vm/memory/generationSpec.hpp
rename to hotspot/src/share/vm/gc/shared/generationSpec.hpp
index 5c0e57ed14b..5b8126e6990 100644
--- a/hotspot/src/share/vm/memory/generationSpec.hpp
+++ b/hotspot/src/share/vm/gc/shared/generationSpec.hpp
@@ -22,10 +22,10 @@
*
*/
-#ifndef SHARE_VM_MEMORY_GENERATIONSPEC_HPP
-#define SHARE_VM_MEMORY_GENERATIONSPEC_HPP
+#ifndef SHARE_VM_GC_SHARED_GENERATIONSPEC_HPP
+#define SHARE_VM_GC_SHARED_GENERATIONSPEC_HPP
-#include "memory/generation.hpp"
+#include "gc/shared/generation.hpp"
// The specification of a generation. This class also encapsulates
// some generation-specific behavior. This is done here rather than as a
@@ -57,4 +57,4 @@ public:
typedef GenerationSpec* GenerationSpecPtr;
-#endif // SHARE_VM_MEMORY_GENERATIONSPEC_HPP
+#endif // SHARE_VM_GC_SHARED_GENERATIONSPEC_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/shared/isGCActiveMark.hpp b/hotspot/src/share/vm/gc/shared/isGCActiveMark.hpp
similarity index 83%
rename from hotspot/src/share/vm/gc_implementation/shared/isGCActiveMark.hpp
rename to hotspot/src/share/vm/gc/shared/isGCActiveMark.hpp
index dc1041b28dd..b3eee7107f6 100644
--- a/hotspot/src/share/vm/gc_implementation/shared/isGCActiveMark.hpp
+++ b/hotspot/src/share/vm/gc/shared/isGCActiveMark.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,12 +22,12 @@
*
*/
-#ifndef SHARE_VM_GC_IMPLEMENTATION_SHARED_ISGCACTIVEMARK_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_SHARED_ISGCACTIVEMARK_HPP
+#ifndef SHARE_VM_GC_SHARED_ISGCACTIVEMARK_HPP
+#define SHARE_VM_GC_SHARED_ISGCACTIVEMARK_HPP
#include "utilities/macros.hpp"
#if INCLUDE_ALL_GCS
-#include "gc_implementation/parallelScavenge/parallelScavengeHeap.hpp"
+#include "gc/parallel/parallelScavengeHeap.hpp"
#endif // INCLUDE_ALL_GCS
// This class provides a method for block structured setting of the
@@ -48,4 +48,4 @@ class IsGCActiveMark : public StackObj {
}
};
-#endif // SHARE_VM_GC_IMPLEMENTATION_SHARED_ISGCACTIVEMARK_HPP
+#endif // SHARE_VM_GC_SHARED_ISGCACTIVEMARK_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/shared/liveRange.hpp b/hotspot/src/share/vm/gc/shared/liveRange.hpp
similarity index 91%
rename from hotspot/src/share/vm/gc_implementation/shared/liveRange.hpp
rename to hotspot/src/share/vm/gc/shared/liveRange.hpp
index 7894183ac28..51c7ccc19cc 100644
--- a/hotspot/src/share/vm/gc_implementation/shared/liveRange.hpp
+++ b/hotspot/src/share/vm/gc/shared/liveRange.hpp
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_IMPLEMENTATION_SHARED_LIVERANGE_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_SHARED_LIVERANGE_HPP
+#ifndef SHARE_VM_GC_SHARED_LIVERANGE_HPP
+#define SHARE_VM_GC_SHARED_LIVERANGE_HPP
#include "memory/memRegion.hpp"
#include "utilities/copy.hpp"
@@ -52,4 +52,4 @@ public:
}
};
-#endif // SHARE_VM_GC_IMPLEMENTATION_SHARED_LIVERANGE_HPP
+#endif // SHARE_VM_GC_SHARED_LIVERANGE_HPP
diff --git a/hotspot/src/share/vm/memory/modRefBarrierSet.hpp b/hotspot/src/share/vm/gc/shared/modRefBarrierSet.hpp
similarity index 95%
rename from hotspot/src/share/vm/memory/modRefBarrierSet.hpp
rename to hotspot/src/share/vm/gc/shared/modRefBarrierSet.hpp
index ac7db902f83..faacbc4a07f 100644
--- a/hotspot/src/share/vm/memory/modRefBarrierSet.hpp
+++ b/hotspot/src/share/vm/gc/shared/modRefBarrierSet.hpp
@@ -22,10 +22,10 @@
*
*/
-#ifndef SHARE_VM_MEMORY_MODREFBARRIERSET_HPP
-#define SHARE_VM_MEMORY_MODREFBARRIERSET_HPP
+#ifndef SHARE_VM_GC_SHARED_MODREFBARRIERSET_HPP
+#define SHARE_VM_GC_SHARED_MODREFBARRIERSET_HPP
-#include "memory/barrierSet.hpp"
+#include "gc/shared/barrierSet.hpp"
// This kind of "BarrierSet" allows a "CollectedHeap" to detect and
// enumerate ref fields that have been modified (since the last
@@ -102,4 +102,4 @@ struct BarrierSet::GetName {
static const BarrierSet::Name value = BarrierSet::ModRef;
};
-#endif // SHARE_VM_MEMORY_MODREFBARRIERSET_HPP
+#endif // SHARE_VM_GC_SHARED_MODREFBARRIERSET_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/shared/objectCountEventSender.cpp b/hotspot/src/share/vm/gc/shared/objectCountEventSender.cpp
similarity index 91%
rename from hotspot/src/share/vm/gc_implementation/shared/objectCountEventSender.cpp
rename to hotspot/src/share/vm/gc/shared/objectCountEventSender.cpp
index 8b9d6a141f5..8b809ae1545 100644
--- a/hotspot/src/share/vm/gc_implementation/shared/objectCountEventSender.cpp
+++ b/hotspot/src/share/vm/gc/shared/objectCountEventSender.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -24,8 +24,8 @@
#include "precompiled.hpp"
-#include "gc_implementation/shared/gcId.hpp"
-#include "gc_implementation/shared/objectCountEventSender.hpp"
+#include "gc/shared/gcId.hpp"
+#include "gc/shared/objectCountEventSender.hpp"
#include "memory/heapInspection.hpp"
#include "trace/tracing.hpp"
#include "utilities/globalDefinitions.hpp"
diff --git a/hotspot/src/share/vm/gc_implementation/shared/objectCountEventSender.hpp b/hotspot/src/share/vm/gc/shared/objectCountEventSender.hpp
similarity index 84%
rename from hotspot/src/share/vm/gc_implementation/shared/objectCountEventSender.hpp
rename to hotspot/src/share/vm/gc/shared/objectCountEventSender.hpp
index c814f5e6cd2..201d5ddfc0e 100644
--- a/hotspot/src/share/vm/gc_implementation/shared/objectCountEventSender.hpp
+++ b/hotspot/src/share/vm/gc/shared/objectCountEventSender.hpp
@@ -22,10 +22,10 @@
*
*/
-#ifndef SHARE_VM_GC_IMPLEMENTATION_SHARED_OBJECTCOUNTEVENTSENDER_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_SHARED_OBJECTCOUNTEVENTSENDER_HPP
+#ifndef SHARE_VM_GC_SHARED_OBJECTCOUNTEVENTSENDER_HPP
+#define SHARE_VM_GC_SHARED_OBJECTCOUNTEVENTSENDER_HPP
-#include "gc_implementation/shared/gcTrace.hpp"
+#include "gc/shared/gcTrace.hpp"
#include "memory/allocation.hpp"
#include "utilities/macros.hpp"
@@ -42,4 +42,4 @@ class ObjectCountEventSender : public AllStatic {
#endif // INCLUDE_SERVICES
-#endif // SHARE_VM_GC_IMPLEMENTATION_SHARED_OBJECTCOUNTEVENTSENDER_HPP
+#endif // SHARE_VM_GC_SHARED_OBJECTCOUNTEVENTSENDER_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/shared/plab.cpp b/hotspot/src/share/vm/gc/shared/plab.cpp
similarity index 97%
rename from hotspot/src/share/vm/gc_implementation/shared/plab.cpp
rename to hotspot/src/share/vm/gc/shared/plab.cpp
index 93eb5e94f14..135f6792e01 100644
--- a/hotspot/src/share/vm/gc_implementation/shared/plab.cpp
+++ b/hotspot/src/share/vm/gc/shared/plab.cpp
@@ -23,9 +23,9 @@
*/
#include "precompiled.hpp"
-#include "gc_implementation/shared/plab.hpp"
-#include "gc_interface/collectedHeap.hpp"
-#include "memory/threadLocalAllocBuffer.hpp"
+#include "gc/shared/collectedHeap.hpp"
+#include "gc/shared/plab.hpp"
+#include "gc/shared/threadLocalAllocBuffer.hpp"
#include "oops/arrayOop.hpp"
#include "oops/oop.inline.hpp"
diff --git a/hotspot/src/share/vm/gc_implementation/shared/plab.hpp b/hotspot/src/share/vm/gc/shared/plab.hpp
similarity index 97%
rename from hotspot/src/share/vm/gc_implementation/shared/plab.hpp
rename to hotspot/src/share/vm/gc/shared/plab.hpp
index 3660f16e610..6533ff7e7f4 100644
--- a/hotspot/src/share/vm/gc_implementation/shared/plab.hpp
+++ b/hotspot/src/share/vm/gc/shared/plab.hpp
@@ -22,10 +22,10 @@
*
*/
-#ifndef SHARE_VM_GC_IMPLEMENTATION_SHARED_PLAB_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_SHARED_PLAB_HPP
+#ifndef SHARE_VM_GC_SHARED_PLAB_HPP
+#define SHARE_VM_GC_SHARED_PLAB_HPP
-#include "gc_implementation/shared/gcUtil.hpp"
+#include "gc/shared/gcUtil.hpp"
#include "memory/allocation.hpp"
#include "runtime/atomic.hpp"
#include "utilities/globalDefinitions.hpp"
@@ -207,4 +207,4 @@ class PLABStats VALUE_OBJ_CLASS_SPEC {
}
};
-#endif // SHARE_VM_GC_IMPLEMENTATION_SHARED_PLAB_HPP
+#endif // SHARE_VM_GC_SHARED_PLAB_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/shared/plab.inline.hpp b/hotspot/src/share/vm/gc/shared/plab.inline.hpp
similarity index 84%
rename from hotspot/src/share/vm/gc_implementation/shared/plab.inline.hpp
rename to hotspot/src/share/vm/gc/shared/plab.inline.hpp
index 5c9fe845b1c..c6eb35a6a9e 100644
--- a/hotspot/src/share/vm/gc_implementation/shared/plab.inline.hpp
+++ b/hotspot/src/share/vm/gc/shared/plab.inline.hpp
@@ -22,11 +22,11 @@
*
*/
-#ifndef SHARE_VM_GC_IMPLEMENTATION_SHARED_PLAB_INLINE_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_SHARED_PLAB_INLINE_HPP
+#ifndef SHARE_VM_GC_SHARED_PLAB_INLINE_HPP
+#define SHARE_VM_GC_SHARED_PLAB_INLINE_HPP
-#include "gc_implementation/shared/plab.hpp"
-#include "gc_interface/collectedHeap.inline.hpp"
+#include "gc/shared/collectedHeap.inline.hpp"
+#include "gc/shared/plab.hpp"
HeapWord* PLAB::allocate_aligned(size_t word_sz, unsigned short alignment_in_bytes) {
@@ -41,4 +41,4 @@ HeapWord* PLAB::allocate_aligned(size_t word_sz, unsigned short alignment_in_byt
return allocate(word_sz);
}
-#endif // SHARE_VM_GC_IMPLEMENTATION_SHARED_PLAB_INLINE_HPP
+#endif // SHARE_VM_GC_SHARED_PLAB_INLINE_HPP
diff --git a/hotspot/src/share/vm/memory/referencePolicy.cpp b/hotspot/src/share/vm/gc/shared/referencePolicy.cpp
similarity index 96%
rename from hotspot/src/share/vm/memory/referencePolicy.cpp
rename to hotspot/src/share/vm/gc/shared/referencePolicy.cpp
index a667332a7c8..e6102de2272 100644
--- a/hotspot/src/share/vm/memory/referencePolicy.cpp
+++ b/hotspot/src/share/vm/gc/shared/referencePolicy.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -24,7 +24,7 @@
#include "precompiled.hpp"
#include "classfile/javaClasses.hpp"
-#include "memory/referencePolicy.hpp"
+#include "gc/shared/referencePolicy.hpp"
#include "memory/universe.hpp"
#include "runtime/arguments.hpp"
#include "runtime/globals.hpp"
diff --git a/hotspot/src/share/vm/memory/referencePolicy.hpp b/hotspot/src/share/vm/gc/shared/referencePolicy.hpp
similarity index 91%
rename from hotspot/src/share/vm/memory/referencePolicy.hpp
rename to hotspot/src/share/vm/gc/shared/referencePolicy.hpp
index 971b9d0a620..f94862a6696 100644
--- a/hotspot/src/share/vm/memory/referencePolicy.hpp
+++ b/hotspot/src/share/vm/gc/shared/referencePolicy.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_MEMORY_REFERENCEPOLICY_HPP
-#define SHARE_VM_MEMORY_REFERENCEPOLICY_HPP
+#ifndef SHARE_VM_GC_SHARED_REFERENCEPOLICY_HPP
+#define SHARE_VM_GC_SHARED_REFERENCEPOLICY_HPP
// referencePolicy is used to determine when soft reference objects
// should be cleared.
@@ -78,4 +78,4 @@ class LRUMaxHeapPolicy : public ReferencePolicy {
virtual bool should_clear_reference(oop p, jlong timestamp_clock);
};
-#endif // SHARE_VM_MEMORY_REFERENCEPOLICY_HPP
+#endif // SHARE_VM_GC_SHARED_REFERENCEPOLICY_HPP
diff --git a/hotspot/src/share/vm/memory/referenceProcessor.cpp b/hotspot/src/share/vm/gc/shared/referenceProcessor.cpp
similarity index 99%
rename from hotspot/src/share/vm/memory/referenceProcessor.cpp
rename to hotspot/src/share/vm/gc/shared/referenceProcessor.cpp
index 2b8c20d383a..d9a68282e9d 100644
--- a/hotspot/src/share/vm/memory/referenceProcessor.cpp
+++ b/hotspot/src/share/vm/gc/shared/referenceProcessor.cpp
@@ -25,12 +25,12 @@
#include "precompiled.hpp"
#include "classfile/javaClasses.hpp"
#include "classfile/systemDictionary.hpp"
-#include "gc_implementation/shared/gcTimer.hpp"
-#include "gc_implementation/shared/gcTraceTime.hpp"
-#include "gc_interface/collectedHeap.hpp"
-#include "gc_interface/collectedHeap.inline.hpp"
-#include "memory/referencePolicy.hpp"
-#include "memory/referenceProcessor.hpp"
+#include "gc/shared/collectedHeap.hpp"
+#include "gc/shared/collectedHeap.inline.hpp"
+#include "gc/shared/gcTimer.hpp"
+#include "gc/shared/gcTraceTime.hpp"
+#include "gc/shared/referencePolicy.hpp"
+#include "gc/shared/referenceProcessor.hpp"
#include "oops/oop.inline.hpp"
#include "runtime/java.hpp"
#include "runtime/jniHandles.hpp"
diff --git a/hotspot/src/share/vm/memory/referenceProcessor.hpp b/hotspot/src/share/vm/gc/shared/referenceProcessor.hpp
similarity index 98%
rename from hotspot/src/share/vm/memory/referenceProcessor.hpp
rename to hotspot/src/share/vm/gc/shared/referenceProcessor.hpp
index 0f7b6f77673..1a8c805e233 100644
--- a/hotspot/src/share/vm/memory/referenceProcessor.hpp
+++ b/hotspot/src/share/vm/gc/shared/referenceProcessor.hpp
@@ -22,12 +22,12 @@
*
*/
-#ifndef SHARE_VM_MEMORY_REFERENCEPROCESSOR_HPP
-#define SHARE_VM_MEMORY_REFERENCEPROCESSOR_HPP
+#ifndef SHARE_VM_GC_SHARED_REFERENCEPROCESSOR_HPP
+#define SHARE_VM_GC_SHARED_REFERENCEPROCESSOR_HPP
-#include "gc_implementation/shared/gcTrace.hpp"
-#include "memory/referencePolicy.hpp"
-#include "memory/referenceProcessorStats.hpp"
+#include "gc/shared/gcTrace.hpp"
+#include "gc/shared/referencePolicy.hpp"
+#include "gc/shared/referenceProcessorStats.hpp"
#include "memory/referenceType.hpp"
#include "oops/instanceRefKlass.hpp"
@@ -657,4 +657,4 @@ protected:
int _n_queues;
};
-#endif // SHARE_VM_MEMORY_REFERENCEPROCESSOR_HPP
+#endif // SHARE_VM_GC_SHARED_REFERENCEPROCESSOR_HPP
diff --git a/hotspot/src/share/vm/memory/referenceProcessorStats.hpp b/hotspot/src/share/vm/gc/shared/referenceProcessorStats.hpp
similarity index 92%
rename from hotspot/src/share/vm/memory/referenceProcessorStats.hpp
rename to hotspot/src/share/vm/gc/shared/referenceProcessorStats.hpp
index 7497c09b92f..472430e818b 100644
--- a/hotspot/src/share/vm/memory/referenceProcessorStats.hpp
+++ b/hotspot/src/share/vm/gc/shared/referenceProcessorStats.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_MEMORY_REFERENCEPROCESSORSTATS_HPP
-#define SHARE_VM_MEMORY_REFERENCEPROCESSORSTATS_HPP
+#ifndef SHARE_VM_GC_SHARED_REFERENCEPROCESSORSTATS_HPP
+#define SHARE_VM_GC_SHARED_REFERENCEPROCESSORSTATS_HPP
#include "utilities/globalDefinitions.hpp"
diff --git a/hotspot/src/share/vm/memory/space.cpp b/hotspot/src/share/vm/gc/shared/space.cpp
similarity index 98%
rename from hotspot/src/share/vm/memory/space.cpp
rename to hotspot/src/share/vm/gc/shared/space.cpp
index 681c8e84201..b57e0a6936a 100644
--- a/hotspot/src/share/vm/memory/space.cpp
+++ b/hotspot/src/share/vm/gc/shared/space.cpp
@@ -25,21 +25,21 @@
#include "precompiled.hpp"
#include "classfile/systemDictionary.hpp"
#include "classfile/vmSymbols.hpp"
-#include "gc_implementation/shared/liveRange.hpp"
-#include "gc_implementation/shared/spaceDecorator.hpp"
-#include "gc_interface/collectedHeap.inline.hpp"
-#include "memory/blockOffsetTable.inline.hpp"
-#include "memory/defNewGeneration.hpp"
-#include "memory/genCollectedHeap.hpp"
-#include "memory/genOopClosures.inline.hpp"
-#include "memory/space.hpp"
-#include "memory/space.inline.hpp"
+#include "gc/serial/defNewGeneration.hpp"
+#include "gc/shared/blockOffsetTable.inline.hpp"
+#include "gc/shared/collectedHeap.inline.hpp"
+#include "gc/shared/genCollectedHeap.hpp"
+#include "gc/shared/genOopClosures.inline.hpp"
+#include "gc/shared/liveRange.hpp"
+#include "gc/shared/space.hpp"
+#include "gc/shared/space.inline.hpp"
+#include "gc/shared/spaceDecorator.hpp"
#include "memory/universe.inline.hpp"
#include "oops/oop.inline.hpp"
-#include "runtime/java.hpp"
#include "runtime/atomic.inline.hpp"
-#include "runtime/prefetch.inline.hpp"
+#include "runtime/java.hpp"
#include "runtime/orderAccess.inline.hpp"
+#include "runtime/prefetch.inline.hpp"
#include "runtime/safepoint.hpp"
#include "utilities/copy.hpp"
#include "utilities/globalDefinitions.hpp"
diff --git a/hotspot/src/share/vm/memory/space.hpp b/hotspot/src/share/vm/gc/shared/space.hpp
similarity index 99%
rename from hotspot/src/share/vm/memory/space.hpp
rename to hotspot/src/share/vm/gc/shared/space.hpp
index 61761ba3815..ca0941e37a6 100644
--- a/hotspot/src/share/vm/memory/space.hpp
+++ b/hotspot/src/share/vm/gc/shared/space.hpp
@@ -22,19 +22,19 @@
*
*/
-#ifndef SHARE_VM_MEMORY_SPACE_HPP
-#define SHARE_VM_MEMORY_SPACE_HPP
+#ifndef SHARE_VM_GC_SHARED_SPACE_HPP
+#define SHARE_VM_GC_SHARED_SPACE_HPP
+#include "gc/shared/blockOffsetTable.hpp"
+#include "gc/shared/cardTableModRefBS.hpp"
+#include "gc/shared/watermark.hpp"
+#include "gc/shared/workgroup.hpp"
#include "memory/allocation.hpp"
-#include "memory/blockOffsetTable.hpp"
-#include "memory/cardTableModRefBS.hpp"
#include "memory/iterator.hpp"
#include "memory/memRegion.hpp"
-#include "memory/watermark.hpp"
#include "oops/markOop.hpp"
#include "runtime/mutexLocker.hpp"
#include "utilities/macros.hpp"
-#include "utilities/workgroup.hpp"
// A space is an abstraction for the "storage units" backing
// up the generation abstraction. It includes specific
@@ -789,4 +789,4 @@ class TenuredSpace: public OffsetTableContigSpace {
MemRegion mr) :
OffsetTableContigSpace(sharedOffsetArray, mr) {}
};
-#endif // SHARE_VM_MEMORY_SPACE_HPP
+#endif // SHARE_VM_GC_SHARED_SPACE_HPP
diff --git a/hotspot/src/share/vm/memory/space.inline.hpp b/hotspot/src/share/vm/gc/shared/space.inline.hpp
similarity index 96%
rename from hotspot/src/share/vm/memory/space.inline.hpp
rename to hotspot/src/share/vm/gc/shared/space.inline.hpp
index ccb81527586..af6f1a8bfb2 100644
--- a/hotspot/src/share/vm/memory/space.inline.hpp
+++ b/hotspot/src/share/vm/gc/shared/space.inline.hpp
@@ -22,15 +22,15 @@
*
*/
-#ifndef SHARE_VM_MEMORY_SPACE_INLINE_HPP
-#define SHARE_VM_MEMORY_SPACE_INLINE_HPP
+#ifndef SHARE_VM_GC_SHARED_SPACE_INLINE_HPP
+#define SHARE_VM_GC_SHARED_SPACE_INLINE_HPP
-#include "gc_implementation/shared/liveRange.hpp"
-#include "gc_implementation/shared/markSweep.inline.hpp"
-#include "gc_implementation/shared/spaceDecorator.hpp"
-#include "gc_interface/collectedHeap.hpp"
-#include "memory/generation.hpp"
-#include "memory/space.hpp"
+#include "gc/serial/markSweep.inline.hpp"
+#include "gc/shared/collectedHeap.hpp"
+#include "gc/shared/generation.hpp"
+#include "gc/shared/liveRange.hpp"
+#include "gc/shared/space.hpp"
+#include "gc/shared/spaceDecorator.hpp"
#include "memory/universe.hpp"
#include "runtime/prefetch.inline.hpp"
#include "runtime/safepoint.hpp"
@@ -331,4 +331,4 @@ inline void CompactibleSpace::scan_and_compact(SpaceType* space) {
if (ZapUnusedHeapArea) space->mangle_unused_area();
}
}
-#endif // SHARE_VM_MEMORY_SPACE_INLINE_HPP
+#endif // SHARE_VM_GC_SHARED_SPACE_INLINE_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/shared/spaceDecorator.cpp b/hotspot/src/share/vm/gc/shared/spaceDecorator.cpp
similarity index 96%
rename from hotspot/src/share/vm/gc_implementation/shared/spaceDecorator.cpp
rename to hotspot/src/share/vm/gc/shared/spaceDecorator.cpp
index 1ff1e51c72d..b69e68762af 100644
--- a/hotspot/src/share/vm/gc_implementation/shared/spaceDecorator.cpp
+++ b/hotspot/src/share/vm/gc/shared/spaceDecorator.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -23,8 +23,8 @@
*/
#include "precompiled.hpp"
-#include "gc_implementation/shared/spaceDecorator.hpp"
-#include "memory/space.inline.hpp"
+#include "gc/shared/space.inline.hpp"
+#include "gc/shared/spaceDecorator.hpp"
#include "utilities/copy.hpp"
// Catch-all file for utility classes
diff --git a/hotspot/src/share/vm/gc_implementation/shared/spaceDecorator.hpp b/hotspot/src/share/vm/gc/shared/spaceDecorator.hpp
similarity index 94%
rename from hotspot/src/share/vm/gc_implementation/shared/spaceDecorator.hpp
rename to hotspot/src/share/vm/gc/shared/spaceDecorator.hpp
index 43bb04911a6..38ef84355f1 100644
--- a/hotspot/src/share/vm/gc_implementation/shared/spaceDecorator.hpp
+++ b/hotspot/src/share/vm/gc/shared/spaceDecorator.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,11 +22,11 @@
*
*/
-#ifndef SHARE_VM_GC_IMPLEMENTATION_SHARED_SPACEDECORATOR_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_SHARED_SPACEDECORATOR_HPP
+#ifndef SHARE_VM_GC_SHARED_SPACEDECORATOR_HPP
+#define SHARE_VM_GC_SHARED_SPACEDECORATOR_HPP
-#include "gc_implementation/shared/mutableSpace.hpp"
-#include "memory/space.hpp"
+#include "gc/parallel/mutableSpace.hpp"
+#include "gc/shared/space.hpp"
#include "utilities/globalDefinitions.hpp"
class SpaceDecorator: public AllStatic {
@@ -147,4 +147,4 @@ class MutableSpaceMangler: public SpaceMangler {
MutableSpaceMangler(MutableSpace* sp) : SpaceMangler(), _sp(sp) {}
};
-#endif // SHARE_VM_GC_IMPLEMENTATION_SHARED_SPACEDECORATOR_HPP
+#endif // SHARE_VM_GC_SHARED_SPACEDECORATOR_HPP
diff --git a/hotspot/src/share/vm/memory/specialized_oop_closures.hpp b/hotspot/src/share/vm/gc/shared/specialized_oop_closures.hpp
similarity index 95%
rename from hotspot/src/share/vm/memory/specialized_oop_closures.hpp
rename to hotspot/src/share/vm/gc/shared/specialized_oop_closures.hpp
index 5373ad8dcf3..9a2d81a4916 100644
--- a/hotspot/src/share/vm/memory/specialized_oop_closures.hpp
+++ b/hotspot/src/share/vm/gc/shared/specialized_oop_closures.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,12 +22,12 @@
*
*/
-#ifndef SHARE_VM_MEMORY_SPECIALIZED_OOP_CLOSURES_HPP
-#define SHARE_VM_MEMORY_SPECIALIZED_OOP_CLOSURES_HPP
+#ifndef SHARE_VM_GC_SHARED_SPECIALIZED_OOP_CLOSURES_HPP
+#define SHARE_VM_GC_SHARED_SPECIALIZED_OOP_CLOSURES_HPP
#include "utilities/macros.hpp"
#if INCLUDE_ALL_GCS
-#include "gc_implementation/g1/g1_specialized_oop_closures.hpp"
+#include "gc/g1/g1_specialized_oop_closures.hpp"
#endif // INCLUDE_ALL_GCS
// The following OopClosure types get specialized versions of
@@ -170,4 +170,4 @@ class NoHeaderExtendedOopClosure;
f(OopsInGenClosure,_v) \
SPECIALIZED_SINCE_SAVE_MARKS_CLOSURES(f)
-#endif // SHARE_VM_MEMORY_SPECIALIZED_OOP_CLOSURES_HPP
+#endif // SHARE_VM_GC_SHARED_SPECIALIZED_OOP_CLOSURES_HPP
diff --git a/hotspot/src/share/vm/memory/strongRootsScope.cpp b/hotspot/src/share/vm/gc/shared/strongRootsScope.cpp
similarity index 97%
rename from hotspot/src/share/vm/memory/strongRootsScope.cpp
rename to hotspot/src/share/vm/gc/shared/strongRootsScope.cpp
index 9b28475d485..82989c3e342 100644
--- a/hotspot/src/share/vm/memory/strongRootsScope.cpp
+++ b/hotspot/src/share/vm/gc/shared/strongRootsScope.cpp
@@ -25,7 +25,7 @@
#include "precompiled.hpp"
#include "classfile/stringTable.hpp"
#include "code/nmethod.hpp"
-#include "memory/strongRootsScope.hpp"
+#include "gc/shared/strongRootsScope.hpp"
#include "runtime/thread.hpp"
MarkScope::MarkScope(bool activate) : _active(activate) {
diff --git a/hotspot/src/share/vm/memory/strongRootsScope.hpp b/hotspot/src/share/vm/gc/shared/strongRootsScope.hpp
similarity index 90%
rename from hotspot/src/share/vm/memory/strongRootsScope.hpp
rename to hotspot/src/share/vm/gc/shared/strongRootsScope.hpp
index 3f8c7138dbe..3ec8fa6deca 100644
--- a/hotspot/src/share/vm/memory/strongRootsScope.hpp
+++ b/hotspot/src/share/vm/gc/shared/strongRootsScope.hpp
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_MEMORY_STRONGROOTSSCOPE_HPP
-#define SHARE_VM_MEMORY_STRONGROOTSSCOPE_HPP
+#ifndef SHARE_VM_GC_SHARED_STRONGROOTSSCOPE_HPP
+#define SHARE_VM_GC_SHARED_STRONGROOTSSCOPE_HPP
#include "memory/allocation.hpp"
@@ -43,4 +43,4 @@ class StrongRootsScope : public MarkScope {
~StrongRootsScope();
};
-#endif // SHARE_VM_MEMORY_STRONGROOTSSCOPE_HPP
+#endif // SHARE_VM_GC_SHARED_STRONGROOTSSCOPE_HPP
diff --git a/hotspot/src/share/vm/utilities/taskqueue.cpp b/hotspot/src/share/vm/gc/shared/taskqueue.cpp
similarity index 99%
rename from hotspot/src/share/vm/utilities/taskqueue.cpp
rename to hotspot/src/share/vm/gc/shared/taskqueue.cpp
index 18bcd621700..88cdfc69a3f 100644
--- a/hotspot/src/share/vm/utilities/taskqueue.cpp
+++ b/hotspot/src/share/vm/gc/shared/taskqueue.cpp
@@ -23,13 +23,13 @@
*/
#include "precompiled.hpp"
+#include "gc/shared/taskqueue.hpp"
#include "oops/oop.inline.hpp"
#include "runtime/atomic.inline.hpp"
#include "runtime/os.hpp"
#include "runtime/thread.inline.hpp"
#include "utilities/debug.hpp"
#include "utilities/stack.inline.hpp"
-#include "utilities/taskqueue.hpp"
#ifdef TRACESPINNING
uint ParallelTaskTerminator::_total_yields = 0;
diff --git a/hotspot/src/share/vm/utilities/taskqueue.hpp b/hotspot/src/share/vm/gc/shared/taskqueue.hpp
similarity index 99%
rename from hotspot/src/share/vm/utilities/taskqueue.hpp
rename to hotspot/src/share/vm/gc/shared/taskqueue.hpp
index 7e091924e04..5b80a9dcc4a 100644
--- a/hotspot/src/share/vm/utilities/taskqueue.hpp
+++ b/hotspot/src/share/vm/gc/shared/taskqueue.hpp
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_UTILITIES_TASKQUEUE_HPP
-#define SHARE_VM_UTILITIES_TASKQUEUE_HPP
+#ifndef SHARE_VM_GC_SHARED_TASKQUEUE_HPP
+#define SHARE_VM_GC_SHARED_TASKQUEUE_HPP
#include "memory/allocation.hpp"
#include "utilities/stack.hpp"
@@ -557,4 +557,4 @@ typedef OverflowTaskQueue RegionTaskQueue;
typedef GenericTaskQueueSet RegionTaskQueueSet;
-#endif // SHARE_VM_UTILITIES_TASKQUEUE_HPP
+#endif // SHARE_VM_GC_SHARED_TASKQUEUE_HPP
diff --git a/hotspot/src/share/vm/utilities/taskqueue.inline.hpp b/hotspot/src/share/vm/gc/shared/taskqueue.inline.hpp
similarity index 98%
rename from hotspot/src/share/vm/utilities/taskqueue.inline.hpp
rename to hotspot/src/share/vm/gc/shared/taskqueue.inline.hpp
index 9f4eb3ea773..4af4765c661 100644
--- a/hotspot/src/share/vm/utilities/taskqueue.inline.hpp
+++ b/hotspot/src/share/vm/gc/shared/taskqueue.inline.hpp
@@ -22,16 +22,16 @@
*
*/
-#ifndef SHARE_VM_UTILITIES_TASKQUEUE_INLINE_HPP
-#define SHARE_VM_UTILITIES_TASKQUEUE_INLINE_HPP
+#ifndef SHARE_VM_GC_SHARED_TASKQUEUE_INLINE_HPP
+#define SHARE_VM_GC_SHARED_TASKQUEUE_INLINE_HPP
+#include "gc/shared/taskqueue.hpp"
#include "memory/allocation.inline.hpp"
#include "oops/oop.inline.hpp"
-#include "utilities/debug.hpp"
-#include "utilities/taskqueue.hpp"
-#include "utilities/stack.inline.hpp"
#include "runtime/atomic.inline.hpp"
#include "runtime/orderAccess.inline.hpp"
+#include "utilities/debug.hpp"
+#include "utilities/stack.inline.hpp"
template
inline GenericTaskQueueSet::GenericTaskQueueSet(int n) : _n(n) {
@@ -276,4 +276,4 @@ inline void GenericTaskQueue::oops_do(OopClosure* f) {
}
-#endif // SHARE_VM_UTILITIES_TASKQUEUE_INLINE_HPP
+#endif // SHARE_VM_GC_SHARED_TASKQUEUE_INLINE_HPP
diff --git a/hotspot/src/share/vm/memory/threadLocalAllocBuffer.cpp b/hotspot/src/share/vm/gc/shared/threadLocalAllocBuffer.cpp
similarity index 98%
rename from hotspot/src/share/vm/memory/threadLocalAllocBuffer.cpp
rename to hotspot/src/share/vm/gc/shared/threadLocalAllocBuffer.cpp
index 177d638922b..fe24138088e 100644
--- a/hotspot/src/share/vm/memory/threadLocalAllocBuffer.cpp
+++ b/hotspot/src/share/vm/gc/shared/threadLocalAllocBuffer.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -23,9 +23,9 @@
*/
#include "precompiled.hpp"
-#include "memory/genCollectedHeap.hpp"
+#include "gc/shared/genCollectedHeap.hpp"
+#include "gc/shared/threadLocalAllocBuffer.inline.hpp"
#include "memory/resourceArea.hpp"
-#include "memory/threadLocalAllocBuffer.inline.hpp"
#include "memory/universe.inline.hpp"
#include "oops/oop.inline.hpp"
#include "runtime/thread.inline.hpp"
diff --git a/hotspot/src/share/vm/memory/threadLocalAllocBuffer.hpp b/hotspot/src/share/vm/gc/shared/threadLocalAllocBuffer.hpp
similarity index 97%
rename from hotspot/src/share/vm/memory/threadLocalAllocBuffer.hpp
rename to hotspot/src/share/vm/gc/shared/threadLocalAllocBuffer.hpp
index 11e70672c93..60e05dcab26 100644
--- a/hotspot/src/share/vm/memory/threadLocalAllocBuffer.hpp
+++ b/hotspot/src/share/vm/gc/shared/threadLocalAllocBuffer.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,10 +22,10 @@
*
*/
-#ifndef SHARE_VM_MEMORY_THREADLOCALALLOCBUFFER_HPP
-#define SHARE_VM_MEMORY_THREADLOCALALLOCBUFFER_HPP
+#ifndef SHARE_VM_GC_SHARED_THREADLOCALALLOCBUFFER_HPP
+#define SHARE_VM_GC_SHARED_THREADLOCALALLOCBUFFER_HPP
-#include "gc_implementation/shared/gcUtil.hpp"
+#include "gc/shared/gcUtil.hpp"
#include "oops/typeArrayOop.hpp"
#include "runtime/perfData.hpp"
#include "runtime/vm_version.hpp"
@@ -260,4 +260,4 @@ public:
}
};
-#endif // SHARE_VM_MEMORY_THREADLOCALALLOCBUFFER_HPP
+#endif // SHARE_VM_GC_SHARED_THREADLOCALALLOCBUFFER_HPP
diff --git a/hotspot/src/share/vm/memory/threadLocalAllocBuffer.inline.hpp b/hotspot/src/share/vm/gc/shared/threadLocalAllocBuffer.inline.hpp
similarity index 91%
rename from hotspot/src/share/vm/memory/threadLocalAllocBuffer.inline.hpp
rename to hotspot/src/share/vm/gc/shared/threadLocalAllocBuffer.inline.hpp
index 60e645fa6ff..774d2a3cda9 100644
--- a/hotspot/src/share/vm/memory/threadLocalAllocBuffer.inline.hpp
+++ b/hotspot/src/share/vm/gc/shared/threadLocalAllocBuffer.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,11 +22,11 @@
*
*/
-#ifndef SHARE_VM_MEMORY_THREADLOCALALLOCBUFFER_INLINE_HPP
-#define SHARE_VM_MEMORY_THREADLOCALALLOCBUFFER_INLINE_HPP
+#ifndef SHARE_VM_GC_SHARED_THREADLOCALALLOCBUFFER_INLINE_HPP
+#define SHARE_VM_GC_SHARED_THREADLOCALALLOCBUFFER_INLINE_HPP
-#include "gc_interface/collectedHeap.hpp"
-#include "memory/threadLocalAllocBuffer.hpp"
+#include "gc/shared/collectedHeap.hpp"
+#include "gc/shared/threadLocalAllocBuffer.hpp"
#include "runtime/thread.hpp"
#include "utilities/copy.hpp"
@@ -102,4 +102,4 @@ void ThreadLocalAllocBuffer::record_slow_allocation(size_t obj_size) {
}
}
-#endif // SHARE_VM_MEMORY_THREADLOCALALLOCBUFFER_INLINE_HPP
+#endif // SHARE_VM_GC_SHARED_THREADLOCALALLOCBUFFER_INLINE_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/shared/vmGCOperations.cpp b/hotspot/src/share/vm/gc/shared/vmGCOperations.cpp
similarity index 98%
rename from hotspot/src/share/vm/gc_implementation/shared/vmGCOperations.cpp
rename to hotspot/src/share/vm/gc/shared/vmGCOperations.cpp
index dcfcbfb82ed..eab327db541 100644
--- a/hotspot/src/share/vm/gc_implementation/shared/vmGCOperations.cpp
+++ b/hotspot/src/share/vm/gc/shared/vmGCOperations.cpp
@@ -25,9 +25,9 @@
#include "precompiled.hpp"
#include "classfile/classLoader.hpp"
#include "classfile/javaClasses.hpp"
-#include "gc_implementation/shared/vmGCOperations.hpp"
-#include "memory/gcLocker.inline.hpp"
-#include "memory/genCollectedHeap.hpp"
+#include "gc/shared/gcLocker.inline.hpp"
+#include "gc/shared/genCollectedHeap.hpp"
+#include "gc/shared/vmGCOperations.hpp"
#include "memory/oopFactory.hpp"
#include "oops/instanceKlass.hpp"
#include "oops/instanceRefKlass.hpp"
@@ -35,10 +35,10 @@
#include "runtime/init.hpp"
#include "runtime/interfaceSupport.hpp"
#include "utilities/dtrace.hpp"
-#include "utilities/preserveException.hpp"
#include "utilities/macros.hpp"
+#include "utilities/preserveException.hpp"
#if INCLUDE_ALL_GCS
-#include "gc_implementation/g1/g1CollectedHeap.inline.hpp"
+#include "gc/g1/g1CollectedHeap.inline.hpp"
#endif // INCLUDE_ALL_GCS
VM_GC_Operation::~VM_GC_Operation() {
diff --git a/hotspot/src/share/vm/gc_implementation/shared/vmGCOperations.hpp b/hotspot/src/share/vm/gc/shared/vmGCOperations.hpp
similarity index 97%
rename from hotspot/src/share/vm/gc_implementation/shared/vmGCOperations.hpp
rename to hotspot/src/share/vm/gc/shared/vmGCOperations.hpp
index 284d2d13822..6e15272820f 100644
--- a/hotspot/src/share/vm/gc_implementation/shared/vmGCOperations.hpp
+++ b/hotspot/src/share/vm/gc/shared/vmGCOperations.hpp
@@ -22,16 +22,16 @@
*
*/
-#ifndef SHARE_VM_GC_IMPLEMENTATION_SHARED_VMGCOPERATIONS_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_SHARED_VMGCOPERATIONS_HPP
+#ifndef SHARE_VM_GC_SHARED_VMGCOPERATIONS_HPP
+#define SHARE_VM_GC_SHARED_VMGCOPERATIONS_HPP
-#include "gc_interface/collectedHeap.hpp"
+#include "gc/shared/collectedHeap.hpp"
#include "memory/heapInspection.hpp"
+#include "prims/jvmtiExport.hpp"
#include "runtime/handles.hpp"
#include "runtime/jniHandles.hpp"
#include "runtime/synchronizer.hpp"
#include "runtime/vm_operations.hpp"
-#include "prims/jvmtiExport.hpp"
// The following class hierarchy represents
// a set of operations (VM_Operation) related to GC.
@@ -243,4 +243,4 @@ class SvcGCMarker : public StackObj {
}
};
-#endif // SHARE_VM_GC_IMPLEMENTATION_SHARED_VMGCOPERATIONS_HPP
+#endif // SHARE_VM_GC_SHARED_VMGCOPERATIONS_HPP
diff --git a/hotspot/src/share/vm/memory/watermark.hpp b/hotspot/src/share/vm/gc/shared/watermark.hpp
similarity index 90%
rename from hotspot/src/share/vm/memory/watermark.hpp
rename to hotspot/src/share/vm/gc/shared/watermark.hpp
index 4d65aab1e14..af33e7b94c8 100644
--- a/hotspot/src/share/vm/memory/watermark.hpp
+++ b/hotspot/src/share/vm/gc/shared/watermark.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_MEMORY_WATERMARK_HPP
-#define SHARE_VM_MEMORY_WATERMARK_HPP
+#ifndef SHARE_VM_GC_SHARED_WATERMARK_HPP
+#define SHARE_VM_GC_SHARED_WATERMARK_HPP
#include "memory/allocation.hpp"
#include "utilities/globalDefinitions.hpp"
@@ -58,4 +58,4 @@ inline bool operator!=(const WaterMark& x, const WaterMark& y) {
return !(x == y);
}
-#endif // SHARE_VM_MEMORY_WATERMARK_HPP
+#endif // SHARE_VM_GC_SHARED_WATERMARK_HPP
diff --git a/hotspot/src/share/vm/utilities/workgroup.cpp b/hotspot/src/share/vm/gc/shared/workgroup.cpp
similarity index 99%
rename from hotspot/src/share/vm/utilities/workgroup.cpp
rename to hotspot/src/share/vm/gc/shared/workgroup.cpp
index 61c1ccacf56..571a615c3c2 100644
--- a/hotspot/src/share/vm/utilities/workgroup.cpp
+++ b/hotspot/src/share/vm/gc/shared/workgroup.cpp
@@ -23,11 +23,11 @@
*/
#include "precompiled.hpp"
+#include "gc/shared/workgroup.hpp"
#include "memory/allocation.hpp"
#include "memory/allocation.inline.hpp"
#include "runtime/atomic.inline.hpp"
#include "runtime/os.hpp"
-#include "utilities/workgroup.hpp"
// Definitions of WorkGang methods.
diff --git a/hotspot/src/share/vm/utilities/workgroup.hpp b/hotspot/src/share/vm/gc/shared/workgroup.hpp
similarity index 99%
rename from hotspot/src/share/vm/utilities/workgroup.hpp
rename to hotspot/src/share/vm/gc/shared/workgroup.hpp
index ace227d9a78..1f1d82c72f6 100644
--- a/hotspot/src/share/vm/utilities/workgroup.hpp
+++ b/hotspot/src/share/vm/gc/shared/workgroup.hpp
@@ -22,11 +22,11 @@
*
*/
-#ifndef SHARE_VM_UTILITIES_WORKGROUP_HPP
-#define SHARE_VM_UTILITIES_WORKGROUP_HPP
+#ifndef SHARE_VM_GC_SHARED_WORKGROUP_HPP
+#define SHARE_VM_GC_SHARED_WORKGROUP_HPP
+#include "gc/shared/taskqueue.hpp"
#include "runtime/thread.inline.hpp"
-#include "utilities/taskqueue.hpp"
// Task class hierarchy:
// AbstractGangTask
@@ -528,4 +528,4 @@ public:
void release_par_id(int id);
};
-#endif // SHARE_VM_UTILITIES_WORKGROUP_HPP
+#endif // SHARE_VM_GC_SHARED_WORKGROUP_HPP
diff --git a/hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp b/hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp
index 802879268ab..7a9325c54ec 100644
--- a/hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp
+++ b/hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp
@@ -24,7 +24,7 @@
// no precompiled headers
#include "classfile/vmSymbols.hpp"
-#include "gc_interface/collectedHeap.hpp"
+#include "gc/shared/collectedHeap.hpp"
#include "interpreter/bytecodeHistogram.hpp"
#include "interpreter/bytecodeInterpreter.hpp"
#include "interpreter/bytecodeInterpreter.inline.hpp"
diff --git a/hotspot/src/share/vm/interpreter/interpreterRuntime.cpp b/hotspot/src/share/vm/interpreter/interpreterRuntime.cpp
index 287d611edab..f2874943e57 100644
--- a/hotspot/src/share/vm/interpreter/interpreterRuntime.cpp
+++ b/hotspot/src/share/vm/interpreter/interpreterRuntime.cpp
@@ -28,7 +28,7 @@
#include "classfile/vmSymbols.hpp"
#include "compiler/compileBroker.hpp"
#include "compiler/disassembler.hpp"
-#include "gc_interface/collectedHeap.hpp"
+#include "gc/shared/collectedHeap.hpp"
#include "interpreter/interpreter.hpp"
#include "interpreter/interpreterRuntime.hpp"
#include "interpreter/linkResolver.hpp"
diff --git a/hotspot/src/share/vm/interpreter/linkResolver.cpp b/hotspot/src/share/vm/interpreter/linkResolver.cpp
index 49b5a51d026..fe83dc974c0 100644
--- a/hotspot/src/share/vm/interpreter/linkResolver.cpp
+++ b/hotspot/src/share/vm/interpreter/linkResolver.cpp
@@ -27,7 +27,7 @@
#include "classfile/systemDictionary.hpp"
#include "classfile/vmSymbols.hpp"
#include "compiler/compileBroker.hpp"
-#include "gc_interface/collectedHeap.inline.hpp"
+#include "gc/shared/collectedHeap.inline.hpp"
#include "interpreter/bytecode.hpp"
#include "interpreter/interpreterRuntime.hpp"
#include "interpreter/linkResolver.hpp"
diff --git a/hotspot/src/share/vm/interpreter/rewriter.cpp b/hotspot/src/share/vm/interpreter/rewriter.cpp
index 2dc51f345d6..20ddee9a478 100644
--- a/hotspot/src/share/vm/interpreter/rewriter.cpp
+++ b/hotspot/src/share/vm/interpreter/rewriter.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -23,11 +23,11 @@
*/
#include "precompiled.hpp"
+#include "gc/shared/gcLocker.hpp"
#include "interpreter/bytecodes.hpp"
#include "interpreter/interpreter.hpp"
#include "interpreter/rewriter.hpp"
#include "memory/metaspaceShared.hpp"
-#include "memory/gcLocker.hpp"
#include "memory/resourceArea.hpp"
#include "oops/generateOopMap.hpp"
#include "prims/methodHandles.hpp"
diff --git a/hotspot/src/share/vm/interpreter/templateTable.cpp b/hotspot/src/share/vm/interpreter/templateTable.cpp
index 3450dbd825f..ddd7fc6470c 100644
--- a/hotspot/src/share/vm/interpreter/templateTable.cpp
+++ b/hotspot/src/share/vm/interpreter/templateTable.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
*/
#include "precompiled.hpp"
-#include "gc_interface/collectedHeap.hpp"
+#include "gc/shared/collectedHeap.hpp"
#include "interpreter/interp_masm.hpp"
#include "interpreter/templateTable.hpp"
#include "runtime/timer.hpp"
diff --git a/hotspot/src/share/vm/memory/allocation.cpp b/hotspot/src/share/vm/memory/allocation.cpp
index 56734768eed..ae60b890721 100644
--- a/hotspot/src/share/vm/memory/allocation.cpp
+++ b/hotspot/src/share/vm/memory/allocation.cpp
@@ -23,9 +23,9 @@
*/
#include "precompiled.hpp"
+#include "gc/shared/genCollectedHeap.hpp"
#include "memory/allocation.hpp"
#include "memory/allocation.inline.hpp"
-#include "memory/genCollectedHeap.hpp"
#include "memory/metaspaceShared.hpp"
#include "memory/resourceArea.hpp"
#include "memory/universe.hpp"
diff --git a/hotspot/src/share/vm/memory/binaryTreeDictionary.cpp b/hotspot/src/share/vm/memory/binaryTreeDictionary.cpp
index 5988eeef516..d97547c4116 100644
--- a/hotspot/src/share/vm/memory/binaryTreeDictionary.cpp
+++ b/hotspot/src/share/vm/memory/binaryTreeDictionary.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -23,19 +23,18 @@
*/
#include "precompiled.hpp"
-#include "gc_implementation/shared/allocationStats.hpp"
-#include "gc_implementation/shared/spaceDecorator.hpp"
+#include "gc/cms/allocationStats.hpp"
+#include "gc/shared/spaceDecorator.hpp"
#include "memory/binaryTreeDictionary.hpp"
-#include "memory/freeList.hpp"
#include "memory/freeBlockDictionary.hpp"
+#include "memory/freeList.hpp"
#include "memory/metachunk.hpp"
#include "runtime/globals.hpp"
-#include "utilities/ostream.hpp"
#include "utilities/macros.hpp"
+#include "utilities/ostream.hpp"
#if INCLUDE_ALL_GCS
-#include "gc_implementation/concurrentMarkSweep/adaptiveFreeList.hpp"
-#include "gc_implementation/concurrentMarkSweep/freeChunk.hpp"
-#include "gc_implementation/concurrentMarkSweep/freeChunk.hpp"
+#include "gc/cms/adaptiveFreeList.hpp"
+#include "gc/cms/freeChunk.hpp"
#endif // INCLUDE_ALL_GCS
////////////////////////////////////////////////////////////////////////////////
diff --git a/hotspot/src/share/vm/memory/freeBlockDictionary.cpp b/hotspot/src/share/vm/memory/freeBlockDictionary.cpp
index 3ac6f88d4ad..cf7103d710a 100644
--- a/hotspot/src/share/vm/memory/freeBlockDictionary.cpp
+++ b/hotspot/src/share/vm/memory/freeBlockDictionary.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,7 @@
#include "runtime/thread.inline.hpp"
#include "utilities/macros.hpp"
#if INCLUDE_ALL_GCS
-#include "gc_implementation/concurrentMarkSweep/freeChunk.hpp"
+#include "gc/cms/freeChunk.hpp"
#endif // INCLUDE_ALL_GCS
#ifndef PRODUCT
diff --git a/hotspot/src/share/vm/memory/freeList.cpp b/hotspot/src/share/vm/memory/freeList.cpp
index 6cddc6aed41..77ee98719f4 100644
--- a/hotspot/src/share/vm/memory/freeList.cpp
+++ b/hotspot/src/share/vm/memory/freeList.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
*/
#include "precompiled.hpp"
-#include "gc_interface/collectedHeap.hpp"
+#include "gc/shared/collectedHeap.hpp"
#include "memory/freeBlockDictionary.hpp"
#include "memory/freeList.hpp"
#include "memory/metachunk.hpp"
@@ -32,7 +32,7 @@
#include "runtime/vmThread.hpp"
#include "utilities/macros.hpp"
#if INCLUDE_ALL_GCS
-#include "gc_implementation/concurrentMarkSweep/freeChunk.hpp"
+#include "gc/cms/freeChunk.hpp"
#endif // INCLUDE_ALL_GCS
// Free list. A FreeList is used to access a linked list of chunks
diff --git a/hotspot/src/share/vm/memory/freeList.hpp b/hotspot/src/share/vm/memory/freeList.hpp
index 80d07117ee2..1d3eeddbca9 100644
--- a/hotspot/src/share/vm/memory/freeList.hpp
+++ b/hotspot/src/share/vm/memory/freeList.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
#ifndef SHARE_VM_MEMORY_FREELIST_HPP
#define SHARE_VM_MEMORY_FREELIST_HPP
-#include "gc_implementation/shared/allocationStats.hpp"
+#include "gc/cms/allocationStats.hpp"
class CompactibleFreeListSpace;
diff --git a/hotspot/src/share/vm/memory/genRemSet.inline.hpp b/hotspot/src/share/vm/memory/genRemSet.inline.hpp
deleted file mode 100644
index c468e859d83..00000000000
--- a/hotspot/src/share/vm/memory/genRemSet.inline.hpp
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-#ifndef SHARE_VM_MEMORY_GENREMSET_INLINE_HPP
-#define SHARE_VM_MEMORY_GENREMSET_INLINE_HPP
-
-// Inline functions of GenRemSet, which de-virtualize this
-// performance-critical call when when the rem set is the most common
-// card-table kind.
-
-void GenRemSet::write_ref_field_gc(void* field, oop new_val) {
- if (kind() == CardTableModRef) {
- ((CardTableRS*)this)->inline_write_ref_field_gc(field, new_val);
- } else {
- write_ref_field_gc_work(field, new_val);
- }
-}
-
-#endif // SHARE_VM_MEMORY_GENREMSET_INLINE_HPP
diff --git a/hotspot/src/share/vm/memory/heapInspection.cpp b/hotspot/src/share/vm/memory/heapInspection.cpp
index 31ba78e8db1..6f24c4917af 100644
--- a/hotspot/src/share/vm/memory/heapInspection.cpp
+++ b/hotspot/src/share/vm/memory/heapInspection.cpp
@@ -25,8 +25,8 @@
#include "precompiled.hpp"
#include "classfile/classLoaderData.hpp"
#include "classfile/systemDictionary.hpp"
-#include "gc_interface/collectedHeap.hpp"
-#include "memory/genCollectedHeap.hpp"
+#include "gc/shared/collectedHeap.hpp"
+#include "gc/shared/genCollectedHeap.hpp"
#include "memory/heapInspection.hpp"
#include "memory/resourceArea.hpp"
#include "oops/oop.inline.hpp"
@@ -35,7 +35,7 @@
#include "utilities/macros.hpp"
#include "utilities/stack.inline.hpp"
#if INCLUDE_ALL_GCS
-#include "gc_implementation/parallelScavenge/parallelScavengeHeap.hpp"
+#include "gc/parallel/parallelScavengeHeap.hpp"
#endif // INCLUDE_ALL_GCS
// HeapInspection
diff --git a/hotspot/src/share/vm/memory/metaspace.cpp b/hotspot/src/share/vm/memory/metaspace.cpp
index bde49b33468..fd48fe11021 100644
--- a/hotspot/src/share/vm/memory/metaspace.cpp
+++ b/hotspot/src/share/vm/memory/metaspace.cpp
@@ -22,14 +22,13 @@
*
*/
#include "precompiled.hpp"
-#include "gc_interface/collectedHeap.hpp"
+#include "gc/shared/collectedHeap.hpp"
+#include "gc/shared/collectorPolicy.hpp"
+#include "gc/shared/gcLocker.hpp"
#include "memory/allocation.hpp"
#include "memory/binaryTreeDictionary.hpp"
-#include "memory/freeList.hpp"
-#include "memory/collectorPolicy.hpp"
#include "memory/filemap.hpp"
#include "memory/freeList.hpp"
-#include "memory/gcLocker.hpp"
#include "memory/metachunk.hpp"
#include "memory/metaspace.hpp"
#include "memory/metaspaceGCThresholdUpdater.hpp"
diff --git a/hotspot/src/share/vm/memory/metaspaceShared.cpp b/hotspot/src/share/vm/memory/metaspaceShared.cpp
index 613907d8420..4c1d01cae92 100644
--- a/hotspot/src/share/vm/memory/metaspaceShared.cpp
+++ b/hotspot/src/share/vm/memory/metaspaceShared.cpp
@@ -30,18 +30,18 @@
#include "classfile/symbolTable.hpp"
#include "classfile/systemDictionary.hpp"
#include "code/codeCache.hpp"
-#include "interpreter/bytecodes.hpp"
+#include "gc/shared/gcLocker.hpp"
#include "interpreter/bytecodeStream.hpp"
+#include "interpreter/bytecodes.hpp"
#include "memory/filemap.hpp"
-#include "memory/gcLocker.hpp"
#include "memory/metaspace.hpp"
#include "memory/metaspaceShared.hpp"
#include "oops/objArrayOop.hpp"
#include "oops/oop.inline.hpp"
#include "runtime/os.hpp"
#include "runtime/signature.hpp"
-#include "runtime/vm_operations.hpp"
#include "runtime/vmThread.hpp"
+#include "runtime/vm_operations.hpp"
#include "utilities/hashtable.inline.hpp"
PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
diff --git a/hotspot/src/share/vm/memory/oopFactory.cpp b/hotspot/src/share/vm/memory/oopFactory.cpp
index 8318e3bf0d4..1e214b328d3 100644
--- a/hotspot/src/share/vm/memory/oopFactory.cpp
+++ b/hotspot/src/share/vm/memory/oopFactory.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@
#include "classfile/symbolTable.hpp"
#include "classfile/systemDictionary.hpp"
#include "classfile/vmSymbols.hpp"
-#include "gc_interface/collectedHeap.inline.hpp"
+#include "gc/shared/collectedHeap.inline.hpp"
#include "memory/oopFactory.hpp"
#include "memory/resourceArea.hpp"
#include "memory/universe.inline.hpp"
diff --git a/hotspot/src/share/vm/memory/universe.cpp b/hotspot/src/share/vm/memory/universe.cpp
index 1cd4d909b0a..a19aaa43b1d 100644
--- a/hotspot/src/share/vm/memory/universe.cpp
+++ b/hotspot/src/share/vm/memory/universe.cpp
@@ -31,18 +31,18 @@
#include "classfile/vmSymbols.hpp"
#include "code/codeCache.hpp"
#include "code/dependencies.hpp"
-#include "gc_interface/collectedHeap.inline.hpp"
+#include "gc/shared/cardTableModRefBS.hpp"
+#include "gc/shared/collectedHeap.inline.hpp"
+#include "gc/shared/gcLocker.inline.hpp"
+#include "gc/shared/genCollectedHeap.hpp"
+#include "gc/shared/genRemSet.hpp"
+#include "gc/shared/generation.hpp"
+#include "gc/shared/space.hpp"
#include "interpreter/interpreter.hpp"
-#include "memory/cardTableModRefBS.hpp"
#include "memory/filemap.hpp"
-#include "memory/gcLocker.inline.hpp"
-#include "memory/genCollectedHeap.hpp"
-#include "memory/genRemSet.hpp"
-#include "memory/generation.hpp"
#include "memory/metadataFactory.hpp"
#include "memory/metaspaceShared.hpp"
#include "memory/oopFactory.hpp"
-#include "memory/space.hpp"
#include "memory/universe.hpp"
#include "memory/universe.inline.hpp"
#include "oops/constantPool.hpp"
@@ -71,14 +71,14 @@
#include "utilities/copy.hpp"
#include "utilities/events.hpp"
#include "utilities/hashtable.inline.hpp"
-#include "utilities/preserveException.hpp"
#include "utilities/macros.hpp"
+#include "utilities/preserveException.hpp"
#if INCLUDE_ALL_GCS
-#include "gc_implementation/shared/adaptiveSizePolicy.hpp"
-#include "gc_implementation/concurrentMarkSweep/cmsCollectorPolicy.hpp"
-#include "gc_implementation/g1/g1CollectedHeap.inline.hpp"
-#include "gc_implementation/g1/g1CollectorPolicy_ext.hpp"
-#include "gc_implementation/parallelScavenge/parallelScavengeHeap.hpp"
+#include "gc/cms/cmsCollectorPolicy.hpp"
+#include "gc/g1/g1CollectedHeap.inline.hpp"
+#include "gc/g1/g1CollectorPolicy_ext.hpp"
+#include "gc/parallel/parallelScavengeHeap.hpp"
+#include "gc/shared/adaptiveSizePolicy.hpp"
#endif // INCLUDE_ALL_GCS
#if INCLUDE_CDS
#include "classfile/sharedClassUtil.hpp"
diff --git a/hotspot/src/share/vm/oops/arrayKlass.cpp b/hotspot/src/share/vm/oops/arrayKlass.cpp
index 74898de3f07..b580c668f87 100644
--- a/hotspot/src/share/vm/oops/arrayKlass.cpp
+++ b/hotspot/src/share/vm/oops/arrayKlass.cpp
@@ -26,9 +26,9 @@
#include "classfile/javaClasses.hpp"
#include "classfile/systemDictionary.hpp"
#include "classfile/vmSymbols.hpp"
-#include "gc_interface/collectedHeap.inline.hpp"
+#include "gc/shared/collectedHeap.inline.hpp"
+#include "gc/shared/gcLocker.hpp"
#include "jvmtifiles/jvmti.h"
-#include "memory/gcLocker.hpp"
#include "memory/universe.inline.hpp"
#include "oops/arrayKlass.hpp"
#include "oops/arrayOop.hpp"
diff --git a/hotspot/src/share/vm/oops/constMethod.cpp b/hotspot/src/share/vm/oops/constMethod.cpp
index 88d2c0ffee4..5b66ab2b6c9 100644
--- a/hotspot/src/share/vm/oops/constMethod.cpp
+++ b/hotspot/src/share/vm/oops/constMethod.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -23,8 +23,8 @@
*/
#include "precompiled.hpp"
+#include "gc/shared/gcLocker.hpp"
#include "interpreter/interpreter.hpp"
-#include "memory/gcLocker.hpp"
#include "memory/heapInspection.hpp"
#include "memory/metadataFactory.hpp"
#include "oops/constMethod.hpp"
diff --git a/hotspot/src/share/vm/oops/instanceClassLoaderKlass.hpp b/hotspot/src/share/vm/oops/instanceClassLoaderKlass.hpp
index 2585a901261..18d377b66d8 100644
--- a/hotspot/src/share/vm/oops/instanceClassLoaderKlass.hpp
+++ b/hotspot/src/share/vm/oops/instanceClassLoaderKlass.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
#ifndef SHARE_VM_OOPS_INSTANCECLASSLOADERKLASS_HPP
#define SHARE_VM_OOPS_INSTANCECLASSLOADERKLASS_HPP
-#include "memory/specialized_oop_closures.hpp"
+#include "gc/shared/specialized_oop_closures.hpp"
#include "oops/instanceKlass.hpp"
#include "utilities/macros.hpp"
diff --git a/hotspot/src/share/vm/oops/instanceKlass.cpp b/hotspot/src/share/vm/oops/instanceKlass.cpp
index 4aa435bd4c5..a3d6408bb15 100644
--- a/hotspot/src/share/vm/oops/instanceKlass.cpp
+++ b/hotspot/src/share/vm/oops/instanceKlass.cpp
@@ -28,7 +28,8 @@
#include "classfile/verifier.hpp"
#include "classfile/vmSymbols.hpp"
#include "compiler/compileBroker.hpp"
-#include "gc_interface/collectedHeap.inline.hpp"
+#include "gc/shared/collectedHeap.inline.hpp"
+#include "gc/shared/specialized_oop_closures.hpp"
#include "interpreter/oopMapCache.hpp"
#include "interpreter/rewriter.hpp"
#include "jvmtifiles/jvmti.h"
@@ -36,7 +37,6 @@
#include "memory/iterator.inline.hpp"
#include "memory/metadataFactory.hpp"
#include "memory/oopFactory.hpp"
-#include "memory/specialized_oop_closures.hpp"
#include "oops/fieldStreams.hpp"
#include "oops/instanceClassLoaderKlass.hpp"
#include "oops/instanceKlass.inline.hpp"
@@ -47,8 +47,8 @@
#include "oops/oop.inline.hpp"
#include "oops/symbol.hpp"
#include "prims/jvmtiExport.hpp"
-#include "prims/jvmtiRedefineClassesTrace.hpp"
#include "prims/jvmtiRedefineClasses.hpp"
+#include "prims/jvmtiRedefineClassesTrace.hpp"
#include "prims/jvmtiThreadState.hpp"
#include "prims/methodComparator.hpp"
#include "runtime/atomic.inline.hpp"
diff --git a/hotspot/src/share/vm/oops/instanceKlass.hpp b/hotspot/src/share/vm/oops/instanceKlass.hpp
index 4219a800aa0..3291e7927ed 100644
--- a/hotspot/src/share/vm/oops/instanceKlass.hpp
+++ b/hotspot/src/share/vm/oops/instanceKlass.hpp
@@ -26,8 +26,8 @@
#define SHARE_VM_OOPS_INSTANCEKLASS_HPP
#include "classfile/classLoaderData.hpp"
+#include "gc/shared/specialized_oop_closures.hpp"
#include "memory/referenceType.hpp"
-#include "memory/specialized_oop_closures.hpp"
#include "oops/annotations.hpp"
#include "oops/constMethod.hpp"
#include "oops/fieldInfo.hpp"
@@ -35,10 +35,10 @@
#include "oops/klassVtable.hpp"
#include "runtime/handles.hpp"
#include "runtime/os.hpp"
+#include "trace/traceMacros.hpp"
#include "utilities/accessFlags.hpp"
#include "utilities/bitMap.inline.hpp"
#include "utilities/macros.hpp"
-#include "trace/traceMacros.hpp"
// An InstanceKlass is the VM level representation of a Java class.
// It contains all information needed for at class at execution runtime.
diff --git a/hotspot/src/share/vm/oops/instanceMirrorKlass.cpp b/hotspot/src/share/vm/oops/instanceMirrorKlass.cpp
index 7ace33c8ba3..aa64aad4e01 100644
--- a/hotspot/src/share/vm/oops/instanceMirrorKlass.cpp
+++ b/hotspot/src/share/vm/oops/instanceMirrorKlass.cpp
@@ -25,10 +25,10 @@
#include "precompiled.hpp"
#include "classfile/javaClasses.hpp"
#include "classfile/systemDictionary.hpp"
-#include "gc_interface/collectedHeap.inline.hpp"
+#include "gc/shared/collectedHeap.inline.hpp"
+#include "gc/shared/specialized_oop_closures.hpp"
#include "memory/iterator.inline.hpp"
#include "memory/oopFactory.hpp"
-#include "memory/specialized_oop_closures.hpp"
#include "oops/instanceKlass.hpp"
#include "oops/instanceMirrorKlass.hpp"
#include "oops/instanceOop.hpp"
diff --git a/hotspot/src/share/vm/oops/instanceMirrorKlass.hpp b/hotspot/src/share/vm/oops/instanceMirrorKlass.hpp
index 888814f0b40..30154a9c18f 100644
--- a/hotspot/src/share/vm/oops/instanceMirrorKlass.hpp
+++ b/hotspot/src/share/vm/oops/instanceMirrorKlass.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@
#define SHARE_VM_OOPS_INSTANCEMIRRORKLASS_HPP
#include "classfile/systemDictionary.hpp"
-#include "memory/specialized_oop_closures.hpp"
+#include "gc/shared/specialized_oop_closures.hpp"
#include "oops/instanceKlass.hpp"
#include "runtime/handles.hpp"
#include "utilities/macros.hpp"
diff --git a/hotspot/src/share/vm/oops/instanceRefKlass.cpp b/hotspot/src/share/vm/oops/instanceRefKlass.cpp
index bf932f83305..8e31ef851b5 100644
--- a/hotspot/src/share/vm/oops/instanceRefKlass.cpp
+++ b/hotspot/src/share/vm/oops/instanceRefKlass.cpp
@@ -25,13 +25,13 @@
#include "precompiled.hpp"
#include "classfile/javaClasses.hpp"
#include "classfile/systemDictionary.hpp"
-#include "gc_interface/collectedHeap.inline.hpp"
-#include "memory/genCollectedHeap.hpp"
-#include "memory/specialized_oop_closures.hpp"
+#include "gc/shared/collectedHeap.inline.hpp"
+#include "gc/shared/genCollectedHeap.hpp"
+#include "gc/shared/specialized_oop_closures.hpp"
#include "oops/instanceRefKlass.inline.hpp"
#include "oops/oop.inline.hpp"
-#include "utilities/preserveException.hpp"
#include "utilities/macros.hpp"
+#include "utilities/preserveException.hpp"
PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
diff --git a/hotspot/src/share/vm/oops/instanceRefKlass.hpp b/hotspot/src/share/vm/oops/instanceRefKlass.hpp
index 854c4aaea18..b13dc403beb 100644
--- a/hotspot/src/share/vm/oops/instanceRefKlass.hpp
+++ b/hotspot/src/share/vm/oops/instanceRefKlass.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
#ifndef SHARE_VM_OOPS_INSTANCEREFKLASS_HPP
#define SHARE_VM_OOPS_INSTANCEREFKLASS_HPP
-#include "memory/specialized_oop_closures.hpp"
+#include "gc/shared/specialized_oop_closures.hpp"
#include "oops/instanceKlass.hpp"
#include "utilities/macros.hpp"
diff --git a/hotspot/src/share/vm/oops/instanceRefKlass.inline.hpp b/hotspot/src/share/vm/oops/instanceRefKlass.inline.hpp
index 56cbf5e0f50..26a2017402a 100644
--- a/hotspot/src/share/vm/oops/instanceRefKlass.inline.hpp
+++ b/hotspot/src/share/vm/oops/instanceRefKlass.inline.hpp
@@ -26,9 +26,9 @@
#define SHARE_VM_OOPS_INSTANCEREFKLASS_INLINE_HPP
#include "classfile/javaClasses.hpp"
-#include "memory/referenceProcessor.hpp"
-#include "oops/instanceRefKlass.hpp"
+#include "gc/shared/referenceProcessor.hpp"
#include "oops/instanceKlass.inline.hpp"
+#include "oops/instanceRefKlass.hpp"
#include "oops/oop.inline.hpp"
#include "utilities/debug.hpp"
#include "utilities/globalDefinitions.hpp"
diff --git a/hotspot/src/share/vm/oops/klass.cpp b/hotspot/src/share/vm/oops/klass.cpp
index cc193fd415a..e6c7e3e4f01 100644
--- a/hotspot/src/share/vm/oops/klass.cpp
+++ b/hotspot/src/share/vm/oops/klass.cpp
@@ -23,11 +23,11 @@
*/
#include "precompiled.hpp"
-#include "classfile/javaClasses.hpp"
#include "classfile/dictionary.hpp"
+#include "classfile/javaClasses.hpp"
#include "classfile/systemDictionary.hpp"
#include "classfile/vmSymbols.hpp"
-#include "gc_interface/collectedHeap.inline.hpp"
+#include "gc/shared/collectedHeap.inline.hpp"
#include "memory/heapInspection.hpp"
#include "memory/metadataFactory.hpp"
#include "memory/oopFactory.hpp"
@@ -41,7 +41,7 @@
#include "utilities/macros.hpp"
#include "utilities/stack.inline.hpp"
#if INCLUDE_ALL_GCS
-#include "gc_implementation/g1/g1SATBCardTableModRefBS.hpp"
+#include "gc/g1/g1SATBCardTableModRefBS.hpp"
#endif // INCLUDE_ALL_GCS
void Klass::set_name(Symbol* n) {
diff --git a/hotspot/src/share/vm/oops/klass.hpp b/hotspot/src/share/vm/oops/klass.hpp
index 3e19e7ebe10..d6e0e06c7e9 100644
--- a/hotspot/src/share/vm/oops/klass.hpp
+++ b/hotspot/src/share/vm/oops/klass.hpp
@@ -25,9 +25,9 @@
#ifndef SHARE_VM_OOPS_KLASS_HPP
#define SHARE_VM_OOPS_KLASS_HPP
+#include "gc/shared/specialized_oop_closures.hpp"
#include "memory/iterator.hpp"
#include "memory/memRegion.hpp"
-#include "memory/specialized_oop_closures.hpp"
#include "oops/metadata.hpp"
#include "oops/oop.hpp"
#include "trace/traceMacros.hpp"
diff --git a/hotspot/src/share/vm/oops/klassVtable.cpp b/hotspot/src/share/vm/oops/klassVtable.cpp
index 3d9e0553429..e60ec8e8038 100644
--- a/hotspot/src/share/vm/oops/klassVtable.cpp
+++ b/hotspot/src/share/vm/oops/klassVtable.cpp
@@ -25,7 +25,7 @@
#include "precompiled.hpp"
#include "classfile/systemDictionary.hpp"
#include "classfile/vmSymbols.hpp"
-#include "memory/gcLocker.hpp"
+#include "gc/shared/gcLocker.hpp"
#include "memory/resourceArea.hpp"
#include "memory/universe.inline.hpp"
#include "oops/instanceKlass.hpp"
diff --git a/hotspot/src/share/vm/oops/method.cpp b/hotspot/src/share/vm/oops/method.cpp
index 0785c9d9211..b40e347405e 100644
--- a/hotspot/src/share/vm/oops/method.cpp
+++ b/hotspot/src/share/vm/oops/method.cpp
@@ -27,20 +27,20 @@
#include "classfile/systemDictionary.hpp"
#include "code/codeCache.hpp"
#include "code/debugInfoRec.hpp"
-#include "gc_interface/collectedHeap.inline.hpp"
+#include "gc/shared/collectedHeap.inline.hpp"
+#include "gc/shared/gcLocker.hpp"
+#include "gc/shared/generation.hpp"
#include "interpreter/bytecodeStream.hpp"
#include "interpreter/bytecodeTracer.hpp"
#include "interpreter/bytecodes.hpp"
#include "interpreter/interpreter.hpp"
#include "interpreter/oopMapCache.hpp"
-#include "memory/gcLocker.hpp"
-#include "memory/generation.hpp"
#include "memory/heapInspection.hpp"
#include "memory/metadataFactory.hpp"
#include "memory/oopFactory.hpp"
#include "oops/constMethod.hpp"
-#include "oops/methodData.hpp"
#include "oops/method.hpp"
+#include "oops/methodData.hpp"
#include "oops/oop.inline.hpp"
#include "oops/symbol.hpp"
#include "prims/jvmtiExport.hpp"
diff --git a/hotspot/src/share/vm/oops/objArrayKlass.cpp b/hotspot/src/share/vm/oops/objArrayKlass.cpp
index fb59a969cd1..6e281a2a3a0 100644
--- a/hotspot/src/share/vm/oops/objArrayKlass.cpp
+++ b/hotspot/src/share/vm/oops/objArrayKlass.cpp
@@ -26,11 +26,11 @@
#include "classfile/symbolTable.hpp"
#include "classfile/systemDictionary.hpp"
#include "classfile/vmSymbols.hpp"
-#include "gc_interface/collectedHeap.inline.hpp"
+#include "gc/shared/collectedHeap.inline.hpp"
+#include "gc/shared/specialized_oop_closures.hpp"
#include "memory/iterator.inline.hpp"
#include "memory/metadataFactory.hpp"
#include "memory/resourceArea.hpp"
-#include "memory/specialized_oop_closures.hpp"
#include "memory/universe.inline.hpp"
#include "oops/instanceKlass.hpp"
#include "oops/klass.inline.hpp"
diff --git a/hotspot/src/share/vm/oops/objArrayOop.cpp b/hotspot/src/share/vm/oops/objArrayOop.cpp
index a0265ee5cba..8db64451c30 100644
--- a/hotspot/src/share/vm/oops/objArrayOop.cpp
+++ b/hotspot/src/share/vm/oops/objArrayOop.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
*/
#include "precompiled.hpp"
-#include "memory/specialized_oop_closures.hpp"
+#include "gc/shared/specialized_oop_closures.hpp"
#include "oops/objArrayKlass.hpp"
#include "oops/objArrayOop.hpp"
#include "oops/oop.inline.hpp"
diff --git a/hotspot/src/share/vm/oops/objArrayOop.hpp b/hotspot/src/share/vm/oops/objArrayOop.hpp
index 5ffc0d7aab9..0a9cb141925 100644
--- a/hotspot/src/share/vm/oops/objArrayOop.hpp
+++ b/hotspot/src/share/vm/oops/objArrayOop.hpp
@@ -25,7 +25,7 @@
#ifndef SHARE_VM_OOPS_OBJARRAYOOP_HPP
#define SHARE_VM_OOPS_OBJARRAYOOP_HPP
-#include "memory/specialized_oop_closures.hpp"
+#include "gc/shared/specialized_oop_closures.hpp"
#include "oops/arrayOop.hpp"
// An objArrayOop is an array containing oops.
diff --git a/hotspot/src/share/vm/oops/oop.hpp b/hotspot/src/share/vm/oops/oop.hpp
index c050a5ffb0f..da6e7e70a15 100644
--- a/hotspot/src/share/vm/oops/oop.hpp
+++ b/hotspot/src/share/vm/oops/oop.hpp
@@ -25,9 +25,9 @@
#ifndef SHARE_VM_OOPS_OOP_HPP
#define SHARE_VM_OOPS_OOP_HPP
+#include "gc/shared/specialized_oop_closures.hpp"
#include "memory/iterator.hpp"
#include "memory/memRegion.hpp"
-#include "memory/specialized_oop_closures.hpp"
#include "oops/metadata.hpp"
#include "utilities/macros.hpp"
#include "utilities/top.hpp"
diff --git a/hotspot/src/share/vm/oops/oop.inline.hpp b/hotspot/src/share/vm/oops/oop.inline.hpp
index 11884598ab9..8e0842110e0 100644
--- a/hotspot/src/share/vm/oops/oop.inline.hpp
+++ b/hotspot/src/share/vm/oops/oop.inline.hpp
@@ -25,12 +25,12 @@
#ifndef SHARE_VM_OOPS_OOP_INLINE_HPP
#define SHARE_VM_OOPS_OOP_INLINE_HPP
-#include "gc_implementation/shared/ageTable.hpp"
-#include "gc_interface/collectedHeap.inline.hpp"
-#include "memory/barrierSet.inline.hpp"
-#include "memory/cardTableModRefBS.hpp"
-#include "memory/genCollectedHeap.hpp"
-#include "memory/generation.hpp"
+#include "gc/shared/ageTable.hpp"
+#include "gc/shared/barrierSet.inline.hpp"
+#include "gc/shared/cardTableModRefBS.hpp"
+#include "gc/shared/collectedHeap.inline.hpp"
+#include "gc/shared/genCollectedHeap.hpp"
+#include "gc/shared/generation.hpp"
#include "oops/arrayKlass.hpp"
#include "oops/arrayOop.hpp"
#include "oops/klass.inline.hpp"
diff --git a/hotspot/src/share/vm/oops/oopsHierarchy.cpp b/hotspot/src/share/vm/oops/oopsHierarchy.cpp
index 1b6536194b5..b2fdba28d3f 100644
--- a/hotspot/src/share/vm/oops/oopsHierarchy.cpp
+++ b/hotspot/src/share/vm/oops/oopsHierarchy.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -23,8 +23,8 @@
*/
#include "precompiled.hpp"
-#include "gc_interface/collectedHeap.hpp"
-#include "gc_interface/collectedHeap.inline.hpp"
+#include "gc/shared/collectedHeap.hpp"
+#include "gc/shared/collectedHeap.inline.hpp"
#include "oops/oopsHierarchy.hpp"
#include "runtime/thread.inline.hpp"
#include "utilities/globalDefinitions.hpp"
diff --git a/hotspot/src/share/vm/oops/typeArrayKlass.cpp b/hotspot/src/share/vm/oops/typeArrayKlass.cpp
index 54bb11df3ee..8b1453ff6c6 100644
--- a/hotspot/src/share/vm/oops/typeArrayKlass.cpp
+++ b/hotspot/src/share/vm/oops/typeArrayKlass.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,8 +26,8 @@
#include "classfile/symbolTable.hpp"
#include "classfile/systemDictionary.hpp"
#include "classfile/vmSymbols.hpp"
-#include "gc_interface/collectedHeap.hpp"
-#include "gc_interface/collectedHeap.inline.hpp"
+#include "gc/shared/collectedHeap.hpp"
+#include "gc/shared/collectedHeap.inline.hpp"
#include "memory/metadataFactory.hpp"
#include "memory/resourceArea.hpp"
#include "memory/universe.hpp"
diff --git a/hotspot/src/share/vm/opto/graphKit.cpp b/hotspot/src/share/vm/opto/graphKit.cpp
index 26d24e3560b..b52f90c4d34 100644
--- a/hotspot/src/share/vm/opto/graphKit.cpp
+++ b/hotspot/src/share/vm/opto/graphKit.cpp
@@ -24,11 +24,11 @@
#include "precompiled.hpp"
#include "compiler/compileLog.hpp"
-#include "gc_implementation/g1/g1SATBCardTableModRefBS.hpp"
-#include "gc_implementation/g1/heapRegion.hpp"
-#include "gc_interface/collectedHeap.hpp"
-#include "memory/barrierSet.hpp"
-#include "memory/cardTableModRefBS.hpp"
+#include "gc/g1/g1SATBCardTableModRefBS.hpp"
+#include "gc/g1/heapRegion.hpp"
+#include "gc/shared/barrierSet.hpp"
+#include "gc/shared/cardTableModRefBS.hpp"
+#include "gc/shared/collectedHeap.hpp"
#include "opto/addnode.hpp"
#include "opto/castnode.hpp"
#include "opto/convertnode.hpp"
diff --git a/hotspot/src/share/vm/opto/machnode.cpp b/hotspot/src/share/vm/opto/machnode.cpp
index cd809abb5f8..514a9b5912e 100644
--- a/hotspot/src/share/vm/opto/machnode.cpp
+++ b/hotspot/src/share/vm/opto/machnode.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
*/
#include "precompiled.hpp"
-#include "gc_interface/collectedHeap.hpp"
+#include "gc/shared/collectedHeap.hpp"
#include "opto/machnode.hpp"
#include "opto/regalloc.hpp"
diff --git a/hotspot/src/share/vm/opto/runtime.cpp b/hotspot/src/share/vm/opto/runtime.cpp
index 20674525aed..ca5e5af7833 100644
--- a/hotspot/src/share/vm/opto/runtime.cpp
+++ b/hotspot/src/share/vm/opto/runtime.cpp
@@ -35,14 +35,14 @@
#include "compiler/compileBroker.hpp"
#include "compiler/compilerOracle.hpp"
#include "compiler/oopMap.hpp"
-#include "gc_implementation/g1/g1SATBCardTableModRefBS.hpp"
-#include "gc_implementation/g1/heapRegion.hpp"
-#include "gc_interface/collectedHeap.hpp"
+#include "gc/g1/g1SATBCardTableModRefBS.hpp"
+#include "gc/g1/heapRegion.hpp"
+#include "gc/shared/barrierSet.hpp"
+#include "gc/shared/collectedHeap.hpp"
+#include "gc/shared/gcLocker.inline.hpp"
#include "interpreter/bytecode.hpp"
#include "interpreter/interpreter.hpp"
#include "interpreter/linkResolver.hpp"
-#include "memory/barrierSet.hpp"
-#include "memory/gcLocker.inline.hpp"
#include "memory/oopFactory.hpp"
#include "oops/objArrayKlass.hpp"
#include "oops/oop.inline.hpp"
diff --git a/hotspot/src/share/vm/opto/type.cpp b/hotspot/src/share/vm/opto/type.cpp
index c21fd8e158c..0b5e91013fa 100644
--- a/hotspot/src/share/vm/opto/type.cpp
+++ b/hotspot/src/share/vm/opto/type.cpp
@@ -28,8 +28,8 @@
#include "classfile/symbolTable.hpp"
#include "classfile/systemDictionary.hpp"
#include "compiler/compileLog.hpp"
+#include "gc/shared/gcLocker.hpp"
#include "libadt/dict.hpp"
-#include "memory/gcLocker.hpp"
#include "memory/oopFactory.hpp"
#include "memory/resourceArea.hpp"
#include "oops/instanceKlass.hpp"
diff --git a/hotspot/src/share/vm/precompiled/precompiled.hpp b/hotspot/src/share/vm/precompiled/precompiled.hpp
index 864965e8181..24f6aa491c3 100644
--- a/hotspot/src/share/vm/precompiled/precompiled.hpp
+++ b/hotspot/src/share/vm/precompiled/precompiled.hpp
@@ -80,21 +80,38 @@
# include "compiler/disassembler.hpp"
# include "compiler/methodLiveness.hpp"
# include "compiler/oopMap.hpp"
-# include "gc_implementation/shared/adaptiveSizePolicy.hpp"
-# include "gc_implementation/shared/ageTable.hpp"
-# include "gc_implementation/shared/allocationStats.hpp"
-# include "gc_implementation/shared/cSpaceCounters.hpp"
-# include "gc_implementation/shared/collectorCounters.hpp"
-# include "gc_implementation/shared/gSpaceCounters.hpp"
-# include "gc_implementation/shared/gcStats.hpp"
-# include "gc_implementation/shared/gcUtil.hpp"
-# include "gc_implementation/shared/generationCounters.hpp"
-# include "gc_implementation/shared/immutableSpace.hpp"
-# include "gc_implementation/shared/mutableSpace.hpp"
-# include "gc_implementation/shared/spaceCounters.hpp"
-# include "gc_implementation/shared/spaceDecorator.hpp"
-# include "gc_interface/collectedHeap.hpp"
-# include "gc_interface/gcCause.hpp"
+# include "gc/cms/allocationStats.hpp"
+# include "gc/cms/gSpaceCounters.hpp"
+# include "gc/parallel/immutableSpace.hpp"
+# include "gc/parallel/mutableSpace.hpp"
+# include "gc/parallel/spaceCounters.hpp"
+# include "gc/serial/cSpaceCounters.hpp"
+# include "gc/serial/defNewGeneration.hpp"
+# include "gc/shared/adaptiveSizePolicy.hpp"
+# include "gc/shared/ageTable.hpp"
+# include "gc/shared/barrierSet.hpp"
+# include "gc/shared/blockOffsetTable.hpp"
+# include "gc/shared/cardTableModRefBS.hpp"
+# include "gc/shared/collectedHeap.hpp"
+# include "gc/shared/collectorCounters.hpp"
+# include "gc/shared/collectorPolicy.hpp"
+# include "gc/shared/gcCause.hpp"
+# include "gc/shared/gcLocker.hpp"
+# include "gc/shared/gcStats.hpp"
+# include "gc/shared/gcUtil.hpp"
+# include "gc/shared/genCollectedHeap.hpp"
+# include "gc/shared/genRemSet.hpp"
+# include "gc/shared/generation.hpp"
+# include "gc/shared/generationCounters.hpp"
+# include "gc/shared/modRefBarrierSet.hpp"
+# include "gc/shared/referencePolicy.hpp"
+# include "gc/shared/referenceProcessor.hpp"
+# include "gc/shared/space.hpp"
+# include "gc/shared/spaceDecorator.hpp"
+# include "gc/shared/taskqueue.hpp"
+# include "gc/shared/threadLocalAllocBuffer.hpp"
+# include "gc/shared/watermark.hpp"
+# include "gc/shared/workgroup.hpp"
# include "interpreter/abstractInterpreter.hpp"
# include "interpreter/bytecode.hpp"
# include "interpreter/bytecodeHistogram.hpp"
@@ -103,8 +120,8 @@
# include "interpreter/bytecodeTracer.hpp"
# include "interpreter/bytecodes.hpp"
# include "interpreter/cppInterpreter.hpp"
-# include "interpreter/interpreter.hpp"
# include "interpreter/interp_masm.hpp"
+# include "interpreter/interpreter.hpp"
# include "interpreter/invocationCounter.hpp"
# include "interpreter/linkResolver.hpp"
# include "interpreter/templateInterpreter.hpp"
@@ -112,29 +129,14 @@
# include "jvmtifiles/jvmti.h"
# include "memory/allocation.hpp"
# include "memory/allocation.inline.hpp"
-# include "memory/barrierSet.hpp"
-# include "memory/blockOffsetTable.hpp"
-# include "memory/cardTableModRefBS.hpp"
-# include "memory/collectorPolicy.hpp"
-# include "memory/defNewGeneration.hpp"
-# include "memory/gcLocker.hpp"
-# include "memory/genCollectedHeap.hpp"
-# include "memory/genRemSet.hpp"
-# include "memory/generation.hpp"
# include "memory/heap.hpp"
# include "memory/iterator.hpp"
# include "memory/memRegion.hpp"
-# include "memory/modRefBarrierSet.hpp"
# include "memory/oopFactory.hpp"
-# include "memory/referencePolicy.hpp"
-# include "memory/referenceProcessor.hpp"
# include "memory/resourceArea.hpp"
-# include "memory/space.hpp"
-# include "memory/threadLocalAllocBuffer.hpp"
# include "memory/universe.hpp"
# include "memory/universe.inline.hpp"
# include "memory/virtualspace.hpp"
-# include "memory/watermark.hpp"
# include "oops/arrayKlass.hpp"
# include "oops/arrayOop.hpp"
# include "oops/constMethod.hpp"
@@ -145,8 +147,8 @@
# include "oops/klassVtable.hpp"
# include "oops/markOop.hpp"
# include "oops/markOop.inline.hpp"
-# include "oops/methodData.hpp"
# include "oops/method.hpp"
+# include "oops/methodData.hpp"
# include "oops/objArrayKlass.hpp"
# include "oops/objArrayOop.hpp"
# include "oops/oop.hpp"
@@ -212,11 +214,11 @@
# include "services/lowMemoryDetector.hpp"
# include "services/mallocTracker.hpp"
# include "services/memBaseline.hpp"
+# include "services/memReporter.hpp"
+# include "services/memTracker.hpp"
# include "services/memoryPool.hpp"
# include "services/memoryService.hpp"
# include "services/memoryUsage.hpp"
-# include "services/memReporter.hpp"
-# include "services/memTracker.hpp"
# include "services/nmtCommon.hpp"
# include "services/virtualMemoryTracker.hpp"
# include "utilities/accessFlags.hpp"
@@ -238,11 +240,8 @@
# include "utilities/ostream.hpp"
# include "utilities/preserveException.hpp"
# include "utilities/sizes.hpp"
-# include "utilities/taskqueue.hpp"
# include "utilities/top.hpp"
# include "utilities/utf8.hpp"
-# include "utilities/workgroup.hpp"
-# include "utilities/yieldingWorkgroup.hpp"
#ifdef COMPILER2
# include "libadt/dict.hpp"
# include "libadt/set.hpp"
@@ -269,8 +268,8 @@
# include "opto/mulnode.hpp"
# include "opto/multnode.hpp"
# include "opto/narrowptrnode.hpp"
-# include "opto/opcodes.hpp"
# include "opto/opaquenode.hpp"
+# include "opto/opcodes.hpp"
# include "opto/optoreg.hpp"
# include "opto/phase.hpp"
# include "opto/phaseX.hpp"
@@ -291,31 +290,31 @@
# include "c1/c1_globals.hpp"
#endif // COMPILER1
#if INCLUDE_ALL_GCS
-# include "gc_implementation/concurrentMarkSweep/cmsOopClosures.hpp"
-# include "gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.hpp"
-# include "gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.hpp"
-# include "gc_implementation/concurrentMarkSweep/freeChunk.hpp"
-# include "gc_implementation/concurrentMarkSweep/promotionInfo.hpp"
-# include "gc_implementation/g1/dirtyCardQueue.hpp"
-# include "gc_implementation/g1/g1BlockOffsetTable.hpp"
-# include "gc_implementation/g1/g1OopClosures.hpp"
-# include "gc_implementation/g1/g1_globals.hpp"
-# include "gc_implementation/g1/ptrQueue.hpp"
-# include "gc_implementation/g1/satbQueue.hpp"
-# include "gc_implementation/parNew/parOopClosures.hpp"
-# include "gc_implementation/parallelScavenge/objectStartArray.hpp"
-# include "gc_implementation/parallelScavenge/parMarkBitMap.hpp"
-# include "gc_implementation/parallelScavenge/parallelScavengeHeap.hpp"
-# include "gc_implementation/parallelScavenge/psAdaptiveSizePolicy.hpp"
-# include "gc_implementation/parallelScavenge/psCompactionManager.hpp"
-# include "gc_implementation/parallelScavenge/psGCAdaptivePolicyCounters.hpp"
-# include "gc_implementation/parallelScavenge/psGenerationCounters.hpp"
-# include "gc_implementation/parallelScavenge/psOldGen.hpp"
-# include "gc_implementation/parallelScavenge/psVirtualspace.hpp"
-# include "gc_implementation/parallelScavenge/psYoungGen.hpp"
-# include "gc_implementation/shared/gcAdaptivePolicyCounters.hpp"
-# include "gc_implementation/shared/gcPolicyCounters.hpp"
-# include "gc_implementation/shared/plab.hpp"
+# include "gc/cms/compactibleFreeListSpace.hpp"
+# include "gc/cms/concurrentMarkSweepGeneration.hpp"
+# include "gc/cms/freeChunk.hpp"
+# include "gc/cms/parOopClosures.hpp"
+# include "gc/cms/promotionInfo.hpp"
+# include "gc/cms/yieldingWorkgroup.hpp"
+# include "gc/g1/dirtyCardQueue.hpp"
+# include "gc/g1/g1BlockOffsetTable.hpp"
+# include "gc/g1/g1OopClosures.hpp"
+# include "gc/g1/g1_globals.hpp"
+# include "gc/g1/ptrQueue.hpp"
+# include "gc/g1/satbQueue.hpp"
+# include "gc/parallel/gcAdaptivePolicyCounters.hpp"
+# include "gc/parallel/objectStartArray.hpp"
+# include "gc/parallel/parMarkBitMap.hpp"
+# include "gc/parallel/parallelScavengeHeap.hpp"
+# include "gc/parallel/psAdaptiveSizePolicy.hpp"
+# include "gc/parallel/psCompactionManager.hpp"
+# include "gc/parallel/psGCAdaptivePolicyCounters.hpp"
+# include "gc/parallel/psGenerationCounters.hpp"
+# include "gc/parallel/psOldGen.hpp"
+# include "gc/parallel/psVirtualspace.hpp"
+# include "gc/parallel/psYoungGen.hpp"
+# include "gc/shared/gcPolicyCounters.hpp"
+# include "gc/shared/plab.hpp"
#endif // INCLUDE_ALL_GCS
#endif // !DONT_USE_PRECOMPILED_HEADER
diff --git a/hotspot/src/share/vm/prims/forte.cpp b/hotspot/src/share/vm/prims/forte.cpp
index 19d715ce36f..69281701646 100644
--- a/hotspot/src/share/vm/prims/forte.cpp
+++ b/hotspot/src/share/vm/prims/forte.cpp
@@ -25,8 +25,8 @@
#include "precompiled.hpp"
#include "code/debugInfoRec.hpp"
#include "code/pcDesc.hpp"
-#include "gc_interface/collectedHeap.inline.hpp"
-#include "memory/space.hpp"
+#include "gc/shared/collectedHeap.inline.hpp"
+#include "gc/shared/space.hpp"
#include "memory/universe.inline.hpp"
#include "oops/oop.inline.hpp"
#include "prims/forte.hpp"
diff --git a/hotspot/src/share/vm/prims/jni.cpp b/hotspot/src/share/vm/prims/jni.cpp
index 63d865bca49..a8b6ec79134 100644
--- a/hotspot/src/share/vm/prims/jni.cpp
+++ b/hotspot/src/share/vm/prims/jni.cpp
@@ -31,10 +31,10 @@
#include "classfile/symbolTable.hpp"
#include "classfile/systemDictionary.hpp"
#include "classfile/vmSymbols.hpp"
+#include "gc/shared/gcLocker.inline.hpp"
#include "interpreter/linkResolver.hpp"
#include "memory/allocation.hpp"
#include "memory/allocation.inline.hpp"
-#include "memory/gcLocker.inline.hpp"
#include "memory/oopFactory.hpp"
#include "memory/universe.inline.hpp"
#include "oops/instanceKlass.hpp"
@@ -79,7 +79,7 @@
#include "utilities/histogram.hpp"
#include "utilities/macros.hpp"
#if INCLUDE_ALL_GCS
-#include "gc_implementation/g1/g1SATBCardTableModRefBS.hpp"
+#include "gc/g1/g1SATBCardTableModRefBS.hpp"
#endif // INCLUDE_ALL_GCS
static jint CurrentVersion = JNI_VERSION_1_8;
@@ -3838,14 +3838,14 @@ _JNI_IMPORT_OR_EXPORT_ jint JNICALL JNI_GetDefaultJavaVMInitArgs(void *args_) {
#ifndef PRODUCT
-#include "gc_implementation/shared/gcTimer.hpp"
-#include "gc_interface/collectedHeap.hpp"
+#include "gc/shared/collectedHeap.hpp"
+#include "gc/shared/gcTimer.hpp"
#if INCLUDE_ALL_GCS
-#include "gc_implementation/g1/heapRegionRemSet.hpp"
+#include "gc/g1/heapRegionRemSet.hpp"
#endif
#include "memory/guardedMemory.hpp"
-#include "utilities/quickSort.hpp"
#include "utilities/ostream.hpp"
+#include "utilities/quickSort.hpp"
#if INCLUDE_VM_STRUCTS
#include "runtime/vmStructs.hpp"
#endif
diff --git a/hotspot/src/share/vm/prims/jvm.cpp b/hotspot/src/share/vm/prims/jvm.cpp
index 9b5b9b1fbf5..ee57481dc69 100644
--- a/hotspot/src/share/vm/prims/jvm.cpp
+++ b/hotspot/src/share/vm/prims/jvm.cpp
@@ -29,16 +29,16 @@
#include "classfile/stringTable.hpp"
#include "classfile/systemDictionary.hpp"
#include "classfile/vmSymbols.hpp"
-#include "gc_interface/collectedHeap.inline.hpp"
+#include "gc/shared/barrierSet.inline.hpp"
+#include "gc/shared/collectedHeap.inline.hpp"
#include "interpreter/bytecode.hpp"
-#include "memory/barrierSet.inline.hpp"
#include "memory/oopFactory.hpp"
#include "memory/universe.inline.hpp"
#include "oops/fieldStreams.hpp"
#include "oops/instanceKlass.hpp"
+#include "oops/method.hpp"
#include "oops/objArrayKlass.hpp"
#include "oops/objArrayOop.inline.hpp"
-#include "oops/method.hpp"
#include "oops/oop.inline.hpp"
#include "prims/jvm.h"
#include "prims/jvm_misc.hpp"
diff --git a/hotspot/src/share/vm/prims/jvmtiExport.cpp b/hotspot/src/share/vm/prims/jvmtiExport.cpp
index 13a1f62ccae..4e1faf37204 100644
--- a/hotspot/src/share/vm/prims/jvmtiExport.cpp
+++ b/hotspot/src/share/vm/prims/jvmtiExport.cpp
@@ -40,9 +40,9 @@
#include "prims/jvmtiImpl.hpp"
#include "prims/jvmtiManageCapabilities.hpp"
#include "prims/jvmtiRawMonitor.hpp"
+#include "prims/jvmtiRedefineClasses.hpp"
#include "prims/jvmtiTagMap.hpp"
#include "prims/jvmtiThreadState.inline.hpp"
-#include "prims/jvmtiRedefineClasses.hpp"
#include "runtime/arguments.hpp"
#include "runtime/handles.hpp"
#include "runtime/interfaceSupport.hpp"
@@ -55,7 +55,7 @@
#include "services/serviceUtil.hpp"
#include "utilities/macros.hpp"
#if INCLUDE_ALL_GCS
-#include "gc_implementation/parallelScavenge/psMarkSweep.hpp"
+#include "gc/parallel/psMarkSweep.hpp"
#endif // INCLUDE_ALL_GCS
PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
diff --git a/hotspot/src/share/vm/prims/jvmtiGetLoadedClasses.cpp b/hotspot/src/share/vm/prims/jvmtiGetLoadedClasses.cpp
index 2cebc4ab922..9546652cce2 100644
--- a/hotspot/src/share/vm/prims/jvmtiGetLoadedClasses.cpp
+++ b/hotspot/src/share/vm/prims/jvmtiGetLoadedClasses.cpp
@@ -24,7 +24,7 @@
#include "precompiled.hpp"
#include "classfile/systemDictionary.hpp"
-#include "gc_interface/collectedHeap.hpp"
+#include "gc/shared/collectedHeap.hpp"
#include "memory/universe.inline.hpp"
#include "prims/jvmtiGetLoadedClasses.hpp"
#include "runtime/thread.hpp"
diff --git a/hotspot/src/share/vm/prims/jvmtiRedefineClasses.cpp b/hotspot/src/share/vm/prims/jvmtiRedefineClasses.cpp
index 5460707b853..4211c93987a 100644
--- a/hotspot/src/share/vm/prims/jvmtiRedefineClasses.cpp
+++ b/hotspot/src/share/vm/prims/jvmtiRedefineClasses.cpp
@@ -28,9 +28,9 @@
#include "classfile/verifier.hpp"
#include "code/codeCache.hpp"
#include "compiler/compileBroker.hpp"
+#include "gc/shared/gcLocker.hpp"
#include "interpreter/oopMapCache.hpp"
#include "interpreter/rewriter.hpp"
-#include "memory/gcLocker.hpp"
#include "memory/metadataFactory.hpp"
#include "memory/metaspaceShared.hpp"
#include "memory/universe.inline.hpp"
diff --git a/hotspot/src/share/vm/prims/jvmtiTagMap.cpp b/hotspot/src/share/vm/prims/jvmtiTagMap.cpp
index 2c10db3776b..3200d857ce4 100644
--- a/hotspot/src/share/vm/prims/jvmtiTagMap.cpp
+++ b/hotspot/src/share/vm/prims/jvmtiTagMap.cpp
@@ -49,7 +49,7 @@
#include "services/serviceUtil.hpp"
#include "utilities/macros.hpp"
#if INCLUDE_ALL_GCS
-#include "gc_implementation/parallelScavenge/parallelScavengeHeap.hpp"
+#include "gc/parallel/parallelScavengeHeap.hpp"
#endif // INCLUDE_ALL_GCS
// JvmtiTagHashmapEntry
diff --git a/hotspot/src/share/vm/prims/jvmtiTagMap.hpp b/hotspot/src/share/vm/prims/jvmtiTagMap.hpp
index 89e3947807d..196abda21b8 100644
--- a/hotspot/src/share/vm/prims/jvmtiTagMap.hpp
+++ b/hotspot/src/share/vm/prims/jvmtiTagMap.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,11 +27,11 @@
#ifndef SHARE_VM_PRIMS_JVMTITAGMAP_HPP
#define SHARE_VM_PRIMS_JVMTITAGMAP_HPP
-#include "gc_interface/collectedHeap.hpp"
+#include "gc/shared/collectedHeap.hpp"
+#include "gc/shared/genCollectedHeap.hpp"
#include "jvmtifiles/jvmti.h"
#include "jvmtifiles/jvmtiEnv.hpp"
#include "memory/allocation.hpp"
-#include "memory/genCollectedHeap.hpp"
#include "memory/universe.hpp"
// forward references
diff --git a/hotspot/src/share/vm/prims/jvmtiThreadState.cpp b/hotspot/src/share/vm/prims/jvmtiThreadState.cpp
index 42f4854bd89..b5ed5fb9146 100644
--- a/hotspot/src/share/vm/prims/jvmtiThreadState.cpp
+++ b/hotspot/src/share/vm/prims/jvmtiThreadState.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -23,8 +23,8 @@
*/
#include "precompiled.hpp"
+#include "gc/shared/gcLocker.hpp"
#include "jvmtifiles/jvmtiEnv.hpp"
-#include "memory/gcLocker.hpp"
#include "memory/resourceArea.hpp"
#include "prims/jvmtiEventController.inline.hpp"
#include "prims/jvmtiImpl.hpp"
diff --git a/hotspot/src/share/vm/prims/unsafe.cpp b/hotspot/src/share/vm/prims/unsafe.cpp
index cadf5a0c2e3..e04d9ae1c82 100644
--- a/hotspot/src/share/vm/prims/unsafe.cpp
+++ b/hotspot/src/share/vm/prims/unsafe.cpp
@@ -41,7 +41,7 @@
#include "utilities/dtrace.hpp"
#include "utilities/macros.hpp"
#if INCLUDE_ALL_GCS
-#include "gc_implementation/g1/g1SATBCardTableModRefBS.hpp"
+#include "gc/g1/g1SATBCardTableModRefBS.hpp"
#endif // INCLUDE_ALL_GCS
PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
diff --git a/hotspot/src/share/vm/prims/whitebox.cpp b/hotspot/src/share/vm/prims/whitebox.cpp
index ff8acdcb9bc..400dded43e1 100644
--- a/hotspot/src/share/vm/prims/whitebox.cpp
+++ b/hotspot/src/share/vm/prims/whitebox.cpp
@@ -39,9 +39,9 @@
#include "runtime/compilationPolicy.hpp"
#include "runtime/deoptimization.hpp"
#include "runtime/interfaceSupport.hpp"
+#include "runtime/javaCalls.hpp"
#include "runtime/os.hpp"
#include "runtime/sweeper.hpp"
-#include "runtime/javaCalls.hpp"
#include "runtime/thread.hpp"
#include "runtime/vm_version.hpp"
#include "utilities/array.hpp"
@@ -49,11 +49,11 @@
#include "utilities/exceptions.hpp"
#include "utilities/macros.hpp"
#if INCLUDE_ALL_GCS
-#include "gc_implementation/parallelScavenge/parallelScavengeHeap.inline.hpp"
-#include "gc_implementation/g1/concurrentMark.hpp"
-#include "gc_implementation/g1/concurrentMarkThread.hpp"
-#include "gc_implementation/g1/g1CollectedHeap.inline.hpp"
-#include "gc_implementation/g1/heapRegionRemSet.hpp"
+#include "gc/g1/concurrentMark.hpp"
+#include "gc/g1/concurrentMarkThread.hpp"
+#include "gc/g1/g1CollectedHeap.inline.hpp"
+#include "gc/g1/heapRegionRemSet.hpp"
+#include "gc/parallel/parallelScavengeHeap.inline.hpp"
#endif // INCLUDE_ALL_GCS
#if INCLUDE_NMT
#include "services/mallocSiteTable.hpp"
diff --git a/hotspot/src/share/vm/runtime/arguments.cpp b/hotspot/src/share/vm/runtime/arguments.cpp
index cdd00e1c566..8eff73dab06 100644
--- a/hotspot/src/share/vm/runtime/arguments.cpp
+++ b/hotspot/src/share/vm/runtime/arguments.cpp
@@ -28,10 +28,11 @@
#include "classfile/stringTable.hpp"
#include "classfile/symbolTable.hpp"
#include "compiler/compilerOracle.hpp"
+#include "gc/shared/cardTableRS.hpp"
+#include "gc/shared/genCollectedHeap.hpp"
+#include "gc/shared/referenceProcessor.hpp"
+#include "gc/shared/taskqueue.hpp"
#include "memory/allocation.inline.hpp"
-#include "memory/cardTableRS.hpp"
-#include "memory/genCollectedHeap.hpp"
-#include "memory/referenceProcessor.hpp"
#include "memory/universe.inline.hpp"
#include "oops/oop.inline.hpp"
#include "prims/jvmtiExport.hpp"
@@ -46,11 +47,10 @@
#include "utilities/defaultStream.hpp"
#include "utilities/macros.hpp"
#include "utilities/stringUtils.hpp"
-#include "utilities/taskqueue.hpp"
#if INCLUDE_ALL_GCS
-#include "gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.hpp"
-#include "gc_implementation/g1/g1CollectedHeap.inline.hpp"
-#include "gc_implementation/parallelScavenge/parallelScavengeHeap.hpp"
+#include "gc/cms/compactibleFreeListSpace.hpp"
+#include "gc/g1/g1CollectedHeap.inline.hpp"
+#include "gc/parallel/parallelScavengeHeap.hpp"
#endif // INCLUDE_ALL_GCS
// Note: This is a special bug reporting site for the JVM
diff --git a/hotspot/src/share/vm/runtime/fprofiler.cpp b/hotspot/src/share/vm/runtime/fprofiler.cpp
index cd387113f61..83b308c1495 100644
--- a/hotspot/src/share/vm/runtime/fprofiler.cpp
+++ b/hotspot/src/share/vm/runtime/fprofiler.cpp
@@ -26,7 +26,7 @@
#include "classfile/classLoader.hpp"
#include "code/codeCache.hpp"
#include "code/vtableStubs.hpp"
-#include "gc_interface/collectedHeap.inline.hpp"
+#include "gc/shared/collectedHeap.inline.hpp"
#include "interpreter/interpreter.hpp"
#include "memory/allocation.inline.hpp"
#include "memory/universe.inline.hpp"
diff --git a/hotspot/src/share/vm/runtime/frame.cpp b/hotspot/src/share/vm/runtime/frame.cpp
index 140a587800b..c48cc28a3ad 100644
--- a/hotspot/src/share/vm/runtime/frame.cpp
+++ b/hotspot/src/share/vm/runtime/frame.cpp
@@ -27,14 +27,14 @@
#include "code/vmreg.inline.hpp"
#include "compiler/abstractCompiler.hpp"
#include "compiler/disassembler.hpp"
-#include "gc_interface/collectedHeap.inline.hpp"
+#include "gc/shared/collectedHeap.inline.hpp"
#include "interpreter/interpreter.hpp"
#include "interpreter/oopMapCache.hpp"
#include "memory/resourceArea.hpp"
#include "memory/universe.inline.hpp"
#include "oops/markOop.hpp"
-#include "oops/methodData.hpp"
#include "oops/method.hpp"
+#include "oops/methodData.hpp"
#include "oops/oop.inline.hpp"
#include "oops/verifyOopClosure.hpp"
#include "prims/methodHandles.hpp"
diff --git a/hotspot/src/share/vm/runtime/globals.cpp b/hotspot/src/share/vm/runtime/globals.cpp
index 6d403239bea..7d4fdc5d7fa 100644
--- a/hotspot/src/share/vm/runtime/globals.cpp
+++ b/hotspot/src/share/vm/runtime/globals.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -30,11 +30,11 @@
#include "runtime/globals_extension.hpp"
#include "runtime/os.hpp"
#include "trace/tracing.hpp"
-#include "utilities/ostream.hpp"
#include "utilities/macros.hpp"
+#include "utilities/ostream.hpp"
#include "utilities/top.hpp"
#if INCLUDE_ALL_GCS
-#include "gc_implementation/g1/g1_globals.hpp"
+#include "gc/g1/g1_globals.hpp"
#endif // INCLUDE_ALL_GCS
#ifdef COMPILER1
#include "c1/c1_globals.hpp"
diff --git a/hotspot/src/share/vm/runtime/init.cpp b/hotspot/src/share/vm/runtime/init.cpp
index eaa78a30420..7ef62065e57 100644
--- a/hotspot/src/share/vm/runtime/init.cpp
+++ b/hotspot/src/share/vm/runtime/init.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
#include "precompiled.hpp"
#include "classfile/stringTable.hpp"
#include "code/icBuffer.hpp"
-#include "gc_interface/collectedHeap.hpp"
+#include "gc/shared/collectedHeap.hpp"
#include "interpreter/bytecodes.hpp"
#include "memory/universe.hpp"
#include "prims/methodHandles.hpp"
diff --git a/hotspot/src/share/vm/runtime/interfaceSupport.cpp b/hotspot/src/share/vm/runtime/interfaceSupport.cpp
index 70d03f3c36e..337fb594cb2 100644
--- a/hotspot/src/share/vm/runtime/interfaceSupport.cpp
+++ b/hotspot/src/share/vm/runtime/interfaceSupport.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -23,9 +23,9 @@
*/
#include "precompiled.hpp"
-#include "gc_interface/collectedHeap.hpp"
-#include "gc_interface/collectedHeap.inline.hpp"
-#include "memory/genCollectedHeap.hpp"
+#include "gc/shared/collectedHeap.hpp"
+#include "gc/shared/collectedHeap.inline.hpp"
+#include "gc/shared/genCollectedHeap.hpp"
#include "memory/resourceArea.hpp"
#include "runtime/atomic.inline.hpp"
#include "runtime/init.hpp"
diff --git a/hotspot/src/share/vm/runtime/interfaceSupport.hpp b/hotspot/src/share/vm/runtime/interfaceSupport.hpp
index 471be25d751..590b772af36 100644
--- a/hotspot/src/share/vm/runtime/interfaceSupport.hpp
+++ b/hotspot/src/share/vm/runtime/interfaceSupport.hpp
@@ -25,7 +25,7 @@
#ifndef SHARE_VM_RUNTIME_INTERFACESUPPORT_HPP
#define SHARE_VM_RUNTIME_INTERFACESUPPORT_HPP
-#include "memory/gcLocker.hpp"
+#include "gc/shared/gcLocker.hpp"
#include "runtime/handles.inline.hpp"
#include "runtime/mutexLocker.hpp"
#include "runtime/orderAccess.hpp"
diff --git a/hotspot/src/share/vm/runtime/java.cpp b/hotspot/src/share/vm/runtime/java.cpp
index 896c676407d..9288b12755c 100644
--- a/hotspot/src/share/vm/runtime/java.cpp
+++ b/hotspot/src/share/vm/runtime/java.cpp
@@ -29,8 +29,8 @@
#include "code/codeCache.hpp"
#include "compiler/compileBroker.hpp"
#include "compiler/compilerOracle.hpp"
+#include "gc/shared/genCollectedHeap.hpp"
#include "interpreter/bytecodeHistogram.hpp"
-#include "memory/genCollectedHeap.hpp"
#include "memory/oopFactory.hpp"
#include "memory/universe.hpp"
#include "oops/constantPool.hpp"
@@ -65,8 +65,8 @@
#include "utilities/macros.hpp"
#include "utilities/vmError.hpp"
#if INCLUDE_ALL_GCS
-#include "gc_implementation/concurrentMarkSweep/concurrentMarkSweepThread.hpp"
-#include "gc_implementation/parallelScavenge/psScavenge.hpp"
+#include "gc/cms/concurrentMarkSweepThread.hpp"
+#include "gc/parallel/psScavenge.hpp"
#endif // INCLUDE_ALL_GCS
#ifdef COMPILER1
#include "c1/c1_Compiler.hpp"
diff --git a/hotspot/src/share/vm/runtime/memprofiler.cpp b/hotspot/src/share/vm/runtime/memprofiler.cpp
index 279277ed0b0..aeffd06845b 100644
--- a/hotspot/src/share/vm/runtime/memprofiler.cpp
+++ b/hotspot/src/share/vm/runtime/memprofiler.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,9 +25,9 @@
#include "precompiled.hpp"
#include "classfile/systemDictionary.hpp"
#include "code/codeCache.hpp"
-#include "gc_interface/collectedHeap.inline.hpp"
+#include "gc/shared/collectedHeap.inline.hpp"
+#include "gc/shared/generation.hpp"
#include "interpreter/oopMapCache.hpp"
-#include "memory/generation.hpp"
#include "memory/resourceArea.hpp"
#include "runtime/handles.inline.hpp"
#include "runtime/jniHandles.hpp"
diff --git a/hotspot/src/share/vm/runtime/os.cpp b/hotspot/src/share/vm/runtime/os.cpp
index b3e5a0664d0..525c1a929c8 100644
--- a/hotspot/src/share/vm/runtime/os.cpp
+++ b/hotspot/src/share/vm/runtime/os.cpp
@@ -30,7 +30,7 @@
#include "code/codeCache.hpp"
#include "code/icBuffer.hpp"
#include "code/vtableStubs.hpp"
-#include "gc_implementation/shared/vmGCOperations.hpp"
+#include "gc/shared/vmGCOperations.hpp"
#include "interpreter/interpreter.hpp"
#include "memory/allocation.inline.hpp"
#ifdef ASSERT
@@ -52,9 +52,9 @@
#include "runtime/thread.inline.hpp"
#include "runtime/vm_version.hpp"
#include "services/attachListener.hpp"
-#include "services/nmtCommon.hpp"
#include "services/mallocTracker.hpp"
#include "services/memTracker.hpp"
+#include "services/nmtCommon.hpp"
#include "services/threadService.hpp"
#include "utilities/defaultStream.hpp"
#include "utilities/events.hpp"
diff --git a/hotspot/src/share/vm/runtime/safepoint.cpp b/hotspot/src/share/vm/runtime/safepoint.cpp
index d7c32ccb009..2c9ce08a344 100644
--- a/hotspot/src/share/vm/runtime/safepoint.cpp
+++ b/hotspot/src/share/vm/runtime/safepoint.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -30,9 +30,9 @@
#include "code/nmethod.hpp"
#include "code/pcDesc.hpp"
#include "code/scopeDesc.hpp"
-#include "gc_interface/collectedHeap.hpp"
+#include "gc/shared/collectedHeap.hpp"
+#include "gc/shared/gcLocker.inline.hpp"
#include "interpreter/interpreter.hpp"
-#include "memory/gcLocker.inline.hpp"
#include "memory/resourceArea.hpp"
#include "memory/universe.inline.hpp"
#include "oops/oop.inline.hpp"
@@ -56,8 +56,8 @@
#include "utilities/events.hpp"
#include "utilities/macros.hpp"
#if INCLUDE_ALL_GCS
-#include "gc_implementation/concurrentMarkSweep/concurrentMarkSweepThread.hpp"
-#include "gc_implementation/shared/suspendibleThreadSet.hpp"
+#include "gc/cms/concurrentMarkSweepThread.hpp"
+#include "gc/g1/suspendibleThreadSet.hpp"
#endif // INCLUDE_ALL_GCS
#ifdef COMPILER1
#include "c1/c1_globals.hpp"
diff --git a/hotspot/src/share/vm/runtime/sharedRuntime.cpp b/hotspot/src/share/vm/runtime/sharedRuntime.cpp
index 80a075e73d7..50c8a732431 100644
--- a/hotspot/src/share/vm/runtime/sharedRuntime.cpp
+++ b/hotspot/src/share/vm/runtime/sharedRuntime.cpp
@@ -33,9 +33,9 @@
#include "compiler/compileBroker.hpp"
#include "compiler/compilerOracle.hpp"
#include "compiler/disassembler.hpp"
+#include "gc/shared/gcLocker.inline.hpp"
#include "interpreter/interpreter.hpp"
#include "interpreter/interpreterRuntime.hpp"
-#include "memory/gcLocker.inline.hpp"
#include "memory/universe.inline.hpp"
#include "oops/oop.inline.hpp"
#include "prims/forte.hpp"
@@ -43,8 +43,8 @@
#include "prims/jvmtiRedefineClassesTrace.hpp"
#include "prims/methodHandles.hpp"
#include "prims/nativeLookup.hpp"
-#include "runtime/atomic.inline.hpp"
#include "runtime/arguments.hpp"
+#include "runtime/atomic.inline.hpp"
#include "runtime/biasedLocking.hpp"
#include "runtime/handles.inline.hpp"
#include "runtime/init.hpp"
diff --git a/hotspot/src/share/vm/runtime/thread.cpp b/hotspot/src/share/vm/runtime/thread.cpp
index ac1ed761671..490b6da6846 100644
--- a/hotspot/src/share/vm/runtime/thread.cpp
+++ b/hotspot/src/share/vm/runtime/thread.cpp
@@ -30,11 +30,12 @@
#include "code/codeCache.hpp"
#include "code/scopeDesc.hpp"
#include "compiler/compileBroker.hpp"
+#include "gc/shared/gcLocker.inline.hpp"
+#include "gc/shared/workgroup.hpp"
#include "interpreter/interpreter.hpp"
#include "interpreter/linkResolver.hpp"
#include "interpreter/oopMapCache.hpp"
#include "jvmtifiles/jvmtiEnv.hpp"
-#include "memory/gcLocker.inline.hpp"
#include "memory/metaspaceShared.hpp"
#include "memory/oopFactory.hpp"
#include "memory/universe.inline.hpp"
@@ -82,18 +83,17 @@
#include "services/management.hpp"
#include "services/memTracker.hpp"
#include "services/threadService.hpp"
-#include "trace/tracing.hpp"
#include "trace/traceMacros.hpp"
+#include "trace/tracing.hpp"
#include "utilities/defaultStream.hpp"
#include "utilities/dtrace.hpp"
#include "utilities/events.hpp"
#include "utilities/macros.hpp"
#include "utilities/preserveException.hpp"
-#include "utilities/workgroup.hpp"
#if INCLUDE_ALL_GCS
-#include "gc_implementation/concurrentMarkSweep/concurrentMarkSweepThread.hpp"
-#include "gc_implementation/g1/concurrentMarkThread.inline.hpp"
-#include "gc_implementation/parallelScavenge/pcTasks.hpp"
+#include "gc/cms/concurrentMarkSweepThread.hpp"
+#include "gc/g1/concurrentMarkThread.inline.hpp"
+#include "gc/parallel/pcTasks.hpp"
#endif // INCLUDE_ALL_GCS
#ifdef COMPILER1
#include "c1/c1_Compiler.hpp"
diff --git a/hotspot/src/share/vm/runtime/thread.hpp b/hotspot/src/share/vm/runtime/thread.hpp
index 4d0ec4d7176..b26ec6b0982 100644
--- a/hotspot/src/share/vm/runtime/thread.hpp
+++ b/hotspot/src/share/vm/runtime/thread.hpp
@@ -25,8 +25,8 @@
#ifndef SHARE_VM_RUNTIME_THREAD_HPP
#define SHARE_VM_RUNTIME_THREAD_HPP
+#include "gc/shared/threadLocalAllocBuffer.hpp"
#include "memory/allocation.hpp"
-#include "memory/threadLocalAllocBuffer.hpp"
#include "oops/oop.hpp"
#include "prims/jni.h"
#include "prims/jvmtiExport.hpp"
@@ -48,8 +48,8 @@
#include "utilities/macros.hpp"
#include "utilities/top.hpp"
#if INCLUDE_ALL_GCS
-#include "gc_implementation/g1/dirtyCardQueue.hpp"
-#include "gc_implementation/g1/satbQueue.hpp"
+#include "gc/g1/dirtyCardQueue.hpp"
+#include "gc/g1/satbQueue.hpp"
#endif // INCLUDE_ALL_GCS
#ifdef TARGET_ARCH_zero
# include "stack_zero.hpp"
diff --git a/hotspot/src/share/vm/runtime/threadLocalStorage.hpp b/hotspot/src/share/vm/runtime/threadLocalStorage.hpp
index a0c08c2df42..9d6d9f6f8c2 100644
--- a/hotspot/src/share/vm/runtime/threadLocalStorage.hpp
+++ b/hotspot/src/share/vm/runtime/threadLocalStorage.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
#ifndef SHARE_VM_RUNTIME_THREADLOCALSTORAGE_HPP
#define SHARE_VM_RUNTIME_THREADLOCALSTORAGE_HPP
-#include "gc_implementation/shared/gcUtil.hpp"
+#include "gc/shared/gcUtil.hpp"
#include "runtime/os.hpp"
#include "utilities/top.hpp"
diff --git a/hotspot/src/share/vm/runtime/unhandledOops.cpp b/hotspot/src/share/vm/runtime/unhandledOops.cpp
index d27b1fb2f71..446fefa59df 100644
--- a/hotspot/src/share/vm/runtime/unhandledOops.cpp
+++ b/hotspot/src/share/vm/runtime/unhandledOops.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -23,8 +23,8 @@
*/
#include "precompiled.hpp"
-#include "gc_interface/collectedHeap.hpp"
-#include "memory/gcLocker.inline.hpp"
+#include "gc/shared/collectedHeap.hpp"
+#include "gc/shared/gcLocker.inline.hpp"
#include "memory/universe.hpp"
#include "oops/oop.inline.hpp"
#include "runtime/thread.hpp"
diff --git a/hotspot/src/share/vm/runtime/vmStructs.cpp b/hotspot/src/share/vm/runtime/vmStructs.cpp
index b40dbd9592a..c275c5df4c8 100644
--- a/hotspot/src/share/vm/runtime/vmStructs.cpp
+++ b/hotspot/src/share/vm/runtime/vmStructs.cpp
@@ -23,18 +23,18 @@
*/
#include "precompiled.hpp"
+#include "ci/ciField.hpp"
+#include "ci/ciInstance.hpp"
+#include "ci/ciMethodData.hpp"
+#include "ci/ciObjArrayKlass.hpp"
+#include "ci/ciSymbol.hpp"
+#include "classfile/compactHashtable.hpp"
#include "classfile/dictionary.hpp"
#include "classfile/javaClasses.hpp"
#include "classfile/loaderConstraints.hpp"
#include "classfile/placeholders.hpp"
-#include "classfile/compactHashtable.hpp"
#include "classfile/stringTable.hpp"
#include "classfile/systemDictionary.hpp"
-#include "ci/ciField.hpp"
-#include "ci/ciInstance.hpp"
-#include "ci/ciObjArrayKlass.hpp"
-#include "ci/ciMethodData.hpp"
-#include "ci/ciSymbol.hpp"
#include "code/codeBlob.hpp"
#include "code/codeCache.hpp"
#include "code/compressedStream.hpp"
@@ -43,30 +43,30 @@
#include "code/pcDesc.hpp"
#include "code/stubs.hpp"
#include "code/vmreg.hpp"
-#include "compiler/oopMap.hpp"
#include "compiler/compileBroker.hpp"
-#include "gc_implementation/shared/immutableSpace.hpp"
-#include "gc_implementation/shared/mutableSpace.hpp"
-#include "gc_interface/collectedHeap.hpp"
+#include "compiler/oopMap.hpp"
+#include "gc/parallel/immutableSpace.hpp"
+#include "gc/parallel/mutableSpace.hpp"
+#include "gc/serial/defNewGeneration.hpp"
+#include "gc/serial/tenuredGeneration.hpp"
+#include "gc/shared/cardTableRS.hpp"
+#include "gc/shared/collectedHeap.hpp"
+#include "gc/shared/genCollectedHeap.hpp"
+#include "gc/shared/generation.hpp"
+#include "gc/shared/generationSpec.hpp"
+#include "gc/shared/space.hpp"
+#include "gc/shared/watermark.hpp"
#include "interpreter/bytecodeInterpreter.hpp"
#include "interpreter/bytecodes.hpp"
#include "interpreter/interpreter.hpp"
#include "memory/allocation.hpp"
#include "memory/allocation.inline.hpp"
-#include "memory/cardTableRS.hpp"
-#include "memory/defNewGeneration.hpp"
#include "memory/freeBlockDictionary.hpp"
-#include "memory/genCollectedHeap.hpp"
-#include "memory/generation.hpp"
-#include "memory/generationSpec.hpp"
#include "memory/heap.hpp"
#include "memory/metachunk.hpp"
#include "memory/referenceType.hpp"
-#include "memory/space.hpp"
-#include "memory/tenuredGeneration.hpp"
#include "memory/universe.hpp"
#include "memory/virtualspace.hpp"
-#include "memory/watermark.hpp"
#include "oops/arrayKlass.hpp"
#include "oops/arrayOop.hpp"
#include "oops/compiledICHolder.hpp"
@@ -79,9 +79,9 @@
#include "oops/instanceOop.hpp"
#include "oops/klass.hpp"
#include "oops/markOop.hpp"
-#include "oops/methodData.hpp"
-#include "oops/methodCounters.hpp"
#include "oops/method.hpp"
+#include "oops/methodCounters.hpp"
+#include "oops/methodData.hpp"
#include "oops/objArrayKlass.hpp"
#include "oops/objArrayOop.hpp"
#include "oops/oop.inline.hpp"
@@ -91,7 +91,6 @@
#include "prims/jvmtiAgentThread.hpp"
#include "runtime/arguments.hpp"
#include "runtime/deoptimization.hpp"
-#include "runtime/vframeArray.hpp"
#include "runtime/globals.hpp"
#include "runtime/java.hpp"
#include "runtime/javaCalls.hpp"
@@ -101,6 +100,7 @@
#include "runtime/sharedRuntime.hpp"
#include "runtime/stubRoutines.hpp"
#include "runtime/thread.inline.hpp"
+#include "runtime/vframeArray.hpp"
#include "runtime/vmStructs.hpp"
#include "utilities/array.hpp"
#include "utilities/globalDefinitions.hpp"
@@ -162,20 +162,20 @@
# include "vmStructs_bsd_zero.hpp"
#endif
#if INCLUDE_ALL_GCS
-#include "gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.hpp"
-#include "gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.hpp"
-#include "gc_implementation/concurrentMarkSweep/concurrentMarkSweepThread.hpp"
-#include "gc_implementation/concurrentMarkSweep/vmStructs_cms.hpp"
-#include "gc_implementation/parNew/parNewGeneration.hpp"
-#include "gc_implementation/parNew/vmStructs_parNew.hpp"
-#include "gc_implementation/parallelScavenge/asPSOldGen.hpp"
-#include "gc_implementation/parallelScavenge/asPSYoungGen.hpp"
-#include "gc_implementation/parallelScavenge/parallelScavengeHeap.hpp"
-#include "gc_implementation/parallelScavenge/psOldGen.hpp"
-#include "gc_implementation/parallelScavenge/psVirtualspace.hpp"
-#include "gc_implementation/parallelScavenge/psYoungGen.hpp"
-#include "gc_implementation/parallelScavenge/vmStructs_parallelgc.hpp"
-#include "gc_implementation/g1/vmStructs_g1.hpp"
+#include "gc/cms/compactibleFreeListSpace.hpp"
+#include "gc/cms/concurrentMarkSweepGeneration.hpp"
+#include "gc/cms/concurrentMarkSweepThread.hpp"
+#include "gc/cms/parNewGeneration.hpp"
+#include "gc/cms/vmStructs_cms.hpp"
+#include "gc/cms/vmStructs_parNew.hpp"
+#include "gc/g1/vmStructs_g1.hpp"
+#include "gc/parallel/asPSOldGen.hpp"
+#include "gc/parallel/asPSYoungGen.hpp"
+#include "gc/parallel/parallelScavengeHeap.hpp"
+#include "gc/parallel/psOldGen.hpp"
+#include "gc/parallel/psVirtualspace.hpp"
+#include "gc/parallel/psYoungGen.hpp"
+#include "gc/parallel/vmStructs_parallelgc.hpp"
#endif // INCLUDE_ALL_GCS
#if INCLUDE_TRACE
@@ -197,13 +197,13 @@
#include "opto/machnode.hpp"
#include "opto/matcher.hpp"
#include "opto/mathexactnode.hpp"
-#include "opto/mulnode.hpp"
#include "opto/movenode.hpp"
+#include "opto/mulnode.hpp"
#include "opto/narrowptrnode.hpp"
#include "opto/opaquenode.hpp"
#include "opto/optoreg.hpp"
-#include "opto/phaseX.hpp"
#include "opto/parse.hpp"
+#include "opto/phaseX.hpp"
#include "opto/regalloc.hpp"
#include "opto/rootnode.hpp"
#include "opto/subnode.hpp"
diff --git a/hotspot/src/share/vm/runtime/vmThread.cpp b/hotspot/src/share/vm/runtime/vmThread.cpp
index 8e34fa48525..927b25545f4 100644
--- a/hotspot/src/share/vm/runtime/vmThread.cpp
+++ b/hotspot/src/share/vm/runtime/vmThread.cpp
@@ -24,7 +24,7 @@
#include "precompiled.hpp"
#include "compiler/compileBroker.hpp"
-#include "gc_interface/collectedHeap.hpp"
+#include "gc/shared/collectedHeap.hpp"
#include "memory/resourceArea.hpp"
#include "oops/method.hpp"
#include "oops/oop.inline.hpp"
diff --git a/hotspot/src/share/vm/runtime/vm_operations.cpp b/hotspot/src/share/vm/runtime/vm_operations.cpp
index 5685589813f..d5d7e7e989a 100644
--- a/hotspot/src/share/vm/runtime/vm_operations.cpp
+++ b/hotspot/src/share/vm/runtime/vm_operations.cpp
@@ -28,7 +28,7 @@
#include "code/codeCache.hpp"
#include "compiler/compileBroker.hpp"
#include "compiler/compilerOracle.hpp"
-#include "gc_implementation/shared/isGCActiveMark.hpp"
+#include "gc/shared/isGCActiveMark.hpp"
#include "memory/heapInspection.hpp"
#include "memory/resourceArea.hpp"
#include "oops/symbol.hpp"
diff --git a/hotspot/src/share/vm/services/attachListener.cpp b/hotspot/src/share/vm/services/attachListener.cpp
index 89c0d13420a..a1c8b8a43f9 100644
--- a/hotspot/src/share/vm/services/attachListener.cpp
+++ b/hotspot/src/share/vm/services/attachListener.cpp
@@ -25,7 +25,7 @@
#include "precompiled.hpp"
#include "classfile/javaClasses.hpp"
#include "classfile/systemDictionary.hpp"
-#include "gc_implementation/shared/vmGCOperations.hpp"
+#include "gc/shared/vmGCOperations.hpp"
#include "memory/resourceArea.hpp"
#include "oops/oop.inline.hpp"
#include "prims/jvmtiExport.hpp"
@@ -36,8 +36,8 @@
#include "runtime/os.hpp"
#include "services/attachListener.hpp"
#include "services/diagnosticCommand.hpp"
-#include "services/writeableFlags.hpp"
#include "services/heapDumper.hpp"
+#include "services/writeableFlags.hpp"
volatile bool AttachListener::_initialized;
diff --git a/hotspot/src/share/vm/services/diagnosticCommand.cpp b/hotspot/src/share/vm/services/diagnosticCommand.cpp
index 287f958a794..491f3568d47 100644
--- a/hotspot/src/share/vm/services/diagnosticCommand.cpp
+++ b/hotspot/src/share/vm/services/diagnosticCommand.cpp
@@ -25,16 +25,16 @@
#include "precompiled.hpp"
#include "classfile/classLoaderStats.hpp"
#include "classfile/compactHashtable.hpp"
-#include "gc_implementation/shared/vmGCOperations.hpp"
+#include "gc/shared/vmGCOperations.hpp"
#include "oops/oop.inline.hpp"
#include "runtime/javaCalls.hpp"
#include "runtime/os.hpp"
#include "services/diagnosticArgument.hpp"
#include "services/diagnosticCommand.hpp"
#include "services/diagnosticFramework.hpp"
-#include "services/writeableFlags.hpp"
#include "services/heapDumper.hpp"
#include "services/management.hpp"
+#include "services/writeableFlags.hpp"
#include "utilities/macros.hpp"
PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
diff --git a/hotspot/src/share/vm/services/g1MemoryPool.cpp b/hotspot/src/share/vm/services/g1MemoryPool.cpp
index 61411ce4128..49328908920 100644
--- a/hotspot/src/share/vm/services/g1MemoryPool.cpp
+++ b/hotspot/src/share/vm/services/g1MemoryPool.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -23,10 +23,10 @@
*/
#include "precompiled.hpp"
-#include "gc_implementation/g1/g1CollectedHeap.hpp"
-#include "gc_implementation/g1/g1CollectedHeap.inline.hpp"
-#include "gc_implementation/g1/g1CollectorPolicy.hpp"
-#include "gc_implementation/g1/heapRegion.hpp"
+#include "gc/g1/g1CollectedHeap.hpp"
+#include "gc/g1/g1CollectedHeap.inline.hpp"
+#include "gc/g1/g1CollectorPolicy.hpp"
+#include "gc/g1/heapRegion.hpp"
#include "services/g1MemoryPool.hpp"
G1MemoryPoolSuper::G1MemoryPoolSuper(G1CollectedHeap* g1h,
diff --git a/hotspot/src/share/vm/services/g1MemoryPool.hpp b/hotspot/src/share/vm/services/g1MemoryPool.hpp
index 78b877a0980..fddc439e899 100644
--- a/hotspot/src/share/vm/services/g1MemoryPool.hpp
+++ b/hotspot/src/share/vm/services/g1MemoryPool.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@
#include "utilities/macros.hpp"
#if INCLUDE_ALL_GCS
-#include "gc_implementation/g1/g1MonitoringSupport.hpp"
+#include "gc/g1/g1MonitoringSupport.hpp"
#include "services/memoryPool.hpp"
#include "services/memoryUsage.hpp"
#endif // INCLUDE_ALL_GCS
diff --git a/hotspot/src/share/vm/services/heapDumper.cpp b/hotspot/src/share/vm/services/heapDumper.cpp
index 2cee37ab358..c1e786b0931 100644
--- a/hotspot/src/share/vm/services/heapDumper.cpp
+++ b/hotspot/src/share/vm/services/heapDumper.cpp
@@ -26,9 +26,9 @@
#include "classfile/symbolTable.hpp"
#include "classfile/systemDictionary.hpp"
#include "classfile/vmSymbols.hpp"
-#include "gc_implementation/shared/vmGCOperations.hpp"
-#include "memory/gcLocker.inline.hpp"
-#include "memory/genCollectedHeap.hpp"
+#include "gc/shared/gcLocker.inline.hpp"
+#include "gc/shared/genCollectedHeap.hpp"
+#include "gc/shared/vmGCOperations.hpp"
#include "memory/universe.hpp"
#include "oops/objArrayKlass.hpp"
#include "oops/objArrayOop.inline.hpp"
@@ -42,10 +42,10 @@
#include "runtime/vm_operations.hpp"
#include "services/heapDumper.hpp"
#include "services/threadService.hpp"
-#include "utilities/ostream.hpp"
#include "utilities/macros.hpp"
+#include "utilities/ostream.hpp"
#if INCLUDE_ALL_GCS
-#include "gc_implementation/parallelScavenge/parallelScavengeHeap.hpp"
+#include "gc/parallel/parallelScavengeHeap.hpp"
#endif // INCLUDE_ALL_GCS
/*
diff --git a/hotspot/src/share/vm/services/memoryPool.cpp b/hotspot/src/share/vm/services/memoryPool.cpp
index 086530bd0d8..ec8d823e01d 100644
--- a/hotspot/src/share/vm/services/memoryPool.cpp
+++ b/hotspot/src/share/vm/services/memoryPool.cpp
@@ -25,9 +25,9 @@
#include "precompiled.hpp"
#include "classfile/systemDictionary.hpp"
#include "classfile/vmSymbols.hpp"
-#include "memory/defNewGeneration.hpp"
+#include "gc/serial/defNewGeneration.hpp"
+#include "gc/shared/space.hpp"
#include "memory/metaspace.hpp"
-#include "memory/space.hpp"
#include "oops/oop.inline.hpp"
#include "runtime/handles.inline.hpp"
#include "runtime/javaCalls.hpp"
@@ -39,7 +39,7 @@
#include "utilities/globalDefinitions.hpp"
#include "utilities/macros.hpp"
#if INCLUDE_ALL_GCS
-#include "gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.hpp"
+#include "gc/cms/compactibleFreeListSpace.hpp"
#endif
MemoryPool::MemoryPool(const char* name,
diff --git a/hotspot/src/share/vm/services/memoryService.cpp b/hotspot/src/share/vm/services/memoryService.cpp
index bb1f7f19d3c..595fc1ae743 100644
--- a/hotspot/src/share/vm/services/memoryService.cpp
+++ b/hotspot/src/share/vm/services/memoryService.cpp
@@ -25,15 +25,15 @@
#include "precompiled.hpp"
#include "classfile/systemDictionary.hpp"
#include "classfile/vmSymbols.hpp"
-#include "gc_implementation/shared/mutableSpace.hpp"
-#include "memory/collectorPolicy.hpp"
-#include "memory/defNewGeneration.hpp"
-#include "memory/genCollectedHeap.hpp"
-#include "memory/generation.hpp"
-#include "memory/generationSpec.hpp"
+#include "gc/parallel/mutableSpace.hpp"
+#include "gc/serial/defNewGeneration.hpp"
+#include "gc/serial/tenuredGeneration.hpp"
+#include "gc/shared/collectorPolicy.hpp"
+#include "gc/shared/genCollectedHeap.hpp"
+#include "gc/shared/generation.hpp"
+#include "gc/shared/generationSpec.hpp"
#include "memory/heap.hpp"
#include "memory/memRegion.hpp"
-#include "memory/tenuredGeneration.hpp"
#include "oops/oop.inline.hpp"
#include "runtime/globals.hpp"
#include "runtime/javaCalls.hpp"
@@ -46,12 +46,12 @@
#include "utilities/growableArray.hpp"
#include "utilities/macros.hpp"
#if INCLUDE_ALL_GCS
-#include "gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.hpp"
-#include "gc_implementation/g1/g1CollectedHeap.inline.hpp"
-#include "gc_implementation/parNew/parNewGeneration.hpp"
-#include "gc_implementation/parallelScavenge/parallelScavengeHeap.hpp"
-#include "gc_implementation/parallelScavenge/psOldGen.hpp"
-#include "gc_implementation/parallelScavenge/psYoungGen.hpp"
+#include "gc/cms/concurrentMarkSweepGeneration.hpp"
+#include "gc/cms/parNewGeneration.hpp"
+#include "gc/g1/g1CollectedHeap.inline.hpp"
+#include "gc/parallel/parallelScavengeHeap.hpp"
+#include "gc/parallel/psOldGen.hpp"
+#include "gc/parallel/psYoungGen.hpp"
#include "services/g1MemoryPool.hpp"
#include "services/psMemoryPool.hpp"
#endif // INCLUDE_ALL_GCS
diff --git a/hotspot/src/share/vm/services/memoryService.hpp b/hotspot/src/share/vm/services/memoryService.hpp
index e24cce73c57..3013f6a5909 100644
--- a/hotspot/src/share/vm/services/memoryService.hpp
+++ b/hotspot/src/share/vm/services/memoryService.hpp
@@ -25,11 +25,11 @@
#ifndef SHARE_VM_SERVICES_MEMORYSERVICE_HPP
#define SHARE_VM_SERVICES_MEMORYSERVICE_HPP
+#include "gc/shared/gcCause.hpp"
+#include "gc/shared/generation.hpp"
#include "memory/allocation.hpp"
-#include "memory/generation.hpp"
#include "runtime/handles.hpp"
#include "services/memoryUsage.hpp"
-#include "gc_interface/gcCause.hpp"
// Forward declaration
class MemoryPool;
diff --git a/hotspot/src/share/vm/services/psMemoryPool.hpp b/hotspot/src/share/vm/services/psMemoryPool.hpp
index e00f3c3e821..c59e82d05d6 100644
--- a/hotspot/src/share/vm/services/psMemoryPool.hpp
+++ b/hotspot/src/share/vm/services/psMemoryPool.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,12 +27,12 @@
#include "utilities/macros.hpp"
#if INCLUDE_ALL_GCS
-#include "gc_implementation/parallelScavenge/psOldGen.hpp"
-#include "gc_implementation/parallelScavenge/psYoungGen.hpp"
-#include "gc_implementation/shared/mutableSpace.hpp"
-#include "memory/defNewGeneration.hpp"
+#include "gc/parallel/mutableSpace.hpp"
+#include "gc/parallel/psOldGen.hpp"
+#include "gc/parallel/psYoungGen.hpp"
+#include "gc/serial/defNewGeneration.hpp"
+#include "gc/shared/space.hpp"
#include "memory/heap.hpp"
-#include "memory/space.hpp"
#include "services/memoryPool.hpp"
#include "services/memoryUsage.hpp"
#endif // INCLUDE_ALL_GCS
diff --git a/hotspot/src/share/vm/shark/sharkBuilder.hpp b/hotspot/src/share/vm/shark/sharkBuilder.hpp
index e594a196026..4dec366342a 100644
--- a/hotspot/src/share/vm/shark/sharkBuilder.hpp
+++ b/hotspot/src/share/vm/shark/sharkBuilder.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved.
* Copyright 2008, 2009, 2010 Red Hat, Inc.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -27,8 +27,8 @@
#define SHARE_VM_SHARK_SHARKBUILDER_HPP
#include "ci/ciType.hpp"
-#include "memory/barrierSet.hpp"
-#include "memory/cardTableModRefBS.hpp"
+#include "gc/shared/barrierSet.hpp"
+#include "gc/shared/cardTableModRefBS.hpp"
#include "shark/llvmHeaders.hpp"
#include "shark/llvmValue.hpp"
#include "shark/sharkCodeBuffer.hpp"
diff --git a/hotspot/src/share/vm/utilities/debug.cpp b/hotspot/src/share/vm/utilities/debug.cpp
index 3a0c9cc6d1a..a44e5a568fe 100644
--- a/hotspot/src/share/vm/utilities/debug.cpp
+++ b/hotspot/src/share/vm/utilities/debug.cpp
@@ -30,7 +30,7 @@
#include "code/vtableStubs.hpp"
#include "compiler/compileBroker.hpp"
#include "compiler/disassembler.hpp"
-#include "gc_interface/collectedHeap.hpp"
+#include "gc/shared/collectedHeap.hpp"
#include "interpreter/bytecodeHistogram.hpp"
#include "interpreter/interpreter.hpp"
#include "memory/resourceArea.hpp"
diff --git a/hotspot/src/share/vm/utilities/ostream.cpp b/hotspot/src/share/vm/utilities/ostream.cpp
index 57fe3465136..d53e9313ac5 100644
--- a/hotspot/src/share/vm/utilities/ostream.cpp
+++ b/hotspot/src/share/vm/utilities/ostream.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -24,7 +24,7 @@
#include "precompiled.hpp"
#include "compiler/compileLog.hpp"
-#include "gc_implementation/shared/gcId.hpp"
+#include "gc/shared/gcId.hpp"
#include "oops/oop.inline.hpp"
#include "runtime/arguments.hpp"
#include "runtime/os.hpp"
diff --git a/hotspot/src/share/vm/utilities/top.hpp b/hotspot/src/share/vm/utilities/top.hpp
index 9fb48d0e045..2d294cc2e20 100644
--- a/hotspot/src/share/vm/utilities/top.hpp
+++ b/hotspot/src/share/vm/utilities/top.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -34,7 +34,7 @@
#include "utilities/ostream.hpp"
#include "utilities/sizes.hpp"
#if INCLUDE_ALL_GCS
-#include "gc_implementation/g1/g1_globals.hpp"
+#include "gc/g1/g1_globals.hpp"
#endif // INCLUDE_ALL_GCS
#ifdef COMPILER1
#include "c1/c1_globals.hpp"
diff --git a/hotspot/src/share/vm/utilities/vmError.cpp b/hotspot/src/share/vm/utilities/vmError.cpp
index 4eef724f6ec..af190553572 100644
--- a/hotspot/src/share/vm/utilities/vmError.cpp
+++ b/hotspot/src/share/vm/utilities/vmError.cpp
@@ -26,7 +26,7 @@
#include "precompiled.hpp"
#include "code/codeCache.hpp"
#include "compiler/compileBroker.hpp"
-#include "gc_interface/collectedHeap.hpp"
+#include "gc/shared/collectedHeap.hpp"
#include "prims/whitebox.hpp"
#include "runtime/arguments.hpp"
#include "runtime/atomic.inline.hpp"
diff --git a/hotspot/test/TEST.groups b/hotspot/test/TEST.groups
index 31ae122778a..91d0b48f017 100644
--- a/hotspot/test/TEST.groups
+++ b/hotspot/test/TEST.groups
@@ -249,7 +249,7 @@ needs_serialgc = \
gc/arguments/TestMaxNewSize.java \
gc/arguments/TestSerialHeapSizeFlags.java \
gc/arguments/TestUseCompressedOopsErgo.java \
- gc/defnew/HeapChangeLogging.java \
+ gc/serial/HeapChangeLogging.java \
gc/metaspace/TestMetaspacePerfCounters.java \
gc/metaspace/TestPerfCountersAndMemoryPools.java \
gc/startup_warnings/TestSerialGC.java
@@ -265,7 +265,7 @@ needs_parallelgc = \
gc/arguments/TestUseCompressedOopsErgo.java \
gc/ergonomics/TestDynamicNumberOfGCThreads.java
gc/metaspace/TestMetaspacePerfCounters.java \
- gc/parallelScavenge/ \
+ gc/parallel/ \
gc/startup_warnings/TestParallelGC.java \
gc/startup_warnings/TestParallelScavengeSerialOld.java
@@ -280,7 +280,7 @@ needs_cmsgc = \
gc/arguments/TestParallelGCThreads.java \
gc/arguments/TestUseCompressedOopsErgo.java \
gc/class_unloading/TestCMSClassUnloadingEnabledHWM.java \
- gc/concurrentMarkSweep/ \
+ gc/cms/ \
gc/ergonomics/TestDynamicNumberOfGCThreads.java
gc/startup_warnings/TestCMS.java \
gc/startup_warnings/TestDefNewCMS.java \
diff --git a/hotspot/test/gc/concurrentMarkSweep/DisableResizePLAB.java b/hotspot/test/gc/cms/DisableResizePLAB.java
similarity index 95%
rename from hotspot/test/gc/concurrentMarkSweep/DisableResizePLAB.java
rename to hotspot/test/gc/cms/DisableResizePLAB.java
index be8ac5d958c..b7cad24eae6 100644
--- a/hotspot/test/gc/concurrentMarkSweep/DisableResizePLAB.java
+++ b/hotspot/test/gc/cms/DisableResizePLAB.java
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
diff --git a/hotspot/test/gc/concurrentMarkSweep/GuardShrinkWarning.java b/hotspot/test/gc/cms/GuardShrinkWarning.java
similarity index 100%
rename from hotspot/test/gc/concurrentMarkSweep/GuardShrinkWarning.java
rename to hotspot/test/gc/cms/GuardShrinkWarning.java
diff --git a/hotspot/test/gc/parallelScavenge/AdaptiveGCBoundary.java b/hotspot/test/gc/parallel/AdaptiveGCBoundary.java
similarity index 100%
rename from hotspot/test/gc/parallelScavenge/AdaptiveGCBoundary.java
rename to hotspot/test/gc/parallel/AdaptiveGCBoundary.java
diff --git a/hotspot/test/gc/parallelScavenge/TestDynShrinkHeap.java b/hotspot/test/gc/parallel/TestDynShrinkHeap.java
similarity index 100%
rename from hotspot/test/gc/parallelScavenge/TestDynShrinkHeap.java
rename to hotspot/test/gc/parallel/TestDynShrinkHeap.java
diff --git a/hotspot/test/gc/defnew/HeapChangeLogging.java b/hotspot/test/gc/serial/HeapChangeLogging.java
similarity index 100%
rename from hotspot/test/gc/defnew/HeapChangeLogging.java
rename to hotspot/test/gc/serial/HeapChangeLogging.java
From f05640eb98ce24681234d89f42ea97db07dc95fd Mon Sep 17 00:00:00 2001
From: Bertrand Delsart
Date: Mon, 24 Feb 2014 12:49:21 +0100
Subject: [PATCH 02/78] 8035496: G1 ARM: missing remset entry noticed by
VerifyAfterGC for vm/gc/concurrent/lp50yp10rp70mr30st0
Release_store used when registering a PerRegionTable. Also reviewed-by: vitalyd@gmail.com
Reviewed-by: jmasa, tschatzl, brutisso
---
hotspot/src/share/vm/gc/g1/heapRegionRemSet.cpp | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/hotspot/src/share/vm/gc/g1/heapRegionRemSet.cpp b/hotspot/src/share/vm/gc/g1/heapRegionRemSet.cpp
index 02ac68eee8d..c8625f01435 100644
--- a/hotspot/src/share/vm/gc/g1/heapRegionRemSet.cpp
+++ b/hotspot/src/share/vm/gc/g1/heapRegionRemSet.cpp
@@ -497,7 +497,15 @@ void OtherRegionsTable::add_reference(OopOrNarrowOopStar from, uint tid) {
PerRegionTable* first_prt = _fine_grain_regions[ind];
prt->set_collision_list_next(first_prt);
- _fine_grain_regions[ind] = prt;
+ // The assignment into _fine_grain_regions allows the prt to
+ // start being used concurrently. In addition to
+ // collision_list_next which must be visible (else concurrent
+ // parsing of the list, if any, may fail to see other entries),
+ // the content of the prt must be visible (else for instance
+ // some mark bits may not yet seem cleared or a 'later' update
+ // performed by a concurrent thread could be undone when the
+ // zeroing becomes visible). This requires store ordering.
+ OrderAccess::release_store_ptr((volatile PerRegionTable*)&_fine_grain_regions[ind], prt);
_n_fine_entries++;
if (G1HRRSUseSparseTable) {
From ffe4b47d2053e08db86975d9176a68251b184685 Mon Sep 17 00:00:00 2001
From: Jaroslav Bachorik
Date: Fri, 3 Apr 2015 15:39:38 +0200
Subject: [PATCH 03/78] 8075926: Add a sun.management.JMXConnectorServer perf
counter to track its state
Reviewed-by: duke
---
.../share/classes/sun/management/Agent.java | 1 +
.../sun/management/ConnectorAddressLink.java | 43 +++-
.../bootstrap/JvmstatCountersTest.java | 13 +-
.../startstop/JMXStatusPerfCountersTest.java | 188 ++++++++++++++++++
.../startstop/ManagementAgentJcmd.java | 36 ++++
5 files changed, 274 insertions(+), 7 deletions(-)
create mode 100644 jdk/test/sun/management/jmxremote/startstop/JMXStatusPerfCountersTest.java
diff --git a/jdk/src/java.management/share/classes/sun/management/Agent.java b/jdk/src/java.management/share/classes/sun/management/Agent.java
index ffb3105255e..e0b781dc71c 100644
--- a/jdk/src/java.management/share/classes/sun/management/Agent.java
+++ b/jdk/src/java.management/share/classes/sun/management/Agent.java
@@ -345,6 +345,7 @@ public class Agent {
if (jmxServer != null) {
ConnectorBootstrap.unexportRegistry();
+ ConnectorAddressLink.unexportRemote();
// Attempt to stop already stopped agent
// Don't cause any errors.
diff --git a/jdk/src/java.management/share/classes/sun/management/ConnectorAddressLink.java b/jdk/src/java.management/share/classes/sun/management/ConnectorAddressLink.java
index 893f11c1f46..4ec5ec799cc 100644
--- a/jdk/src/java.management/share/classes/sun/management/ConnectorAddressLink.java
+++ b/jdk/src/java.management/share/classes/sun/management/ConnectorAddressLink.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@ package sun.management;
import java.io.IOException;
import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
@@ -45,9 +46,26 @@ import sun.management.counter.perf.PerfInstrumentation;
* @since 1.5
*/
public class ConnectorAddressLink {
+ /**
+ * A simple wrapper for the perf-counter backing {@linkplain ByteBuffer}
+ */
+ private static final class PerfHandle {
+ private ByteBuffer bb;
+
+ private PerfHandle(ByteBuffer bb) {
+ this.bb = bb.order(ByteOrder.nativeOrder());
+ }
+
+ private void putLong(long l) {
+ this.bb = bb.clear();
+ this.bb.asLongBuffer().put(l);
+ }
+ }
private static final String CONNECTOR_ADDRESS_COUNTER =
"sun.management.JMXConnectorServer.address";
+ private static final String REMOTE_CONNECTOR_STATE_COUNTER =
+ "sun.management.JMXConnectorServer.remote.enabled";
/*
* The format of the jvmstat counters representing the properties of
@@ -78,7 +96,9 @@ public class ConnectorAddressLink {
* JMX remote connector counter (it will be incremented every
* time a new out-of-the-box JMX remote connector is created).
*/
- private static AtomicInteger counter = new AtomicInteger();
+ private static final AtomicInteger counter = new AtomicInteger();
+
+ private static PerfHandle remotePerfHandle = null;
/**
* Exports the specified connector address to the instrumentation buffer
@@ -93,7 +113,17 @@ public class ConnectorAddressLink {
}
Perf perf = Perf.getPerf();
perf.createString(
- CONNECTOR_ADDRESS_COUNTER, 1, Units.STRING.intValue(), address);
+ CONNECTOR_ADDRESS_COUNTER, 1, Units.STRING.intValue(), address);
+ }
+
+ public static void unexportRemote() {
+ unexport(remotePerfHandle);
+ }
+
+ private static void unexport(PerfHandle ph) {
+ if (ph != null) {
+ ph.putLong(-1L);
+ }
}
/**
@@ -143,6 +173,13 @@ public class ConnectorAddressLink {
perf.createString(REMOTE_CONNECTOR_COUNTER_PREFIX + index + "." +
entry.getKey(), 1, Units.STRING.intValue(), entry.getValue());
}
+ if (remotePerfHandle != null) {
+ remotePerfHandle.putLong(index);
+ } else {
+ remotePerfHandle = new PerfHandle(
+ perf.createLong(REMOTE_CONNECTOR_STATE_COUNTER, 1, Units.NONE.intValue(), (long)index)
+ );
+ }
}
/**
diff --git a/jdk/test/sun/management/jmxremote/bootstrap/JvmstatCountersTest.java b/jdk/test/sun/management/jmxremote/bootstrap/JvmstatCountersTest.java
index 277edb33e5f..80f74b37ce3 100644
--- a/jdk/test/sun/management/jmxremote/bootstrap/JvmstatCountersTest.java
+++ b/jdk/test/sun/management/jmxremote/bootstrap/JvmstatCountersTest.java
@@ -116,10 +116,10 @@ public class JvmstatCountersTest {
throw new IllegalArgumentException("Test case 3 failed");
}
for (String key : remoteData.keySet()) {
- if (!key.startsWith("sun.management.JMXConnectorServer.0.")) {
+ if (!isKeyAcceptable(key)) {
System.out.println("Test FAILED! The OOTB management " +
"agent shouldn't publish anything which isn't " +
- "related to the remote connector.");
+ "related to the remote connector (" + key + ").");
throw new IllegalArgumentException("Test case 3 failed");
}
}
@@ -165,10 +165,10 @@ public class JvmstatCountersTest {
throw new IllegalArgumentException("Test case 4 failed");
}
for (String key : remoteData2.keySet()) {
- if (!key.startsWith("sun.management.JMXConnectorServer.0.")) {
+ if (!isKeyAcceptable(key)) {
System.out.println("Test FAILED! The OOTB management " +
"agent shouldn't publish anything which isn't " +
- "related to the remote connector.");
+ "related to the remote connector (" + key + ").");
throw new IllegalArgumentException("Test case 4 failed");
}
}
@@ -184,4 +184,9 @@ public class JvmstatCountersTest {
}
System.out.println("Bye! Bye!");
}
+
+ private static boolean isKeyAcceptable(String key) {
+ return key.startsWith("sun.management.JMXConnectorServer.0.") ||
+ key.startsWith("sun.management.JMXConnectorServer.remote.enabled");
+ }
}
diff --git a/jdk/test/sun/management/jmxremote/startstop/JMXStatusPerfCountersTest.java b/jdk/test/sun/management/jmxremote/startstop/JMXStatusPerfCountersTest.java
new file mode 100644
index 00000000000..4d1eef69f50
--- /dev/null
+++ b/jdk/test/sun/management/jmxremote/startstop/JMXStatusPerfCountersTest.java
@@ -0,0 +1,188 @@
+/*
+ * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.io.IOException;
+import java.net.BindException;
+import java.util.Properties;
+import java.util.function.Predicate;
+import static org.testng.Assert.*;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
+
+import jdk.testlibrary.ProcessTools;
+
+
+/**
+ * @test
+ * @bug 8075926
+ * @summary Makes sure that the current management agent status is reflected
+ * in the related performance counters.
+ * @library /lib/testlibrary
+ * @build jdk.testlibrary.* PortAllocator TestApp ManagementAgentJcmd
+ * @run testng/othervm -XX:+UsePerfData JMXStatusPerfCountersTest
+ */
+public class JMXStatusPerfCountersTest {
+ private final static String TEST_APP_NAME = "TestApp";
+
+ private final static String REMOTE_STATUS_KEY = "sun.management.JMXConnectorServer.remote.enabled";
+
+ private static ProcessBuilder testAppPb;
+ private Process testApp;
+
+ private ManagementAgentJcmd jcmd;
+
+ @BeforeClass
+ public static void setupClass() throws Exception {
+ testAppPb = ProcessTools.createJavaProcessBuilder(
+ "-XX:+UsePerfData",
+ "-cp", System.getProperty("test.class.path"),
+ TEST_APP_NAME
+ );
+ }
+
+ @BeforeTest
+ public void setup() {
+ jcmd = new ManagementAgentJcmd(TEST_APP_NAME, false);
+ }
+
+ @BeforeMethod
+ public void startTestApp() throws Exception {
+ testApp = ProcessTools.startProcess(
+ TEST_APP_NAME, testAppPb,
+ (Predicate)l->l.trim().equals("main enter")
+ );
+ }
+
+ @AfterMethod
+ public void stopTestApp() throws Exception {
+ testApp.getOutputStream().write(1);
+ testApp.getOutputStream().flush();
+ testApp.waitFor();
+ testApp = null;
+ }
+
+ /**
+ * The 'sun.management.JMXConnectorServer.remote.enabled' counter must not be
+ * exported if the remote agent is not enabled.
+ * @throws Exception
+ */
+ @Test
+ public void testNotInitializedRemote() throws Exception {
+ assertFalse(
+ getCounters().containsKey(REMOTE_STATUS_KEY),
+ "Unexpected occurrence of " + REMOTE_STATUS_KEY + " in perf counters"
+ );
+ }
+
+ /**
+ * After enabling the remote agent the 'sun.management.JMXConnectorServer.remote.enabled'
+ * counter will be exported with value of '0' - corresponding to the actual
+ * version of the associated remote connector perf counters.
+ * @throws Exception
+ */
+ @Test
+ public void testRemoteEnabled() throws Exception {
+ while (true) {
+ try {
+ int[] ports = PortAllocator.allocatePorts(1);
+ jcmd.start(
+ "jmxremote.port=" + ports[0],
+ "jmxremote.authenticate=false",
+ "jmxremote.ssl=false"
+ );
+ String v = getCounters().getProperty(REMOTE_STATUS_KEY);
+ assertNotNull(v);
+ assertEquals("0", v);
+ return;
+ } catch (BindException e) {
+ System.out.println("Failed to allocate ports. Retrying ...");
+ }
+ }
+ }
+
+ /**
+ * After disabling the remote agent the value of 'sun.management.JMXConnectorServer.remote.enabled'
+ * counter will become '-1'.
+ * @throws Exception
+ */
+ @Test
+ public void testRemoteDisabled() throws Exception {
+ while (true) {
+ try {
+ int[] ports = PortAllocator.allocatePorts(1);
+ jcmd.start(
+ "jmxremote.port=" + ports[0],
+ "jmxremote.authenticate=false",
+ "jmxremote.ssl=false"
+ );
+ jcmd.stop();
+ String v = getCounters().getProperty(REMOTE_STATUS_KEY);
+ assertNotNull(v);
+ assertEquals("-1", v);
+ return;
+ } catch (BindException e) {
+ System.out.println("Failed to allocate ports. Retrying ...");
+ }
+ }
+ }
+
+ /**
+ * Each subsequent re-enablement of the remote agent must keep the value of
+ * 'sun.management.JMXConnectorServer.remote.enabled' counter in sync with
+ * the actual version of the associated remote connector perf counters.
+ * @throws Exception
+ */
+ @Test
+ public void testRemoteReEnabled() throws Exception {
+ while (true) {
+ try {
+ int[] ports = PortAllocator.allocatePorts(1);
+ jcmd.start(
+ "jmxremote.port=" + ports[0],
+ "jmxremote.authenticate=false",
+ "jmxremote.ssl=false"
+ );
+ jcmd.stop();
+ jcmd.start(
+ "jmxremote.port=" + ports[0],
+ "jmxremote.authenticate=false",
+ "jmxremote.ssl=false"
+ );
+
+ String v = getCounters().getProperty(REMOTE_STATUS_KEY);
+ assertNotNull(v);
+ assertEquals("1", v);
+ return;
+ } catch (BindException e) {
+ System.out.println("Failed to allocate ports. Retrying ...");
+ }
+ }
+ }
+
+ private Properties getCounters() throws IOException, InterruptedException {
+ return jcmd.perfCounters("sun\\.management\\.JMXConnectorServer\\..*");
+ }
+}
\ No newline at end of file
diff --git a/jdk/test/sun/management/jmxremote/startstop/ManagementAgentJcmd.java b/jdk/test/sun/management/jmxremote/startstop/ManagementAgentJcmd.java
index efee771cf4a..f273cd2ce4b 100644
--- a/jdk/test/sun/management/jmxremote/startstop/ManagementAgentJcmd.java
+++ b/jdk/test/sun/management/jmxremote/startstop/ManagementAgentJcmd.java
@@ -25,8 +25,10 @@ import java.net.BindException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
+import java.util.Properties;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.function.Consumer;
+import java.util.regex.Pattern;
import java.util.stream.Collectors;
import sun.management.Agent;
import sun.management.AgentConfigurationError;
@@ -43,6 +45,7 @@ final class ManagementAgentJcmd {
private static final String CMD_START = "ManagementAgent.start";
private static final String CMD_START_LOCAL = "ManagementAgent.start_local";
private static final String CMD_STATUS = "ManagementAgent.status";
+ private static final String CMD_PRINTPERF = "PerfCounter.print";
private final String id;
private final boolean verbose;
@@ -62,6 +65,39 @@ final class ManagementAgentJcmd {
return jcmd();
}
+ /**
+ * `jcmd PerfCounter.print`
+ * @return Returns the available performance counters with their values as
+ * {@linkplain Properties} instance
+ * @throws IOException
+ * @throws InterruptedException
+ */
+ public Properties perfCounters() throws IOException, InterruptedException {
+ return perfCounters(".*");
+ }
+
+ /**
+ * `jcmd PerfCounter.print | grep {exp}>`
+ * @param regex Regular expression for including perf counters in the result
+ * @return Returns the matching performance counters with their values
+ * as {@linkplain Properties} instance
+ * @throws IOException
+ * @throws InterruptedException
+ */
+ public Properties perfCounters(String regex) throws IOException, InterruptedException {
+ Pattern pat = Pattern.compile(regex);
+ Properties p = new Properties();
+ for(String l : jcmd(CMD_PRINTPERF).split("\\n")) {
+ String[] kv = l.split("=");
+ if (kv.length > 1) {
+ if (pat.matcher(kv[0]).matches()) {
+ p.setProperty(kv[0], kv[1].replace("\"", ""));
+ }
+ }
+ }
+ return p;
+ }
+
/**
* `jcmd ManagementAgent.stop`
* @return The JCMD output
From 5c859405b5ee573f188f881b697b4c3e636363d1 Mon Sep 17 00:00:00 2001
From: David Holmes
Date: Tue, 12 May 2015 20:55:40 -0400
Subject: [PATCH 04/78] 8078470: [Linux] Replace syscall use in
os::fork_and_exec with glibc fork() and execve()
Reviewed-by: stuefe, dsamersoff, dcubed
---
hotspot/src/os/linux/vm/os_linux.cpp | 26 +------
hotspot/src/share/vm/utilities/vmError.cpp | 8 ++-
.../runtime/ErrorHandling/TestOnError.java | 66 +++++++++++++++++
.../ErrorHandling/TestOnOutOfMemoryError.java | 70 +++++++++++++++++++
4 files changed, 144 insertions(+), 26 deletions(-)
create mode 100644 hotspot/test/runtime/ErrorHandling/TestOnError.java
create mode 100644 hotspot/test/runtime/ErrorHandling/TestOnOutOfMemoryError.java
diff --git a/hotspot/src/os/linux/vm/os_linux.cpp b/hotspot/src/os/linux/vm/os_linux.cpp
index 6cecb0dd85a..ad8a227b491 100644
--- a/hotspot/src/os/linux/vm/os_linux.cpp
+++ b/hotspot/src/os/linux/vm/os_linux.cpp
@@ -5878,14 +5878,6 @@ void Parker::unpark() {
extern char** environ;
-#ifndef __NR_fork
- #define __NR_fork IA32_ONLY(2) IA64_ONLY(not defined) AMD64_ONLY(57) AARCH64_ONLY(1079)
-#endif
-
-#ifndef __NR_execve
- #define __NR_execve IA32_ONLY(11) IA64_ONLY(1033) AMD64_ONLY(59) AARCH64_ONLY(221)
-#endif
-
// Run the specified command in a separate process. Return its exit value,
// or -1 on failure (e.g. can't fork a new process).
// Unlike system(), this function can be called from signal handler. It
@@ -5893,13 +5885,7 @@ extern char** environ;
int os::fork_and_exec(char* cmd) {
const char * argv[4] = {"sh", "-c", cmd, NULL};
- // fork() in LinuxThreads/NPTL is not async-safe. It needs to run
- // pthread_atfork handlers and reset pthread library. All we need is a
- // separate process to execve. Make a direct syscall to fork process.
- // On IA64 there's no fork syscall, we have to use fork() and hope for
- // the best...
- pid_t pid = NOT_IA64(syscall(__NR_fork);)
- IA64_ONLY(fork();)
+ pid_t pid = fork();
if (pid < 0) {
// fork failed
@@ -5908,15 +5894,7 @@ int os::fork_and_exec(char* cmd) {
} else if (pid == 0) {
// child process
- // execve() in LinuxThreads will call pthread_kill_other_threads_np()
- // first to kill every thread on the thread list. Because this list is
- // not reset by fork() (see notes above), execve() will instead kill
- // every thread in the parent process. We know this is the only thread
- // in the new process, so make a system call directly.
- // IA64 should use normal execve() from glibc to match the glibc fork()
- // above.
- NOT_IA64(syscall(__NR_execve, "/bin/sh", argv, environ);)
- IA64_ONLY(execve("/bin/sh", (char* const*)argv, environ);)
+ execve("/bin/sh", (char* const*)argv, environ);
// execve failed
_exit(-1);
diff --git a/hotspot/src/share/vm/utilities/vmError.cpp b/hotspot/src/share/vm/utilities/vmError.cpp
index fb8eefff2c4..a587bde383c 100644
--- a/hotspot/src/share/vm/utilities/vmError.cpp
+++ b/hotspot/src/share/vm/utilities/vmError.cpp
@@ -1062,7 +1062,9 @@ void VMError::report_and_die() {
out.print_raw (cmd);
out.print_raw_cr("\" ...");
- os::fork_and_exec(cmd);
+ if (os::fork_and_exec(cmd) < 0) {
+ out.print_cr("os::fork_and_exec failed: %s (%d)", strerror(errno), errno);
+ }
}
// done with OnError
@@ -1147,7 +1149,9 @@ void VM_ReportJavaOutOfMemory::doit() {
#endif
tty->print_cr("\"%s\"...", cmd);
- os::fork_and_exec(cmd);
+ if (os::fork_and_exec(cmd) < 0) {
+ tty->print_cr("os::fork_and_exec failed: %s (%d)", strerror(errno), errno);
+ }
}
}
diff --git a/hotspot/test/runtime/ErrorHandling/TestOnError.java b/hotspot/test/runtime/ErrorHandling/TestOnError.java
new file mode 100644
index 00000000000..e896f10cff6
--- /dev/null
+++ b/hotspot/test/runtime/ErrorHandling/TestOnError.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test TestOnError
+ * @summary Test using -XX:OnError=
+ * @library /testlibrary
+ * @build TestOnError
+ * @run main TestOnError
+ * @bug 8078470
+ */
+
+import jdk.test.lib.*;
+
+public class TestOnError {
+
+ public static void main(String[] args) throws Exception {
+ if (!Platform.isDebugBuild()) {
+ System.out.println("Test requires a non-product build - skipping");
+ return;
+ }
+
+ String msg = "Test Succeeded";
+
+ // Execute the VM so that a
+ ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
+ "-XX:-TransmitErrorReport",
+ "-XX:ErrorHandlerTest=12", // trigger potential SEGV
+ "-XX:OnError=echo " + msg,
+ TestOnError.class.getName());
+
+ OutputAnalyzer output = new OutputAnalyzer(pb.start());
+
+ /* Actual output will include:
+ #
+ # -XX:OnError="echo Test Succeeded"
+ # Executing /bin/sh -c "echo Test Succeeded"...
+ Test Succeeded
+
+ So we don't want to match on the "# Executing ..." line, and they
+ both get written to stdout.
+ */
+ output.stdoutShouldMatch("^" + msg); // match start of line only
+ System.out.println("PASSED");
+ }
+}
diff --git a/hotspot/test/runtime/ErrorHandling/TestOnOutOfMemoryError.java b/hotspot/test/runtime/ErrorHandling/TestOnOutOfMemoryError.java
new file mode 100644
index 00000000000..775e1bf1d5b
--- /dev/null
+++ b/hotspot/test/runtime/ErrorHandling/TestOnOutOfMemoryError.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test TestOnOutOfMemoryError
+ * @summary Test using -XX:OnOutOfMemoryError=
+ * @library /testlibrary
+ * @build TestOnOutOfMemoryError
+ * @run main TestOnOutOfMemoryError
+ * @bug 8078470
+ */
+
+import jdk.test.lib.*;
+
+public class TestOnOutOfMemoryError {
+
+ public static void main(String[] args) throws Exception {
+ if (args.length == 1) {
+ // This should guarantee to throw:
+ // java.lang.OutOfMemoryError: Requested array size exceeds VM limit
+ Object[] oa = new Object[Integer.MAX_VALUE];
+ return;
+ }
+
+ // else this is the main test
+ String msg = "Test Succeeded";
+ ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
+ "-XX:OnOutOfMemoryError=echo " + msg,
+ TestOnOutOfMemoryError.class.getName(),
+ "throwOOME");
+
+ OutputAnalyzer output = new OutputAnalyzer(pb.start());
+
+ /* Actual output should look like this:
+ #
+ # java.lang.OutOfMemoryError: Requested array size exceeds VM limit
+ # -XX:OnOutOfMemoryError="echo Test Succeeded"
+ # Executing /bin/sh -c "echo Test Succeeded"...
+ Test Succeeded
+ Exception in thread "main" java.lang.OutOfMemoryError: Requested array size exceeds VM limit
+ at OOME.main(OOME.java:3)
+
+ So we don't want to match on the "# Executing ..." line, and they
+ both get written to stdout.
+ */
+ output.shouldContain("Requested array size exceeds VM limit");
+ output.stdoutShouldMatch("^" + msg); // match start of line only
+ System.out.println("PASSED");
+ }
+}
From 07f87406170d5479aa7fa0b9c3b04888426ed5a2 Mon Sep 17 00:00:00 2001
From: Andreas Eriksson
Date: Thu, 7 May 2015 15:05:46 +0200
Subject: [PATCH 05/78] 8051045: HotSpot fails to wrap Exceptions from
invokedynamic in a BootstrapMethodError
Reviewed-by: coleenp, dsimms
---
.../src/share/vm/interpreter/linkResolver.cpp | 48 ++++----
.../BootstrapMethodErrorTest.java | 115 ++++++++++++++++++
2 files changed, 142 insertions(+), 21 deletions(-)
create mode 100644 hotspot/test/runtime/invokedynamic/BootstrapMethodErrorTest.java
diff --git a/hotspot/src/share/vm/interpreter/linkResolver.cpp b/hotspot/src/share/vm/interpreter/linkResolver.cpp
index 49b5a51d026..d16fc576b6b 100644
--- a/hotspot/src/share/vm/interpreter/linkResolver.cpp
+++ b/hotspot/src/share/vm/interpreter/linkResolver.cpp
@@ -1587,6 +1587,26 @@ void LinkResolver::resolve_handle_call(CallInfo& result, KlassHandle resolved_kl
result.set_handle(resolved_method, resolved_appendix, resolved_method_type, CHECK);
}
+static void wrap_invokedynamic_exception(TRAPS) {
+ if (HAS_PENDING_EXCEPTION) {
+ if (TraceMethodHandles) {
+ tty->print_cr("invokedynamic throws BSME for " INTPTR_FORMAT, p2i((void *)PENDING_EXCEPTION));
+ PENDING_EXCEPTION->print();
+ }
+ if (PENDING_EXCEPTION->is_a(SystemDictionary::BootstrapMethodError_klass())) {
+ // throw these guys, since they are already wrapped
+ return;
+ }
+ if (!PENDING_EXCEPTION->is_a(SystemDictionary::LinkageError_klass())) {
+ // intercept only LinkageErrors which might have failed to wrap
+ return;
+ }
+ // See the "Linking Exceptions" section for the invokedynamic instruction in the JVMS.
+ Handle nested_exception(THREAD, PENDING_EXCEPTION);
+ CLEAR_PENDING_EXCEPTION;
+ THROW_CAUSE(vmSymbols::java_lang_BootstrapMethodError(), nested_exception)
+ }
+}
void LinkResolver::resolve_invokedynamic(CallInfo& result, constantPoolHandle pool, int index, TRAPS) {
//resolve_pool(, method_name, method_signature, current_klass, pool, index, CHECK);
@@ -1600,7 +1620,8 @@ void LinkResolver::resolve_invokedynamic(CallInfo& result, constantPoolHandle po
ConstantPoolCacheEntry* cpce = pool->invokedynamic_cp_cache_entry_at(index);
if (cpce->is_f1_null()) {
int pool_index = cpce->constant_pool_index();
- oop bsm_info = pool->resolve_bootstrap_specifier_at(pool_index, CHECK);
+ oop bsm_info = pool->resolve_bootstrap_specifier_at(pool_index, THREAD);
+ wrap_invokedynamic_exception(CHECK);
assert(bsm_info != NULL, "");
// FIXME: Cache this once per BootstrapMethods entry, not once per CONSTANT_InvokeDynamic.
bootstrap_specifier = Handle(THREAD, bsm_info);
@@ -1609,7 +1630,8 @@ void LinkResolver::resolve_invokedynamic(CallInfo& result, constantPoolHandle po
methodHandle method( THREAD, cpce->f1_as_method());
Handle appendix( THREAD, cpce->appendix_if_resolved(pool));
Handle method_type(THREAD, cpce->method_type_if_resolved(pool));
- result.set_handle(method, appendix, method_type, CHECK);
+ result.set_handle(method, appendix, method_type, THREAD);
+ wrap_invokedynamic_exception(CHECK);
return;
}
@@ -1640,25 +1662,9 @@ void LinkResolver::resolve_dynamic_call(CallInfo& result,
&resolved_appendix,
&resolved_method_type,
THREAD);
- if (HAS_PENDING_EXCEPTION) {
- if (TraceMethodHandles) {
- tty->print_cr("invokedynamic throws BSME for " INTPTR_FORMAT, p2i((void *)PENDING_EXCEPTION));
- PENDING_EXCEPTION->print();
- }
- if (PENDING_EXCEPTION->is_a(SystemDictionary::BootstrapMethodError_klass())) {
- // throw these guys, since they are already wrapped
- return;
- }
- if (!PENDING_EXCEPTION->is_a(SystemDictionary::LinkageError_klass())) {
- // intercept only LinkageErrors which might have failed to wrap
- return;
- }
- // See the "Linking Exceptions" section for the invokedynamic instruction in the JVMS.
- Handle nested_exception(THREAD, PENDING_EXCEPTION);
- CLEAR_PENDING_EXCEPTION;
- THROW_CAUSE(vmSymbols::java_lang_BootstrapMethodError(), nested_exception)
- }
- result.set_handle(resolved_method, resolved_appendix, resolved_method_type, CHECK);
+ wrap_invokedynamic_exception(CHECK);
+ result.set_handle(resolved_method, resolved_appendix, resolved_method_type, THREAD);
+ wrap_invokedynamic_exception(CHECK);
}
//------------------------------------------------------------------------------------------------------------------------
diff --git a/hotspot/test/runtime/invokedynamic/BootstrapMethodErrorTest.java b/hotspot/test/runtime/invokedynamic/BootstrapMethodErrorTest.java
new file mode 100644
index 00000000000..5581771852a
--- /dev/null
+++ b/hotspot/test/runtime/invokedynamic/BootstrapMethodErrorTest.java
@@ -0,0 +1,115 @@
+/*
+ * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8051045
+ * @summary Test that exceptions from invokedynamic are wrapped in BootstrapMethodError
+ * @modules java.base/jdk.internal.org.objectweb.asm
+ * @run main BootstrapMethodErrorTest
+ */
+
+import java.lang.reflect.Method;
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandles;
+import static java.lang.invoke.MethodHandles.*;
+import static java.lang.invoke.MethodType.*;
+
+import jdk.internal.org.objectweb.asm.ClassWriter;
+import jdk.internal.org.objectweb.asm.Handle;
+import jdk.internal.org.objectweb.asm.MethodVisitor;
+import jdk.internal.org.objectweb.asm.Opcodes;
+
+public class BootstrapMethodErrorTest extends ClassLoader implements Opcodes {
+
+ @Override
+ public Class findClass(String name) throws ClassNotFoundException {
+ byte[] b;
+ try {
+ b = loadClassData(name);
+ } catch (Throwable th) {
+ throw new ClassNotFoundException("Loading error", th);
+ }
+ return defineClass(name, b, 0, b.length);
+ }
+
+ private byte[] loadClassData(String name) throws Exception {
+ ClassWriter cw = new ClassWriter(0);
+ MethodVisitor mv;
+
+ if (name.equals("C")) {
+ cw.visit(52, ACC_SUPER | ACC_PUBLIC, "C", null, "java/lang/Object", null);
+ {
+ mv = cw.visitMethod(ACC_PRIVATE | ACC_STATIC, "m", "()V", null, null);
+ mv.visitCode();
+ mv.visitInsn(RETURN);
+ mv.visitMaxs(0, 1);
+ mv.visitEnd();
+ }
+ cw.visitEnd();
+ return cw.toByteArray();
+ } else if (name.equals("Exec")) {
+ cw.visit(52, ACC_SUPER | ACC_PUBLIC, "Exec", null, "java/lang/Object", null);
+ {
+ mv = cw.visitMethod(ACC_PUBLIC | ACC_STATIC, "invokeRef", "()V", null, null);
+ mv.visitCode();
+ Handle h = new Handle(H_INVOKESTATIC, "C", "m", "()V");
+ mv.visitInvokeDynamicInsn("C", "()V", h);
+ mv.visitInsn(RETURN);
+ mv.visitMaxs(0, 0);
+ mv.visitEnd();
+ }
+ cw.visitEnd();
+ return cw.toByteArray();
+ }
+ return null;
+ }
+
+ public static void main(String[] args) throws ClassNotFoundException, IllegalAccessException, NoSuchMethodException {
+ new BootstrapMethodErrorTest().test();
+ }
+
+ public void test() throws ClassNotFoundException, IllegalAccessException, NoSuchMethodException {
+ Class.forName("C", true, this);
+ Class> exec = Class.forName("Exec", true, this);
+
+ try {
+ exec.getMethod("invokeRef").invoke(null);
+ } catch (Throwable e) {
+ Throwable c = e.getCause();
+ if (c == null) {
+ throw new RuntimeException(
+ "Expected BootstrapMethodError wrapped in an InvocationTargetException but it wasn't wrapped", e);
+ } else if (c instanceof BootstrapMethodError) {
+ // Only way to pass test, all else should throw
+ return;
+ } else {
+ throw new RuntimeException(
+ "Expected BootstrapMethodError but got another Error: "
+ + c.getClass().getName(),
+ c);
+ }
+ }
+ throw new RuntimeException("Expected BootstrapMethodError but no Error at all was thrown");
+ }
+}
From 15fffb90d7af3ef665886c0fcc6f777004e91971 Mon Sep 17 00:00:00 2001
From: Jaroslav Bachorik
Date: Wed, 13 May 2015 10:17:38 +0200
Subject: [PATCH 06/78] 8046869: Several java/lang/instrument/PremainClass/*
tests fail due to timeout
Reviewed-by: sla
---
.../java/lang/instrument/PremainClass/NoPremainAgentTest.java | 2 +-
.../lang/instrument/PremainClass/ZeroArgPremainAgentTest.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/jdk/test/java/lang/instrument/PremainClass/NoPremainAgentTest.java b/jdk/test/java/lang/instrument/PremainClass/NoPremainAgentTest.java
index 29bf5623352..bd64239320a 100644
--- a/jdk/test/java/lang/instrument/PremainClass/NoPremainAgentTest.java
+++ b/jdk/test/java/lang/instrument/PremainClass/NoPremainAgentTest.java
@@ -33,7 +33,7 @@ import jdk.testlibrary.Utils;
* @modules java.management
* @run build jdk.testlibrary.* DummyMain
* @run shell ../MakeJAR3.sh NoPremainAgent
- * @run main NoPremainAgentTest
+ * @run main/othervm -XX:-CreateCoredumpOnCrash NoPremainAgentTest
*/
public class NoPremainAgentTest {
// Use a javaagent without the premain() function.
diff --git a/jdk/test/java/lang/instrument/PremainClass/ZeroArgPremainAgentTest.java b/jdk/test/java/lang/instrument/PremainClass/ZeroArgPremainAgentTest.java
index b879aa10f23..66633ea12d3 100644
--- a/jdk/test/java/lang/instrument/PremainClass/ZeroArgPremainAgentTest.java
+++ b/jdk/test/java/lang/instrument/PremainClass/ZeroArgPremainAgentTest.java
@@ -33,7 +33,7 @@ import jdk.testlibrary.Utils;
* @modules java.management
* @run build jdk.testlibrary.* DummyMain
* @run shell ../MakeJAR3.sh ZeroArgPremainAgent
- * @run main ZeroArgPremainAgentTest
+ * @run main/othervm -XX:-CreateCoredumpOnCrash ZeroArgPremainAgentTest
*/
public class ZeroArgPremainAgentTest {
// Use a javaagent with a zero argument premain() function.
From d7f44658949034f81aa01ab16c107be1a27be0ad Mon Sep 17 00:00:00 2001
From: Jaroslav Bachorik
Date: Wed, 13 May 2015 10:17:49 +0200
Subject: [PATCH 07/78] 8029098: Exclude
javax/management/remote/mandatory/notif/ListenerScaleTest.java from running
on fastdebug builds
Reviewed-by: sla, sjiang
---
.../remote/mandatory/notif/ListenerScaleTest.java | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/jdk/test/javax/management/remote/mandatory/notif/ListenerScaleTest.java b/jdk/test/javax/management/remote/mandatory/notif/ListenerScaleTest.java
index efebce3b365..0d7080e6b7d 100644
--- a/jdk/test/javax/management/remote/mandatory/notif/ListenerScaleTest.java
+++ b/jdk/test/javax/management/remote/mandatory/notif/ListenerScaleTest.java
@@ -21,12 +21,16 @@
* questions.
*/
-/*
+/**
* @test
* @bug 6338874
* @summary Check that notification dispatch is not linear in number of MBeans.
* @author Eamonn McManus
* @modules java.management
+ *
+ * @library /lib/testlibrary
+ * @run build jdk.testlibrary.* ListenerScaleTest
+ * @run main ListenerScaleTest
*/
/*
@@ -67,6 +71,8 @@ import javax.management.remote.JMXConnectorServer;
import javax.management.remote.JMXConnectorServerFactory;
import javax.management.remote.JMXServiceURL;
+import jdk.testlibrary.Platform;
+
public class ListenerScaleTest {
private static final int WARMUP_WITH_ONE_MBEAN = 1000;
private static final int NOTIFS_TO_TIME = 100;
@@ -126,6 +132,10 @@ public class ListenerScaleTest {
};
public static void main(String[] args) throws Exception {
+ if (Platform.isDebugBuild()) {
+ System.out.println("Running on a debug build. Performance test not applicable. Skipping.");
+ return;
+ }
MBeanServer mbs = MBeanServerFactory.newMBeanServer();
Sender sender = new Sender();
mbs.registerMBean(sender, testObjectName);
From 3e2a1f00e54b94ee9ed515881dd772334fb230c5 Mon Sep 17 00:00:00 2001
From: Jaroslav Bachorik
Date: Thu, 14 May 2015 11:41:11 +0200
Subject: [PATCH 08/78] 8078143:
java/lang/management/ThreadMXBean/AllThreadIds.java fails intermittently
Reviewed-by: dholmes, martin
---
.../management/ThreadMXBean/AllThreadIds.java | 220 +++++++++++++-----
1 file changed, 160 insertions(+), 60 deletions(-)
diff --git a/jdk/test/java/lang/management/ThreadMXBean/AllThreadIds.java b/jdk/test/java/lang/management/ThreadMXBean/AllThreadIds.java
index 3ecacae2569..9de573c3851 100644
--- a/jdk/test/java/lang/management/ThreadMXBean/AllThreadIds.java
+++ b/jdk/test/java/lang/management/ThreadMXBean/AllThreadIds.java
@@ -32,9 +32,30 @@
*/
import java.lang.management.*;
+import java.time.Instant;
import java.util.concurrent.Phaser;
+import java.util.function.Supplier;
public class AllThreadIds {
+ /**
+ * A supplier wrapper for the delayed format printing.
+ * The supplied value will have to be formatted as $s
+ * @param The wrapped type
+ */
+ private static final class ArgWrapper {
+ private final Supplier val;
+
+ public ArgWrapper(Supplier val) {
+ this.val = val;
+ }
+
+ @Override
+ public String toString() {
+ T resolved = val.get();
+ return resolved != null ? resolved.toString() : null;
+ }
+ }
+
final static int DAEMON_THREADS = 20;
final static int USER_THREADS = 5;
final static int ALL_THREADS = DAEMON_THREADS + USER_THREADS;
@@ -47,15 +68,10 @@ public class AllThreadIds {
private static long prevTotalThreadCount = 0;
private static int prevLiveThreadCount = 0;
private static int prevPeakThreadCount = 0;
- private static long curTotalThreadCount = 0;
- private static int curLiveThreadCount = 0;
- private static int curPeakThreadCount = 0;
private static final Phaser startupCheck = new Phaser(ALL_THREADS + 1);
private static void printThreadList() {
- if (!trace) return;
-
long[] list = mbean.getAllThreadIds();
for (int i = 1; i <= list.length; i++) {
System.out.println(i + ": Thread id = " + list[i-1]);
@@ -68,59 +84,13 @@ public class AllThreadIds {
}
}
- private static void fail(String msg) {
- trace = true;
- printThreadList();
- throw new RuntimeException(msg);
- }
-
- private static void checkThreadCount(int numNewThreads,
- int numTerminatedThreads)
- throws Exception {
- prevTotalThreadCount = curTotalThreadCount;
- prevLiveThreadCount = curLiveThreadCount;
- prevPeakThreadCount = curPeakThreadCount;
- curTotalThreadCount = mbean.getTotalStartedThreadCount();
- curLiveThreadCount = mbean.getThreadCount();
- curPeakThreadCount = mbean.getPeakThreadCount();
-
- if ((curLiveThreadCount - prevLiveThreadCount) !=
- (numNewThreads - numTerminatedThreads)) {
- fail("Unexpected number of live threads: " +
- " Prev live = " + prevLiveThreadCount +
- " Current live = " + curLiveThreadCount +
- " Threads added = " + numNewThreads +
- " Threads terminated = " + numTerminatedThreads);
- }
- if (curPeakThreadCount - prevPeakThreadCount != numNewThreads) {
- fail("Unexpected number of peak threads: " +
- " Prev peak = " + prevPeakThreadCount +
- " Current peak = " + curPeakThreadCount +
- " Threads added = " + numNewThreads);
- }
- if (curTotalThreadCount - prevTotalThreadCount != numNewThreads) {
- fail("Unexpected number of total threads: " +
- " Prev Total = " + prevTotalThreadCount +
- " Current Total = " + curTotalThreadCount +
- " Threads added = " + numNewThreads);
- }
- long[] list = mbean.getAllThreadIds();
- if (list.length != curLiveThreadCount) {
- fail("Array length returned by " +
- "getAllThreadIds() = " + list.length +
- " not matched count = " + curLiveThreadCount);
- }
- }
-
- public static void main(String args[]) throws Exception {
- if (args.length > 0 && args[0].equals("trace")) {
- trace = true;
- }
-
- curTotalThreadCount = mbean.getTotalStartedThreadCount();
- curLiveThreadCount = mbean.getThreadCount();
- curPeakThreadCount = mbean.getPeakThreadCount();
+ private static void checkInitialState() throws Exception {
+ updateCounters();
checkThreadCount(0, 0);
+ }
+
+ private static void checkAllThreadsAlive() throws Exception {
+ updateCounters();
// Start all threads and wait to be sure they all are alive
for (int i = 0; i < ALL_THREADS; i++) {
@@ -133,8 +103,9 @@ public class AllThreadIds {
startupCheck.arriveAndAwaitAdvance();
checkThreadCount(ALL_THREADS, 0);
- printThreadList();
-
+ if (trace) {
+ printThreadList();
+ }
// Check mbean now. All threads must appear in getAllThreadIds() list
long[] list = mbean.getAllThreadIds();
@@ -165,6 +136,10 @@ public class AllThreadIds {
if (trace) {
System.out.println();
}
+ }
+
+ private static void checkDaemonThreadsDead() throws Exception {
+ updateCounters();
// Stop daemon threads, wait to be sure they all are dead, and check
// that they disappeared from getAllThreadIds() list
@@ -179,7 +154,7 @@ public class AllThreadIds {
checkThreadCount(0, DAEMON_THREADS);
// Check mbean now
- list = mbean.getAllThreadIds();
+ long[] list = mbean.getAllThreadIds();
for (int i = 0; i < ALL_THREADS; i++) {
long expectedId = allThreads[i].getId();
@@ -208,6 +183,10 @@ public class AllThreadIds {
}
}
}
+ }
+
+ private static void checkAllThreadsDead() throws Exception {
+ updateCounters();
// Stop all threads and wait to be sure they all are dead
for (int i = DAEMON_THREADS; i < ALL_THREADS; i++) {
@@ -219,6 +198,127 @@ public class AllThreadIds {
// and check the thread count
checkThreadCount(0, ALL_THREADS - DAEMON_THREADS);
+ }
+
+ private static void checkThreadCount(int numNewThreads,
+ int numTerminatedThreads)
+ throws Exception {
+
+ checkLiveThreads(numNewThreads, numTerminatedThreads);
+ checkPeakThreads(numNewThreads);
+ checkTotalThreads(numNewThreads);
+ checkThreadIds();
+ }
+
+ private static void checkLiveThreads(int numNewThreads,
+ int numTerminatedThreads)
+ throws InterruptedException {
+ int diff = numNewThreads - numTerminatedThreads;
+
+ waitTillEquals(
+ diff + prevLiveThreadCount,
+ ()->(long)mbean.getThreadCount(),
+ "Unexpected number of live threads: " +
+ " Prev live = %1$d Current live = ${provided} Threads added = %2$d" +
+ " Threads terminated = %3$d",
+ ()->prevLiveThreadCount,
+ ()->numNewThreads,
+ ()->numTerminatedThreads
+ );
+ }
+
+ private static void checkPeakThreads(int numNewThreads)
+ throws InterruptedException {
+
+ waitTillEquals(numNewThreads + prevPeakThreadCount,
+ ()->(long)mbean.getPeakThreadCount(),
+ "Unexpected number of peak threads: " +
+ " Prev peak = %1$d Current peak = ${provided} Threads added = %2$d",
+ ()->prevPeakThreadCount,
+ ()->numNewThreads
+ );
+ }
+
+ private static void checkTotalThreads(int numNewThreads)
+ throws InterruptedException {
+
+ waitTillEquals(numNewThreads + prevTotalThreadCount,
+ ()->mbean.getTotalStartedThreadCount(),
+ "Unexpected number of total threads: " +
+ " Prev Total = %1$d Current Total = ${provided} Threads added = %2$d",
+ ()->prevTotalThreadCount,
+ ()->numNewThreads
+ );
+ }
+
+ private static void checkThreadIds() throws InterruptedException {
+ long[] list = mbean.getAllThreadIds();
+
+ waitTillEquals(
+ list.length,
+ ()->(long)mbean.getThreadCount(),
+ "Array length returned by " +
+ "getAllThreadIds() = %1$d not matched count = ${provided}",
+ ()->list.length
+ );
+ }
+
+ /**
+ * Waits till the expectedVal equals to the retrievedVal.
+ * It will report a status message on the first occasion of the value mismatch
+ * and then, subsequently, when the retrievedVal value changes.
+ * @param expectedVal The value to wait for
+ * @param retrievedVal The supplier of the value to check against the expectedVal
+ * @param msgFormat The formatted message to be printed in case of mismatch
+ * @param msgArgs The parameters to the formatted message
+ * @throws InterruptedException
+ */
+ private static void waitTillEquals(long expectedVal, Supplier retrievedVal,
+ String msgFormat, Supplier
-
-
-The following changes were discovered to be necessary for backward
-compatibility with certain applications (see bug 4474172):
-
-
-
-
The existing JVM entry point JVM_LatestUserDefinedLoader
-(typically used in applications which rely on the 1.1 security
-framework) must skip reflection-related frames in its stack walk:
-specifically all frames associated with subclasses of
-sun.reflect.MethodAccessorImpl and
-sun.reflect.ConstructorAccessorImpl.
-
-
The new reflection implementation can cause class loading to
-occur in previously-unexpected places (namely during reflective
-calls). This can cause class loaders which contain subtle bugs to
-break. In general it is not possible to guarantee complete backward
-bug compatibility, but one kind of bug has been observed more than
-once: the inability of a user-defined loader to handle delegation to
-it for a class it has already loaded. The new reflection
-implementation is predicated on delegation working properly, as it
-loads stub classes into newly-fabricated class loaders of type
-sun.reflect.DelegatingClassLoader, one stub class per loader, to allow
-unloading of the stub classes to occur more quickly. To handle this
-kind of bug, the JVM's internal class lookup mechanism must be
-slightly modified to check for instances of
-sun.reflect.DelegatingClassLoader as the incoming class loader and
-silently traverse the "parent" field once for such loaders before
-entering the bulk of the resolution code. This avoids an upcall to
-Java programming language code which certain loaders can not handle.
-
-
-
-
-
-
-The following JVM entry points may be deleted:
-
-
-
JVM_GetClassFields
-
JVM_GetClassMethods
-
JVM_GetClassConstructors
-
JVM_GetClassField
-
JVM_GetClassMethod
-
JVM_GetClassConstructor
-
JVM_NewInstance
-
JVM_GetField
-
JVM_GetPrimitiveField
-
JVM_SetField
-
JVM_SetPrimitiveField
-
-
-
-
-
-To keep using the previous reflection implementation, licensees should
-not take changes from Sun's JDK 1.4 relating specifically to the
-implementation of reflection in the following classes/methods and
-any associated native code:
-
-
-
java.lang.Class.newInstance0
-
java.lang.Class.getClassLoader0
-
java.lang.Class.getFields
-
java.lang.Class.getMethods
-
java.lang.Class.getDeclaredFields
-
java.lang.Class.getDeclaredMethods
-
java.lang.Class.getFields0
-
java.lang.Class.getMethods0
-
java.lang.Class.getConstructors0
-
java.lang.Class.getField0
-
java.lang.Class.getMethod0
-
java.lang.Class.getConstructor0
-
java.lang.ClassLoader.getCallerClassLoader
-
java.lang.System.getCallerClass
-
java.lang.reflect.AccessibleObject
-
java.lang.reflect.Constructor
-
java.lang.reflect.Field
-
java.lang.reflect.Method
-
java.lang.reflect.Modifier
-
sun.misc.ClassReflector
-
-
-
-
From efeb942f9fbfe6a5f411c026d57e18bb4a6fb3c4 Mon Sep 17 00:00:00 2001
From: Mandy Chung
Date: Fri, 22 May 2015 16:43:39 -0700
Subject: [PATCH 35/78] 8074431: Remove native2ascii tool
Reviewed-by: erikj, alanb, okutsu, mfang, naoto
---
jdk/make/launcher/Launcher-jdk.dev.gmk | 4 -
jdk/src/bsd/doc/man/ja/native2ascii.1 | 24 --
jdk/src/bsd/doc/man/native2ascii.1 | 87 ----
.../share/classes/java/util/Properties.java | 6 +-
.../java/util/prefs/WindowsPreferences.java | 4 +-
.../sun/tools/native2ascii/A2NFilter.java | 144 -------
.../classes/sun/tools/native2ascii/Main.java | 375 ------------------
.../sun/tools/native2ascii/N2AFilter.java | 74 ----
.../resources/MsgNative2ascii.java | 43 --
.../tools/javac/resources/javac.properties | 2 +-
jdk/test/TEST.groups | 2 -
jdk/test/sun/tools/native2ascii/A2N_4630463 | 1 -
.../tools/native2ascii/A2N_4630463.expected | 1 -
jdk/test/sun/tools/native2ascii/A2N_4630971 | 4 -
jdk/test/sun/tools/native2ascii/A2N_4701617 | 11 -
.../tools/native2ascii/A2N_4701617.expected | 11 -
jdk/test/sun/tools/native2ascii/A2N_6247817 | 1 -
jdk/test/sun/tools/native2ascii/N2A_4636448 | 1 -
.../tools/native2ascii/N2A_4636448.expected | 1 -
.../tools/native2ascii/Native2AsciiTests.sh | 129 ------
.../sun/tools/native2ascii/NativeErrors.java | 117 ------
.../sun/tools/native2ascii/Permission.java | 85 ----
.../resources/ImmutableResourceTest.java | 68 ----
jdk/test/sun/tools/native2ascii/test1 | 1 -
jdk/test/sun/tools/native2ascii/test3 | 1 -
jdk/test/tools/launcher/VersionCheck.java | 1 -
26 files changed, 3 insertions(+), 1195 deletions(-)
delete mode 100644 jdk/src/bsd/doc/man/ja/native2ascii.1
delete mode 100644 jdk/src/bsd/doc/man/native2ascii.1
delete mode 100644 jdk/src/jdk.dev/share/classes/sun/tools/native2ascii/A2NFilter.java
delete mode 100644 jdk/src/jdk.dev/share/classes/sun/tools/native2ascii/Main.java
delete mode 100644 jdk/src/jdk.dev/share/classes/sun/tools/native2ascii/N2AFilter.java
delete mode 100644 jdk/src/jdk.dev/share/classes/sun/tools/native2ascii/resources/MsgNative2ascii.java
delete mode 100644 jdk/test/sun/tools/native2ascii/A2N_4630463
delete mode 100644 jdk/test/sun/tools/native2ascii/A2N_4630463.expected
delete mode 100644 jdk/test/sun/tools/native2ascii/A2N_4630971
delete mode 100644 jdk/test/sun/tools/native2ascii/A2N_4701617
delete mode 100644 jdk/test/sun/tools/native2ascii/A2N_4701617.expected
delete mode 100644 jdk/test/sun/tools/native2ascii/A2N_6247817
delete mode 100644 jdk/test/sun/tools/native2ascii/N2A_4636448
delete mode 100644 jdk/test/sun/tools/native2ascii/N2A_4636448.expected
delete mode 100644 jdk/test/sun/tools/native2ascii/Native2AsciiTests.sh
delete mode 100644 jdk/test/sun/tools/native2ascii/NativeErrors.java
delete mode 100644 jdk/test/sun/tools/native2ascii/Permission.java
delete mode 100644 jdk/test/sun/tools/native2ascii/resources/ImmutableResourceTest.java
delete mode 100644 jdk/test/sun/tools/native2ascii/test1
delete mode 100644 jdk/test/sun/tools/native2ascii/test3
diff --git a/jdk/make/launcher/Launcher-jdk.dev.gmk b/jdk/make/launcher/Launcher-jdk.dev.gmk
index 7d3781707cb..5c01b4fb498 100644
--- a/jdk/make/launcher/Launcher-jdk.dev.gmk
+++ b/jdk/make/launcher/Launcher-jdk.dev.gmk
@@ -32,7 +32,3 @@ $(eval $(call SetupLauncher,jdeps, \
$(eval $(call SetupLauncher,jimage,\
-DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "jdk.tools.jimage.Main"$(COMMA) }'))
-
-$(eval $(call SetupLauncher,native2ascii, \
- -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.tools.native2ascii.Main"$(COMMA) }'))
-
diff --git a/jdk/src/bsd/doc/man/ja/native2ascii.1 b/jdk/src/bsd/doc/man/ja/native2ascii.1
deleted file mode 100644
index c7232ea9b2f..00000000000
--- a/jdk/src/bsd/doc/man/ja/native2ascii.1
+++ /dev/null
@@ -1,24 +0,0 @@
-." Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
-." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-."
-." This code is free software; you can redistribute it and/or modify it
-." under the terms of the GNU General Public License version 2 only, as
-." published by the Free Software Foundation.
-."
-." This code is distributed in the hope that it will be useful, but WITHOUT
-." ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-." FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-." version 2 for more details (a copy is included in the LICENSE file that
-." accompanied this code).
-."
-." You should have received a copy of the GNU General Public License version
-." 2 along with this work; if not, write to the Free Software Foundation,
-." Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-."
-." Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-." or visit www.oracle.com if you need additional information or have any
-." questions.
-."
-.TH native2ascii 1 "07 May 2011"
-
-.LP
diff --git a/jdk/src/bsd/doc/man/native2ascii.1 b/jdk/src/bsd/doc/man/native2ascii.1
deleted file mode 100644
index 7e7ec7cfaa9..00000000000
--- a/jdk/src/bsd/doc/man/native2ascii.1
+++ /dev/null
@@ -1,87 +0,0 @@
-'\" t
-.\" Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
-.\"
-.\" DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-.\"
-.\" This code is free software; you can redistribute it and/or modify it
-.\" under the terms of the GNU General Public License version 2 only, as
-.\" published by the Free Software Foundation.
-.\"
-.\" This code is distributed in the hope that it will be useful, but WITHOUT
-.\" ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-.\" FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-.\" version 2 for more details (a copy is included in the LICENSE file that
-.\" accompanied this code).
-.\"
-.\" You should have received a copy of the GNU General Public License version
-.\" 2 along with this work; if not, write to the Free Software Foundation,
-.\" Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-.\"
-.\" Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-.\" or visit www.oracle.com if you need additional information or have any
-.\" questions.
-.\"
-.\" Arch: generic
-.\" Software: JDK 8
-.\" Date: 21 November 2013
-.\" SectDesc: Internationalization Tools
-.\" Title: native2ascii.1
-.\"
-.if n .pl 99999
-.TH native2ascii 1 "21 November 2013" "JDK 8" "Internationalization Tools"
-.\" -----------------------------------------------------------------
-.\" * Define some portability stuff
-.\" -----------------------------------------------------------------
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.\" http://bugs.debian.org/507673
-.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.ie \n(.g .ds Aq \(aq
-.el .ds Aq '
-.\" -----------------------------------------------------------------
-.\" * set default formatting
-.\" -----------------------------------------------------------------
-.\" disable hyphenation
-.nh
-.\" disable justification (adjust text to left margin only)
-.ad l
-.\" -----------------------------------------------------------------
-.\" * MAIN CONTENT STARTS HERE *
-.\" -----------------------------------------------------------------
-
-.SH NAME
-native2ascii \- Creates localizable applications by converting a file with characters in any supported character encoding to one with ASCII and/or Unicode escapes or vice versa\&.
-.SH SYNOPSIS
-.sp
-.nf
-
-\fBnative2ascii\fR [ \fIinputfile\fR ] [ \fIoutputfile\fR ]
-.fi
-.sp
-.TP
-\fIinputfile\fR
-The encoded file to be converted to ASCII\&.
-.TP
-\fIoutputfile\fR
-The converted ASCII file\&.
-.SH DESCRIPTION
-The \f3native2ascii\fR command converts encoded files supported by the Java Runtime Environment (JRE) to files encoded in ASCII, using Unicode escapes (\f3\eu\fR\fIxxxx\fR) notation for all characters that are not part of the ASCII character set\&. This process is required for properties files that contain characters not in ISO-8859-1 character sets\&. The tool can also perform the reverse conversion\&.
-.PP
-If the \f3outputfile\fR value is omitted, then standard output is used for output\&. If, in addition, the \f3inputfile\fR value is omitted, then standard input is used for input\&.
-.SH OPTIONS
-.TP
--reverse
-.br
-Perform the reverse operation: Converts a file encoded in ISO-8859-1 with Unicode escapes to a file in any character encoding supported by the JRE\&.
-.TP
--encoding \fIencoding_name\fR
-.br
-Specifies the name of the character encoding to be used by the conversion procedure\&. If this option is not present, then the default character encoding (as determined by the \f3java\&.nio\&.charset\&.Charset\&.defaultCharset\fR method) is used\&. The \f3encoding_name\fR string must be the name of a character encoding that is supported by the JRE\&. See Supported Encodings at http://docs\&.oracle\&.com/javase/8/docs/technotes/guides/intl/encoding\&.doc\&.html
-.TP
--J\fIoption\fR
-.br
-Passes \f3option\fR to the Java Virtual Machine (JVM), where option is one of the options described on the reference page for the Java application launcher\&. For example, \f3-J-Xms48m\fR sets the startup memory to 48 MB\&. See java(1)\&.
-.RE
-.br
-'pl 8.5i
-'bp
diff --git a/jdk/src/java.base/share/classes/java/util/Properties.java b/jdk/src/java.base/share/classes/java/util/Properties.java
index a075da67d1c..0d983e52f96 100644
--- a/jdk/src/java.base/share/classes/java/util/Properties.java
+++ b/jdk/src/java.base/share/classes/java/util/Properties.java
@@ -73,8 +73,7 @@ import jdk.internal.util.xml.PropertiesDefaultHandler;
* Unicode escapes as defined in section 3.3 of
* The Java™ Language Specification;
* only a single 'u' character is allowed in an escape
- * sequence. The native2ascii tool can be used to convert property files to and
- * from other character encodings.
+ * sequence.
*
*
The {@link #loadFromXML(InputStream)} and {@link
* #storeToXML(OutputStream, String, String)} methods load and store properties
@@ -108,9 +107,6 @@ import jdk.internal.util.xml.PropertiesDefaultHandler;
*
@@ -2282,10 +2243,6 @@ public class PolicyFile extends java.security.Policy {
// Stores grant entries in the policy
final List policyEntries;
- // Stores grant entries gotten from identity database
- // Use separate lists to avoid sync on policyEntries
- final List identityPolicyEntries;
-
// Maps aliases to certs
final Map aliasMapping;
@@ -2295,8 +2252,6 @@ public class PolicyFile extends java.security.Policy {
PolicyInfo(int numCaches) {
policyEntries = new ArrayList<>();
- identityPolicyEntries =
- Collections.synchronizedList(new ArrayList(2));
aliasMapping = Collections.synchronizedMap(new HashMap<>(11));
pdMapping = new ProtectionDomainCache[numCaches];
diff --git a/jdk/src/java.base/share/conf/security/java.security b/jdk/src/java.base/share/conf/security/java.security
index be33f832a36..0f1fe1f5e27 100644
--- a/jdk/src/java.base/share/conf/security/java.security
+++ b/jdk/src/java.base/share/conf/security/java.security
@@ -179,7 +179,8 @@ policy.allowSystemProperty=true
# whether or not we look into the IdentityScope for trusted Identities
# when encountering a 1.1 signed JAR file. If the identity is found
-# and is trusted, we grant it AllPermission.
+# and is trusted, we grant it AllPermission. Note: the default policy
+# provider (sun.security.provider.PolicyFile) does not support this property.
policy.ignoreIdentityScope=false
#
From b013ddda1d2f6b3ce1f12e2710e67a47f542ceab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Per=20Lid=C3=A9n?=
Date: Mon, 25 May 2015 09:13:41 +0200
Subject: [PATCH 38/78] 8080930: SA changes broke bootcycle-images builds
Reviewed-by: sla, brutisso
---
hotspot/make/sa.files | 2 ++
1 file changed, 2 insertions(+)
diff --git a/hotspot/make/sa.files b/hotspot/make/sa.files
index 1c73c21c465..a39dc1c98e9 100644
--- a/hotspot/make/sa.files
+++ b/hotspot/make/sa.files
@@ -79,8 +79,10 @@ $(AGENT_SRC_DIR)/sun/jvm/hotspot/debugger/windbg/x86/*.java \
$(AGENT_SRC_DIR)/sun/jvm/hotspot/debugger/windows/x86/*.java \
$(AGENT_SRC_DIR)/sun/jvm/hotspot/debugger/windows/amd64/*.java \
$(AGENT_SRC_DIR)/sun/jvm/hotspot/debugger/x86/*.java \
+$(AGENT_SRC_DIR)/sun/jvm/hotspot/gc/cms/*.java \
$(AGENT_SRC_DIR)/sun/jvm/hotspot/gc/g1/*.java \
$(AGENT_SRC_DIR)/sun/jvm/hotspot/gc/parallel/*.java \
+$(AGENT_SRC_DIR)/sun/jvm/hotspot/gc/serial/*.java \
$(AGENT_SRC_DIR)/sun/jvm/hotspot/gc/shared/*.java \
$(AGENT_SRC_DIR)/sun/jvm/hotspot/interpreter/*.java \
$(AGENT_SRC_DIR)/sun/jvm/hotspot/jdi/*.java \
From 6b7bbd4884767e23093635b3c165737e7a89ec91 Mon Sep 17 00:00:00 2001
From: Artem Smotrakov
Date: Mon, 25 May 2015 11:47:41 +0300
Subject: [PATCH 39/78] 8050374: More Signature tests
Reviewed-by: valeriep
---
jdk/test/java/security/Signature/Offsets.java | 251 ++++++++++++++++++
.../java/security/SignedObject/Chain.java | 216 +++++++++++++++
jdk/test/java/security/SignedObject/Copy.java | 123 +++++++++
.../sun/security/ec/SignatureOffsets.java | 52 ++++
.../sun/security/ec/SignedObjectChain.java | 57 ++++
.../sun/security/mscapi/SignatureOffsets.java | 53 ++++
.../security/mscapi/SignedObjectChain.java | 58 ++++
.../sun/security/rsa/SignatureOffsets.java | 53 ++++
.../sun/security/rsa/SignedObjectChain.java | 59 ++++
.../security/ssl/rsa/SignatureOffsets.java | 50 ++++
.../security/ssl/rsa/SignedObjectChain.java | 56 ++++
11 files changed, 1028 insertions(+)
create mode 100644 jdk/test/java/security/Signature/Offsets.java
create mode 100644 jdk/test/java/security/SignedObject/Chain.java
create mode 100644 jdk/test/java/security/SignedObject/Copy.java
create mode 100644 jdk/test/sun/security/ec/SignatureOffsets.java
create mode 100644 jdk/test/sun/security/ec/SignedObjectChain.java
create mode 100644 jdk/test/sun/security/mscapi/SignatureOffsets.java
create mode 100644 jdk/test/sun/security/mscapi/SignedObjectChain.java
create mode 100644 jdk/test/sun/security/rsa/SignatureOffsets.java
create mode 100644 jdk/test/sun/security/rsa/SignedObjectChain.java
create mode 100644 jdk/test/sun/security/ssl/rsa/SignatureOffsets.java
create mode 100644 jdk/test/sun/security/ssl/rsa/SignedObjectChain.java
diff --git a/jdk/test/java/security/Signature/Offsets.java b/jdk/test/java/security/Signature/Offsets.java
new file mode 100644
index 00000000000..9e71690ea4f
--- /dev/null
+++ b/jdk/test/java/security/Signature/Offsets.java
@@ -0,0 +1,251 @@
+/*
+ * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.security.InvalidKeyException;
+import java.security.KeyPair;
+import java.security.KeyPairGenerator;
+import java.security.NoSuchAlgorithmException;
+import java.security.NoSuchProviderException;
+import java.security.PrivateKey;
+import java.security.PublicKey;
+import java.security.Signature;
+import java.security.SignatureException;
+import jdk.testlibrary.RandomFactory;
+
+/*
+ * @test
+ * @bug 8050374
+ * @key randomness
+ * @summary This test validates signature verification
+ * Signature.verify(byte[], int, int). The test uses RandomFactory to
+ * get random set of clear text data to sign. After the signature
+ * generation, the test tries to verify signature with the above API
+ * and passing in different signature offset (0, 33, 66, 99).
+ * @library /lib/testlibrary
+ * @run main Offsets SUN NONEwithDSA
+ * @run main Offsets SUN SHA1withDSA
+ * @run main Offsets SUN SHA224withDSA
+ * @run main Offsets SUN SHA256withDSA
+ */
+public class Offsets {
+
+ private final int size;
+ private final byte[] cleartext;
+ private final PublicKey pubkey;
+ private final Signature signature;
+ private final byte[] signed;
+
+ private Offsets(Signature signature, PublicKey pubkey, PrivateKey privkey,
+ int size, byte[] cleartext) throws InvalidKeyException,
+ SignatureException {
+ this.pubkey = pubkey;
+ this.signature = signature;
+ this.size = size;
+ this.cleartext = cleartext;
+
+ signature.initSign(privkey);
+ signature.update(cleartext, 0, size);
+ signed = signature.sign();
+ }
+
+ int getDataSize() {
+ return size;
+ }
+
+ int getSignatureLength() {
+ return signed.length;
+ }
+
+ byte[] shiftSignData(int offset) {
+ byte[] testSignData = new byte[offset + signed.length];
+ System.arraycopy(signed, 0, testSignData, offset,
+ signed.length);
+ return testSignData;
+ }
+
+ boolean verifySignature(byte[] sigData, int sigOffset, int sigLength,
+ int updateOffset, int updateLength)
+ throws InvalidKeyException, SignatureException {
+ signature.initVerify(pubkey);
+ signature.update(cleartext, updateOffset, updateLength);
+ return signature.verify(sigData, sigOffset, sigLength);
+ }
+
+ static Offsets init(String provider, String algorithm)
+ throws NoSuchAlgorithmException, NoSuchProviderException,
+ InvalidKeyException, SignatureException {
+ // fill the cleartext data with random bytes
+ byte[] cleartext = new byte[100];
+ RandomFactory.getRandom().nextBytes(cleartext);
+
+ // NONEwith requires input to be of 20 bytes
+ int size = algorithm.contains("NONEwith") ? 20 : 100;
+
+ // create signature instance
+ Signature signature = Signature.getInstance(algorithm, provider);
+
+ String keyAlgo;
+ if (algorithm.contains("RSA")) {
+ keyAlgo = "RSA";
+ } else if (algorithm.contains("ECDSA")) {
+ keyAlgo = "EC";
+ } else if (algorithm.contains("DSA")) {
+ keyAlgo = "DSA";
+ } else {
+ throw new RuntimeException("Test doesn't support this signature "
+ + "algorithm: " + algorithm);
+ }
+
+ KeyPairGenerator kpg = KeyPairGenerator.getInstance(keyAlgo, provider);
+ KeyPair kp = kpg.generateKeyPair();
+ PublicKey pubkey = kp.getPublic();
+ PrivateKey privkey = kp.getPrivate();
+
+ return new Offsets(signature, pubkey, privkey, size, cleartext);
+ }
+
+ public static void main(String[] args) throws NoSuchAlgorithmException,
+ InvalidKeyException, SignatureException {
+ if (args.length < 2) {
+ throw new RuntimeException("Wrong parameters");
+ }
+
+ boolean result = true;
+ try {
+ Offsets test = init(args[0], args[1]);
+
+ // We are trying 3 different offsets, data size has nothing to do
+ // with signature length
+ for (int chunk = 3; chunk > 0; chunk--) {
+ int signOffset = test.getDataSize() / chunk;
+
+ System.out.println("Running test with offset " + signOffset);
+ byte[] signData = test.shiftSignData(signOffset);
+
+ boolean success = test.verifySignature(signData, signOffset,
+ test.getSignatureLength(), 0, test.getDataSize());
+
+ if (success) {
+ System.out.println("Successfully verified with offset "
+ + signOffset);
+ } else {
+ System.out.println("Verification failed with offset "
+ + signOffset);
+ result = false;
+ }
+ }
+
+ // save signature to offset 0
+ byte[] signData = test.shiftSignData(0);
+
+ // Negative tests
+
+ // Test signature offset 0.
+ // Wrong test data will be passed to update,
+ // so signature verification should fail.
+ for (int chunk = 3; chunk > 0; chunk--) {
+ int dataOffset = (test.getDataSize() - 1) / chunk;
+ boolean success;
+ try {
+ success = test.verifySignature(signData, 0,
+ test.getSignatureLength(), dataOffset,
+ (test.getDataSize() - dataOffset));
+ } catch (SignatureException e) {
+ // Since we are trying different data size, it can throw
+ // SignatureException
+ success = false;
+ }
+
+ if (!success) {
+ System.out.println("Signature verification failed "
+ + "as expected, with data offset " + dataOffset
+ + " and length "
+ + (test.getDataSize() - dataOffset));
+ } else {
+ System.out.println("Signature verification "
+ + "should not succeed, with data offset "
+ + dataOffset + " and length "
+ + (test.getDataSize() - dataOffset));
+ result = false;
+ }
+ }
+
+ // Tests with manipulating offset and length
+ result &= Offsets.checkFailure(test, signData, -1,
+ test.getSignatureLength());
+
+ result &= Offsets.checkFailure(test, signData, 0,
+ test.getSignatureLength() - 1);
+
+ result &= Offsets.checkFailure(test, signData,
+ test.getSignatureLength() + 1, test.getSignatureLength());
+
+ result &= Offsets.checkFailure(test, signData, 0,
+ test.getSignatureLength() + 1);
+
+ result &= Offsets.checkFailure(test, signData, 0, 0);
+
+ result &= Offsets.checkFailure(test, signData, 0, -1);
+
+ result &= Offsets.checkFailure(test, signData,
+ 2147483646, test.getSignatureLength());
+
+ result &= Offsets.checkFailure(test, null, 0,
+ test.getSignatureLength());
+ } catch (NoSuchProviderException nspe) {
+ System.out.println("No such provider: " + nspe);
+ }
+
+ if (!result) {
+ throw new RuntimeException("Some test cases failed");
+ }
+ }
+
+ static boolean checkFailure(Offsets test, byte[] signData, int offset,
+ int length) {
+ boolean success;
+ try {
+ success = test.verifySignature(signData, offset, length, 0,
+ test.getDataSize());
+ } catch (IllegalArgumentException | SignatureException e) {
+ System.out.println("Expected exception: " + e);
+ success = false;
+ } catch (InvalidKeyException e) {
+ System.out.println("Unexpected exception: " + e);
+ return false;
+ }
+
+ if (!success) {
+ System.out.println("Signature verification failed as expected, "
+ + "with signature offset " + offset + " and length "
+ + length);
+ return true;
+ } else {
+ System.out.println("Signature verification should not succeed, "
+ + "with signature offset " + offset + " and length "
+ + length);
+ return false;
+ }
+ }
+
+}
diff --git a/jdk/test/java/security/SignedObject/Chain.java b/jdk/test/java/security/SignedObject/Chain.java
new file mode 100644
index 00000000000..e6c423cbb02
--- /dev/null
+++ b/jdk/test/java/security/SignedObject/Chain.java
@@ -0,0 +1,216 @@
+/*
+ * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.security.Signature;
+import java.security.SignedObject;
+import java.security.KeyPairGenerator;
+import java.security.KeyPair;
+import java.security.NoSuchProviderException;
+import java.security.PrivateKey;
+import java.security.PublicKey;
+import java.util.Arrays;
+
+/*
+ * @test
+ * @bug 8050374
+ * @summary Verify a chain of signed objects
+ */
+public class Chain {
+
+ static enum KeyAlg {
+ RSA("RSA"),
+ DSA("DSA"),
+ EC("EC");
+
+ final String name;
+
+ KeyAlg(String alg) {
+ this.name = alg;
+ }
+ }
+
+ static enum Provider {
+ Default("default"),
+ SunRsaSign("SunRsaSign"),
+ Sun("SUN"),
+ SunEC("SunEC"),
+ SunJSSE("SunJSSE"),
+ SunMSCAPI("SunMSCAPI");
+
+ final String name;
+
+ Provider(String name) {
+ this.name = name;
+ }
+ }
+
+ static enum SigAlg {
+ MD2withRSA("MD2withRSA"),
+ MD5withRSA("md5withRSA"),
+
+ SHA1withDSA("SHA1withDSA"),
+ SHA224withDSA("SHA224withDSA"),
+ SHA256withDSA("SHA256withDSA"),
+
+ SHA1withRSA("Sha1withrSA"),
+ SHA224withRSA("SHA224withRSA"),
+ SHA256withRSA("SHA256withRSA"),
+ SHA384withRSA("SHA384withRSA"),
+ SHA512withRSA("SHA512withRSA"),
+
+ SHA1withECDSA("SHA1withECDSA"),
+ SHA256withECDSA("SHA256withECDSA"),
+ SHA224withECDSA("SHA224withECDSA"),
+ SHA384withECDSA("SHA384withECDSA"),
+ SHA512withECDSA("SHA512withECDSA"),
+
+ MD5andSHA1withRSA("MD5andSHA1withRSA");
+
+ final String name;
+
+ SigAlg(String name) {
+ this.name = name;
+ }
+ }
+
+ static class Test {
+ final Provider provider;
+ final KeyAlg keyAlg;
+ final SigAlg sigAlg;
+
+ Test(SigAlg sigAlg, KeyAlg keyAlg, Provider privider) {
+ this.provider = privider;
+ this.keyAlg = keyAlg;
+ this.sigAlg = sigAlg;
+ }
+ }
+
+ private static final Test[] tests = {
+ new Test(SigAlg.SHA1withDSA, KeyAlg.DSA, Provider.Default),
+ new Test(SigAlg.MD2withRSA, KeyAlg.RSA, Provider.Default),
+ new Test(SigAlg.MD5withRSA, KeyAlg.RSA, Provider.Default),
+ new Test(SigAlg.SHA1withRSA, KeyAlg.RSA, Provider.Default),
+ new Test(SigAlg.SHA1withDSA, KeyAlg.DSA, Provider.Sun),
+ new Test(SigAlg.SHA224withDSA, KeyAlg.DSA, Provider.Sun),
+ new Test(SigAlg.SHA256withDSA, KeyAlg.DSA, Provider.Sun),
+ };
+
+ private static final String str = "to-be-signed";
+ private static final int N = 3;
+
+ public static void main(String argv[]) {
+ boolean result = Arrays.stream(tests).allMatch((test) -> runTest(test));
+ if(result) {
+ System.out.println("All tests passed");
+ } else {
+ throw new RuntimeException("Some tests failed");
+ }
+ }
+
+ static boolean runTest(Test test) {
+ System.out.format("Test: provider = %s, signature algorithm = %s, "
+ + "key algorithm = %s\n",
+ test.provider, test.sigAlg, test.keyAlg);
+ try {
+ // Generate all private/public key pairs
+ PrivateKey[] privKeys = new PrivateKey[N];
+ PublicKey[] pubKeys = new PublicKey[N];
+ PublicKey[] anotherPubKeys = new PublicKey[N];
+ KeyPairGenerator kpg = KeyPairGenerator.getInstance(
+ test.keyAlg.name);
+ for (int j=0; j < N; j++) {
+ KeyPair kp = kpg.genKeyPair();
+ KeyPair anotherKp = kpg.genKeyPair();
+ privKeys[j] = kp.getPrivate();
+ pubKeys[j] = kp.getPublic();
+ anotherPubKeys[j] = anotherKp.getPublic();
+
+ if (Arrays.equals(pubKeys[j].getEncoded(),
+ anotherPubKeys[j].getEncoded())) {
+ System.out.println("Failed: it should not get "
+ + "the same pair of public key");
+ return false;
+ }
+ }
+
+ Signature signature;
+ if (test.provider != Provider.Default) {
+ signature = Signature.getInstance(test.sigAlg.name,
+ test.provider.name);
+ } else {
+ signature = Signature.getInstance(test.sigAlg.name);
+ }
+
+ // Create a chain of signed objects
+ SignedObject[] objects = new SignedObject[N];
+ objects[0] = new SignedObject(str, privKeys[0], signature);
+ for (int j = 1; j < N; j++) {
+ objects[j] = new SignedObject(objects[j - 1], privKeys[j],
+ signature);
+ }
+
+ // Verify the chain
+ int n = objects.length - 1;
+ SignedObject object = objects[n];
+ do {
+ if (!object.verify(pubKeys[n], signature)) {
+ System.out.println("Failed: verification failed, n = " + n);
+ return false;
+ }
+
+ if (object.verify(anotherPubKeys[n], signature)) {
+ System.out.println("Failed: verification should not "
+ + "succeed with wrong public key, n = " + n);
+ return false;
+ }
+
+ object = (SignedObject) object.getObject();
+ n--;
+ } while (n > 0);
+
+ System.out.println("signed data: " + object.getObject());
+ if (!str.equals(object.getObject())) {
+ System.out.println("Failed: signed data is not equal to "
+ + "original one");
+ return false;
+ }
+
+ System.out.println("Test passed");
+ return true;
+ } catch (NoSuchProviderException nspe) {
+ if (test.provider == Provider.SunMSCAPI
+ && !System.getProperty("os.name").startsWith("Windows")) {
+ System.out.println("SunMSCAPI is available only on Windows: "
+ + nspe);
+ return true;
+ }
+ System.out.println("Unexpected exception: " + nspe);
+ return false;
+ } catch (Exception e) {
+ System.out.println("Unexpected exception: " + e);
+ e.printStackTrace(System.out);
+ return false;
+ }
+ }
+}
+
diff --git a/jdk/test/java/security/SignedObject/Copy.java b/jdk/test/java/security/SignedObject/Copy.java
new file mode 100644
index 00000000000..22406ea2a84
--- /dev/null
+++ b/jdk/test/java/security/SignedObject/Copy.java
@@ -0,0 +1,123 @@
+/*
+ * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.io.Serializable;
+import java.security.KeyPair;
+import java.security.KeyPairGenerator;
+import java.security.Signature;
+import java.security.SignedObject;
+
+/*
+ * @test
+ * @bug 8050374
+ * @summary Checks if a signed object is a copy of an original object
+ */
+public class Copy {
+
+ private static final String DSA = "DSA";
+ private static final int KEY_SIZE = 512;
+ private static final int MAGIC = 123;
+
+ public static void main(String args[]) throws Exception {
+ KeyPairGenerator kg = KeyPairGenerator.getInstance(DSA);
+ kg.initialize(KEY_SIZE);
+ KeyPair kp = kg.genKeyPair();
+
+ Signature signature = Signature.getInstance(DSA);
+ Test original = new Test();
+ SignedObject so = new SignedObject(original, kp.getPrivate(),
+ signature);
+ System.out.println("Signature algorithm: " + so.getAlgorithm());
+
+ signature = Signature.getInstance(DSA, "SUN");
+ if (!so.verify(kp.getPublic(), signature)) {
+ throw new RuntimeException("Verification failed");
+ }
+
+ kg = KeyPairGenerator.getInstance(DSA);
+ kg.initialize(KEY_SIZE);
+ kp = kg.genKeyPair();
+
+ if (so.verify(kp.getPublic(), signature)) {
+ throw new RuntimeException("Unexpected success");
+ }
+
+ Object copy = so.getObject();
+ if (!original.equals(copy)) {
+ throw new RuntimeException("Signed object is not equal "
+ + "to original one: " + copy);
+ }
+
+ /*
+ * The signed object is a copy of an original one.
+ * Once the copy is made, further manipulation
+ * of the original object shouldn't has any effect on the copy.
+ */
+ original.set(MAGIC - 1);
+ copy = so.getObject();
+ if (original.equals(copy)) {
+ throw new RuntimeException("Signed object is not a copy "
+ + "of original one: " + copy);
+ }
+
+ System.out.println("Test passed");
+ }
+
+ private static class Test implements Serializable {
+ private int number = MAGIC;
+
+ public int get() {
+ return number;
+ }
+
+ public void set(int magic) {
+ this.number = magic;
+ }
+
+ @Override
+ public int hashCode() {
+ return number;
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (obj == null) {
+ return false;
+ }
+
+ if (!(obj instanceof Test)) {
+ return false;
+ }
+
+ Test other = (Test) obj;
+ return number == other.number;
+ }
+
+ @Override
+ public String toString() {
+ return "" + number;
+ }
+ }
+}
+
+
diff --git a/jdk/test/sun/security/ec/SignatureOffsets.java b/jdk/test/sun/security/ec/SignatureOffsets.java
new file mode 100644
index 00000000000..948923e78ba
--- /dev/null
+++ b/jdk/test/sun/security/ec/SignatureOffsets.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.security.InvalidKeyException;
+import java.security.NoSuchAlgorithmException;
+import java.security.SignatureException;
+
+/*
+ * @test
+ * @bug 8050374
+ * @key randomness
+ * @summary This test validates signature verification
+ * Signature.verify(byte[], int, int). The test uses RandomFactory to
+ * get random set of clear text data to sign. After the signature
+ * generation, the test tries to verify signature with the above API
+ * and passing in different signature offset (0, 33, 66, 99).
+ * @library /lib/testlibrary
+ * @compile ../../../java/security/Signature/Offsets.java
+ * @run main SignatureOffsets SunEC NONEwithECDSA
+ * @run main SignatureOffsets SunEC SHA1withECDSA
+ * @run main SignatureOffsets SunEC SHA256withECDSA
+ * @run main SignatureOffsets SunEC SHA224withECDSA
+ * @run main SignatureOffsets SunEC SHA384withECDSA
+ * @run main SignatureOffsets SunEC SHA512withECDSA
+ */
+public class SignatureOffsets {
+
+ public static void main(String[] args) throws NoSuchAlgorithmException,
+ InvalidKeyException, SignatureException {
+ Offsets.main(args);
+ }
+}
\ No newline at end of file
diff --git a/jdk/test/sun/security/ec/SignedObjectChain.java b/jdk/test/sun/security/ec/SignedObjectChain.java
new file mode 100644
index 00000000000..6e93053a776
--- /dev/null
+++ b/jdk/test/sun/security/ec/SignedObjectChain.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8050374
+ * @compile ../../../java/security/SignedObject/Chain.java
+ * @summary Verify a chain of signed objects
+ */
+public class SignedObjectChain {
+
+ private static class Test extends Chain.Test {
+
+ public Test(Chain.SigAlg sigAlg) {
+ super(sigAlg, Chain.KeyAlg.EC, Chain.Provider.SunEC);
+ }
+ }
+
+ private static final Test[] tests = {
+ new Test(Chain.SigAlg.SHA1withECDSA),
+ new Test(Chain.SigAlg.SHA256withECDSA),
+ new Test(Chain.SigAlg.SHA224withECDSA),
+ new Test(Chain.SigAlg.SHA384withECDSA),
+ new Test(Chain.SigAlg.SHA512withECDSA),
+ };
+
+ public static void main(String argv[]) {
+ boolean resutl = java.util.Arrays.stream(tests).allMatch(
+ (test) -> Chain.runTest(test));
+
+ if(resutl) {
+ System.out.println("All tests passed");
+ } else {
+ throw new RuntimeException("Some tests failed");
+ }
+ }
+}
diff --git a/jdk/test/sun/security/mscapi/SignatureOffsets.java b/jdk/test/sun/security/mscapi/SignatureOffsets.java
new file mode 100644
index 00000000000..34f91fbf9be
--- /dev/null
+++ b/jdk/test/sun/security/mscapi/SignatureOffsets.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.security.InvalidKeyException;
+import java.security.NoSuchAlgorithmException;
+import java.security.SignatureException;
+
+/*
+ * @test
+ * @bug 8050374
+ * @key randomness
+ * @summary This test validates signature verification
+ * Signature.verify(byte[], int, int). The test uses RandomFactory to
+ * get random set of clear text data to sign. After the signature
+ * generation, the test tries to verify signature with the above API
+ * and passing in different signature offset (0, 33, 66, 99).
+ * @library /lib/testlibrary
+ * @compile ../../../java/security/Signature/Offsets.java
+ * @run main SignatureOffsets SunMSCAPI NONEwithRSA
+ * @run main SignatureOffsets SunMSCAPI MD2withRSA
+ * @run main SignatureOffsets SunMSCAPI MD5withRSA
+ * @run main SignatureOffsets SunMSCAPI SHA1withRSA
+ * @run main SignatureOffsets SunMSCAPI SHA256withRSA
+ * @run main SignatureOffsets SunMSCAPI SHA384withRSA
+ * @run main SignatureOffsets SunMSCAPI SHA512withRSA
+ */
+public class SignatureOffsets {
+
+ public static void main(String[] args) throws NoSuchAlgorithmException,
+ InvalidKeyException, SignatureException {
+ Offsets.main(args);
+ }
+}
\ No newline at end of file
diff --git a/jdk/test/sun/security/mscapi/SignedObjectChain.java b/jdk/test/sun/security/mscapi/SignedObjectChain.java
new file mode 100644
index 00000000000..9790daa919b
--- /dev/null
+++ b/jdk/test/sun/security/mscapi/SignedObjectChain.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8050374
+ * @compile ../../../java/security/SignedObject/Chain.java
+ * @summary Verify a chain of signed objects
+ */
+public class SignedObjectChain {
+
+ private static class Test extends Chain.Test {
+
+ public Test(Chain.SigAlg sigAlg) {
+ super(sigAlg, Chain.KeyAlg.RSA, Chain.Provider.SunMSCAPI);
+ }
+ }
+
+ private static final Test[] tests = {
+ new Test(Chain.SigAlg.MD2withRSA),
+ new Test(Chain.SigAlg.MD5withRSA),
+ new Test(Chain.SigAlg.SHA1withRSA),
+ new Test(Chain.SigAlg.SHA256withRSA),
+ new Test(Chain.SigAlg.SHA384withRSA),
+ new Test(Chain.SigAlg.SHA512withRSA),
+ };
+
+ public static void main(String argv[]) {
+ boolean resutl = java.util.Arrays.stream(tests).allMatch(
+ (test) -> Chain.runTest(test));
+
+ if(resutl) {
+ System.out.println("All tests passed");
+ } else {
+ throw new RuntimeException("Some tests failed");
+ }
+ }
+}
diff --git a/jdk/test/sun/security/rsa/SignatureOffsets.java b/jdk/test/sun/security/rsa/SignatureOffsets.java
new file mode 100644
index 00000000000..b813b26d4a5
--- /dev/null
+++ b/jdk/test/sun/security/rsa/SignatureOffsets.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.security.InvalidKeyException;
+import java.security.NoSuchAlgorithmException;
+import java.security.SignatureException;
+
+/*
+ * @test
+ * @bug 8050374
+ * @key randomness
+ * @summary This test validates signature verification
+ * Signature.verify(byte[], int, int). The test uses RandomFactory to
+ * get random set of clear text data to sign. After the signature
+ * generation, the test tries to verify signature with the above API
+ * and passing in different signature offset (0, 33, 66, 99).
+ * @library /lib/testlibrary
+ * @compile ../../../java/security/Signature/Offsets.java
+ * @run main SignatureOffsets SunRsaSign MD2withRSA
+ * @run main SignatureOffsets SunRsaSign MD5withRSA
+ * @run main SignatureOffsets SunRsaSign SHA1withRSA
+ * @run main SignatureOffsets SunRsaSign SHA224withRSA
+ * @run main SignatureOffsets SunRsaSign SHA256withRSA
+ * @run main SignatureOffsets SunRsaSign SHA384withRSA
+ * @run main SignatureOffsets SunRsaSign SHA512withRSA
+ */
+public class SignatureOffsets {
+
+ public static void main(String[] args) throws NoSuchAlgorithmException,
+ InvalidKeyException, SignatureException {
+ Offsets.main(args);
+ }
+}
\ No newline at end of file
diff --git a/jdk/test/sun/security/rsa/SignedObjectChain.java b/jdk/test/sun/security/rsa/SignedObjectChain.java
new file mode 100644
index 00000000000..7bda7cd4df6
--- /dev/null
+++ b/jdk/test/sun/security/rsa/SignedObjectChain.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8050374
+ * @compile ../../../java/security/SignedObject/Chain.java
+ * @summary Verify a chain of signed objects
+ */
+public class SignedObjectChain {
+
+ private static class Test extends Chain.Test {
+
+ public Test(Chain.SigAlg sigAlg) {
+ super(sigAlg, Chain.KeyAlg.RSA, Chain.Provider.SunRsaSign);
+ }
+ }
+
+ private static final Test[] tests = {
+ new Test(Chain.SigAlg.MD2withRSA),
+ new Test(Chain.SigAlg.MD5withRSA),
+ new Test(Chain.SigAlg.SHA1withRSA),
+ new Test(Chain.SigAlg.SHA224withRSA),
+ new Test(Chain.SigAlg.SHA256withRSA),
+ new Test(Chain.SigAlg.SHA384withRSA),
+ new Test(Chain.SigAlg.SHA512withRSA),
+ };
+
+ public static void main(String argv[]) {
+ boolean resutl = java.util.Arrays.stream(tests).allMatch(
+ (test) -> Chain.runTest(test));
+
+ if(resutl) {
+ System.out.println("All tests passed");
+ } else {
+ throw new RuntimeException("Some tests failed");
+ }
+ }
+}
diff --git a/jdk/test/sun/security/ssl/rsa/SignatureOffsets.java b/jdk/test/sun/security/ssl/rsa/SignatureOffsets.java
new file mode 100644
index 00000000000..618dde714d4
--- /dev/null
+++ b/jdk/test/sun/security/ssl/rsa/SignatureOffsets.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.security.InvalidKeyException;
+import java.security.NoSuchAlgorithmException;
+import java.security.SignatureException;
+
+/*
+ * @test
+ * @bug 8050374
+ * @key randomness
+ * @summary This test validates signature verification
+ * Signature.verify(byte[], int, int). The test uses RandomFactory to
+ * get random set of clear text data to sign. After the signature
+ * generation, the test tries to verify signature with the above API
+ * and passing in different signature offset (0, 33, 66, 99).
+ * @library /lib/testlibrary
+ * @compile ../../../../java/security/Signature/Offsets.java
+ * @run main SignatureOffsets SunJSSE MD2withRSA
+ * @run main SignatureOffsets SunJSSE MD5withRSA
+ * @run main SignatureOffsets SunJSSE SHA1withRSA
+ * @run main SignatureOffsets SunJSSE MD5andSHA1withRSA
+ */
+public class SignatureOffsets {
+
+ public static void main(String[] args) throws NoSuchAlgorithmException,
+ InvalidKeyException, SignatureException {
+ Offsets.main(args);
+ }
+}
\ No newline at end of file
diff --git a/jdk/test/sun/security/ssl/rsa/SignedObjectChain.java b/jdk/test/sun/security/ssl/rsa/SignedObjectChain.java
new file mode 100644
index 00000000000..ba4b00c56d8
--- /dev/null
+++ b/jdk/test/sun/security/ssl/rsa/SignedObjectChain.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8050374
+ * @compile ../../../../java/security/SignedObject/Chain.java
+ * @summary Verify a chain of signed objects
+ */
+public class SignedObjectChain {
+
+ private static class Test extends Chain.Test {
+
+ public Test(Chain.SigAlg sigAlg) {
+ super(sigAlg, Chain.KeyAlg.RSA, Chain.Provider.SunJSSE);
+ }
+ }
+
+ private static final Test[] tests = {
+ new Test(Chain.SigAlg.MD2withRSA),
+ new Test(Chain.SigAlg.MD5withRSA),
+ new Test(Chain.SigAlg.SHA1withRSA),
+ new Test(Chain.SigAlg.MD5andSHA1withRSA),
+ };
+
+ public static void main(String argv[]) {
+ boolean resutl = java.util.Arrays.stream(tests).allMatch(
+ (test) -> Chain.runTest(test));
+
+ if(resutl) {
+ System.out.println("All tests passed");
+ } else {
+ throw new RuntimeException("Some tests failed");
+ }
+ }
+}
From 27aac42dc557f13a83642e2dfd9281e4335ecb03 Mon Sep 17 00:00:00 2001
From: Katja Kantserova
Date: Mon, 25 May 2015 14:08:21 +0200
Subject: [PATCH 40/78] 8080833: JDK-8076524 has failed to remove binary files
Reviewed-by: sla
---
jdk/test/sun/tools/jhat/hprof.bin | Bin 282310 -> 0 bytes
jdk/test/sun/tools/jhat/jmap.bin | Bin 1732977 -> 0 bytes
jdk/test/sun/tools/jhat/minimal.bin | Bin 66153 -> 0 bytes
3 files changed, 0 insertions(+), 0 deletions(-)
delete mode 100644 jdk/test/sun/tools/jhat/hprof.bin
delete mode 100644 jdk/test/sun/tools/jhat/jmap.bin
delete mode 100644 jdk/test/sun/tools/jhat/minimal.bin
diff --git a/jdk/test/sun/tools/jhat/hprof.bin b/jdk/test/sun/tools/jhat/hprof.bin
deleted file mode 100644
index a8f6f7d3f863c8794d8569221b1619c3e7e4e75c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 282310
zcmb4M2Y6h?)z!)p223%<^kP5;o8m?@9a&mgYpbDRW13j6*4En6uGn3<5PFg5)%4zb
z?j^~~zgEv?OU
ziH7*-N#iGupHznbD$2@YtDQKys(ZDv^5nrtSOHJ0tRiOrIr?(^bAEDRa(p(E8=vY<
z<_qcK_?lc-I^UWu^!F6YZNZUcvB85|4EF3d2@-~J_(!>6=r3k^0PX2Xr;3?ewoui!
zB%A8a=dzhY(_M|pK20?dROMwAhN@hs)&bS9LVtFAZ>EqM-7)Zis72V!eQmQBtn
z(DX+FxS|EFC_uK?N(R`2DvfVjQYfZ-t0rrK#{;*L#jPZ`4S`$P;Iim!9jy&DJ;_3$
zA(uq2)8JD9UfF_I7VvrikMOmv$@TUn^Jo~29QYZ?5f(W@kZS|EijSO{DYm5pmAnb4
zRV->1L2-nv>Q~aJT9YgkGnTR={I;E2v@g+s|z7J=t$kW>N4q`t|5lZ
zz?+~LX(>hu1zU6tUnh*i@pYMOvIiqS&@N8{yoLp@A>b_mUeka>J}8r&7tiN8dP8;|
zYzNPpmS;`j*#JCi`AW2>^S#gkJ)>%pw!uPR*Rt5P1iJ;WYik>na2|?e;O`(=+mfs;
zBzuBnlu^LALghGma;XJ{@zrzSk1$^M=}-5kyOej#S2e-oD*nN1!9U9Kj}rbd;9tkD
zAgzospN4Bnr446Q1LSC$6+p9&rCCR4HU-VPK22+XwwUQnx6oXLLa0Ok0)lld!MZ{)
z2?Xmcqn@p4ILmx8TckQ>7SK9f1NA39T;ElWy)W_VpLriWqghT8~YD-oTgiNRff-^k)O53VMqB!L^Cy+C;eMDK_=F%uLaS
z0hTW53?Bi-rj}w;p`be*?NbE$aHRXL0fy0*VYD#p4~ESQLwJ-0re`-Yj5q7(>q^4z
zRo>KHGB3O~sDkj#tnkf5I4!WbuRc2`26Q@Kn=B?9&>-1>tGON&n_G&_g@UeT3qw&z
zV_}ggE*am(|C1hK7Ca3kTUe4Ugk*h?RQX0wt1jI{pVpp;ZE97av1cXI5Da$$l)-
zV43*hqEaB}GS3Fj7|Sz8cy<8Kmc9zg+rf9*6;pk((2bQ}75~QJ6P9T0t^@0qmUT;E
z-3hE){eM}5UH1X-Ze@A565c7`9b1yu^UXn@)s)N5O=j|R(OTmx!93P7j}_+4!931q
zR!vbA@9irt2`w_V2FEzdF-|x*NVhf|W+j!#rnsyrX6E#Gy#oC#J1=b}L#@wN;M&@9
zZ7p0IgKHZ-l?A4A1s`||@NF!78-a6xZtJ>-w~}tl%)?|JU7!pu0mHVIVOwF~I%_+>
zGTyRK%e@Pz?JR0LL9GSUcqiABs6c~@0UB>X;|0WFFu@n4IEr_E;IsyR1i|)}V0$4L1r2r(4Y=sZ^`wJ?|2Kf`U|~B5j7$F=
zeYpv^z$7}W7WWQtJ6hb1g4-6joeVDQyh{v2#Wr|3*mkmPI|kmao^&tPL#i?Z
zAAw*OOR$R&aBA6g83aN79|py)mSR_-7z2vkT%VqfZGED-HrV0beTr5v@&EE%h4~yMHupGsE
z8Y~7;d~sif*qS7!B?TQ^0O+0;x~D+50(36}HT{Y6OpzVYbG`9we=j;_sQK0g(O#Bl
zFCn5A-`gjOc=1sDVmvtZwj6s4$0%@A)BI))TNvNiHfi#XlXV@Y16FNe)dJfFu&Jd*
zx26}S5s@jm$sL>kvZrDCT4SL#0%ZrR_4R1T
zWEZ5nWCoAS-dRx8T8dhspc9W93Nw$@_2iO)j{gNfaSMtIh+U`7mn*xZPzYk+U0~}h
zwob70ztendq6;GpD=MqCuJSQ}PqXl80_R$+-q$yo&E|?`Sv|hm{a;P8B1q~jNxhJa
z0ZC#xB*DS^ThJsdO+sim>ZThSjDqMkVOL}S}hn(M&qaZ1@sT4A38-`GtEVfCo
zTpu+XYwY`Q-0<6WtS_H-r$36ze=E-EYpUep&
zvbY(X5AZ$~ypMo6QMLLqJ?~hBFj6{^Eu^!Bj2Evg70UVve65zRRrom0+7w@RE*}_Y
z-vHERL2Uw}i)%L^xAADnXBMIs^U?_Sgm#mItAV54ac$R?K`}TF<=C*itVFsb;(9Aq|
zEU^1p?7o8Kj%l{hTL&jpkQ^-;nylu4XSU^;Ej;u#`xzeN9YdopT9NHRvY#c{Pe>T8
z-QOw0xj8b+4(zTfMu9!>ZddAO%;~HOLPkJk8=2@C~LPK+Ot6J3Kd?SZQTC%5SNmH^n
zEp}1*49);iw7)dH}&_<30Ps^OQ13ql@SyN?R+0q)04}lLtSCu4glv{
z;CumcQLw=EAk;XxH_HLDz+x5%hIQ>xb&WKAbx#H}PoU}d22qbC>JcIiz+MrKDX*!$
z^puwYxYvSv1x!O_{VIE>9?HA}e*!9NQCUH8UzrP|f-dG!;Bpq16C8VKAM0#_T3(c|
zA%|T=TPUnI@Co337Tzatn)wi^X)BIr0&O~Y9x#Vk%proIhspb@qJMj59#~9yA$eWd
zC&7@n40&M~1%`spFg1t0cQSCE^ci3U3o8hW?xCpKw+^RKc378+lJ5zQqU9(G2RmfH
z5pCRK$vJ#w0Q)VlUx3_SEGz*Gw$UE|U1*^T1xkZ0@~dlh$j#W_%Shx^F^SKwCE!R%}L~_q0qthdK~zpEdD6Lv%QY?@t!Zj;Z!oPDXs5#)(g!-q=z~+haExU*Mi}VQjx`KiJ#q=toDcbz1Asf$;*J&EuD~5i{IN|0fINs^xRv6yepv2TZ3na%|lH-MhZ8~5`+ybfO
z+Gwy0=mCo!5H!c~pze!}$$6R7P^ZqXfMU>63#HUMe+Kjf
z3q3)goZ3z-2@Q6qCjdUtf=?7M_X8)n@#jLvI4o47C^%8y4W5%M&q=~F3OpzKO4x%~
z-FW*0cCv+?EHG~VPVr$zrUDJz0?;WIbc%o|>(me^SXG9HPqna91vUn-(^yp-(u%Al
zB0HZN(41yzP7@kV&!-#dTnJ}+5H3z+OP;Ez+
z&af0`2nBomnaiXIT7whznU>^CA>lINEJI?3WH>_gA7IY1n6m`K);il@%f_JA;7^(J_YzW7JiPvDf?U>uDf&~N|FcoTnj!|
zz?6NS0i&Vyc}TdI4&DIxc@}=2z}ZUYYo~z4l#NWuMW?_4Ya>X`wiG@pf0ee3j{?sePI|CG}qI>U1)I^3XT)RMS6r_GVMvz&Bt+y7jpEiV7SOKTqF#f
z&M)>Q!;R$@g*ONE9~WET#R8=NyQBm#s5RHwmssc}0%cFW)Q2`Ei`~jXgZ02%YB84z
zh5>}j3`R|b(Z%w)z+PstmkE}0#pS*{8NuFWP)Qzm3Fyl$`f@?DS6!iO>;={lb&42x
zAHc7$@GAsPJ6-7u_vVS(bg<3?_X2vQgS%ouk3oxxij!u~!L}J?d&|ZT2K>
zxw*xNvn&VhYKyyCaJ*h~jUEJQmF9cAA!f?KW>8*ZDX$Sq&REx)YPhM|!^4FZ^SK`W
zNiPnB5P95qt>w8^cvz+Dd`rrm7}bD-M*w%7#a$;jcJb@Qj0ierOWeoV3Bc>16(+%8%7Wbgw
zxZr%q;LO0N#x1Sx-gGgOawAN)_79+V$WlBc6tvjGK81JWqfuM{J#0}A3yKQ=HjE0+
z=g$E5TZ{Xx;5bkH&N-LqIQef%mpJY}6WHHb?C%82!?j0znF(CrpNFUl?(HK)iUmJb
zGNtZ1Gcxjs<$6T8MuF@1hRcoRPkD)E%I?e(rr9pWU^c1XucST!gA;KgvC4|7!Kb*`pwhS-_z5Q!wj0vmu!~r
z!SP4S@kilcNcc%@-;Qh{IX4}+85Rzd{tHA;TB0X~h%2$DTm^zx_p5f+Ha`RKr!4#_
zfz#DL?ZII>1}&q9R|f+4v;{sbK+64-Yh5>amY91_0{l-F{wIMmV)cxXYr197YYsdQ
z$TJr5j6mqE|Lj8ow;^;rdjbBl1^-#Vtmj`0*!T}t)Lau)z=6*J{EG$tMSzt0tPjL+
z@MmNVejMOuE%;f0FZ!+ww?qMc&R03*u3?V%B1Z7qyd7@J@_n8wK=Pa=c}_^ifaLk*
zkQj&LXc%C5-qJiTG<0My7#cg-xs8Iuoe$g#7WabSb^-3M%MdRUU-S;WuG!U~{;Q?_
zt5A;w_1_G&UB+nyk3Iip5q}c|hwFk?8Tc!BUbZ|h3lFc4zp{LuV0Gy0Ua?HC2-6ra
zy&7QhJEZr{0UeUIWF=@`wKT5^4dW3Xq<^8+RfZR1UbEQO1j|*#>u&5%H@Dh6
zi)gWj0s6XyzAjMO^Y6Y`XHV~PPrA#$o99%x9Xx-xJbxD++VhR&^91e5HR~Ie=?!7x
z%JUzk=8h_JQHuwvqRLxLS{vibHU;i|!U|a1X%$wBUaVn9~0xV2Nf2
zm!XbeGZ6gC68uXD=-A#A0>oEfxU)|eo1N>bJe^=mR0DsR{%5Cht%bDiR
zuy-}n)omTnyk}|N6B7UNX&sl|LM7`l|tv_lJBG|@u$0KsRL
z;4>lMM(K0k0KHRQhdSNAx;~zOY1J2ocBem%jMg
zjJXJxG_R^SB>T#j7Wt({ekIll9SI6@a8n?^vdFIl$<6K82I(yic?Gd4SM-j6)m}?j
z26$WjYs>Pruy9`d#@AdfJ9{sM33PB2px;>NHv;95`qqb`M
z$h`fN`Pk#`xZ#&$l;F@kStjwa8xu3Eg95rI5klkHe-|nTL(x|9R~WhZ&0njBQS%mAwWK
zu!zMh4*$o)LEBh)6c?0;%K))*i!2u;nkP0)w6#kRC2sIgfQDJnFacq##LOoGyf(G3
zoVR#K0M4#=09s+86#_+fidFiWVxTwA#k~c*bRU_C9tFPA;wuG@AZu)eq4B{Q&oHLz*ad5c_d(0%11fY-F(
zH3iI`wiZR2j>fC2dAz#q-%4=`UkLPC7QL3Bu@Z}|ZA6#or~ZkdBWVN4+LmN(A=wQi
zqe`~i^4~Gm_1gmEqb&I-AxA(jwvO&t!7H&g4kro@yb6wWEXO*+K?AQ#4tJhsx>#*`
zPCpMK1Uz^;!0TG@x&r2STFqC&hc_*e8&Y*S@5Wv0l-A0K1>q#umG=VA+i~DUA*K
z{Fi~=#G*G5G;6-8Uvss0vaeB#@WJ%}-_*i46*y}?dPsOsKJHeLcp4D#zyme
z2HZTpSdmWUadlkPeDDxpH?!Ey1dAnKY;z;r_0DPixO=XFF#tEWz|93nm%9ap%E)(j
zDN2m~nPAw$GHf9Xbd}zF@!p;XQSzZy<~svlW${&l=g^409Iq8W5wI~9Hb!9h2vTgz
zz;Hyk7mji~KFebd7M8d(S=VxPpxV+>Z7Eb^K(&?MZM*|3bqOa*gZ*!8D@(JL&>-R+
z8*6B2OML4l&}{nwGS))I3WRkZ=Swy+gOQyEz{XkFIDygOZf#&@eEX-c1#h2kZ%MgY
zZwHdCEy>nGg6&*vn~-epgFsc@E9ecGIr-qGY_JHTZ7k6?LPY1ftxv?YQcE{JMUv~q
z%OOUkShPLVp1OEVeJB!{<&|KM$_cdsDpP^C6
z!G0jeTjY2_QtkxZ{msNzV$RwP=m{1*LC~BMCK|bHalS4SIA4(}4|W1P(Sj!mcvXNW
z&G9av2fYKQpGmg(Bq_c!icg+{J5Ir}uc7Q@TXwQ8yFIU%2FqeI9^2lQ-CoMB1l}ER
zwiPV;cNE>h7TrOLjzG~J3w-e{SojST-q9A`Q3_Mvo$%7dykJ?j-%hsdPEwY{JL67z
zGDM6ROKfLbcxNfR3JOo@GOt|*sd0K1n_^2(kz{kD68ce7aUu-aksrVQ+(}5lkNwEKHpGry3?3byeO!=#Sq4yaVvB
zi4Ztj)w}^7+3K3NTwN^?iiphy_-J<4B?g7w9*>!
zeI}=pV?l5>hS=y*E?lPx3&(D~W5LG}bNzYq=A?st)KXTCz1Pz1SyEu!1120y4$K*N
zz|LKSn^tu^IJ_vwKFshWgom@rbn=+#+`aXg=Az0WKL!%pjipmqSdg4mW&~}C!Io}|
z=#Mv}%CT2ix+?*Krv42?
zPM^_a;4&t1*{pYoPh-CXHV$kXiwl;bn~mx0RU)=RN%$9l*I9V8!12AkSc`_cn@Drf
zfaVipLlS-tLUbPX~A=%L|z6n^p(z$S%m@n`A?C
zdO$?HFogRaSr<}urq-@
zn8gLl&e%~J8yp1R0lgp4T?E9+hOPG<+yV!|OoR5_LJl8j!)K+u0`vht011b(bS?`E
zl0Lw^JMMsJMe{+q@hygdgHf~K8cq3umSvW(aAfaWN4%+u~FeCKv%Yy^|1Pj1M?iF$2VCFk6pldq}=V!F*P(>FFAGOLa-`PM0~`Ty#jb}
zBWCH9gotc*y_Am+eLbaWM%w#$na_f_P&sbAEWMgQVc8M?=o*?O#OfcZ`m`&7_GQps
zOD3V^o;p1=EtD%owIZlqu~ccHqSu*gsNk{m2a)(OM{T8*fqot6>j@AvJK;QE5&tHb
zx!LH~Vg$grIkNNymKQKZcl%%)Yb#+|Ty`kOC4;4R5FltSQZqi<7mXEemH)3&hFA@J
z?||orW2W{mU*BPY3DpOH$r2tWXS
z!bm9efra;Kc-Fw(jNv>_5ROPz`F$3i6*xy$E(j0%o*>IGusmd0a+PIUVk>PwMvTAa
zznD$rHnDGaY}Sg{6?x@oy+g*DW!eNb!358K=2ghuRI;}Z*=-!AMGuHev$4Ea*n})9
zZ2EeAWo0qSAu-F8#RmR_q}xR^o)f$!im|XpmIDz&mOZbL|5iwx>-oCiqYMmMm~#S2
zUlDA@vE%l~9>p)%?^PwD^e_}I5P+v2O5cDlNM9>JGA*RxBq5H3MgN1{aD;45HA~oX
z`nZ|8>J=10Ry<;~19gE)WQ1%JyF+Zlko$kEZHB?Bd@Ar%io)#Fi^uLiHIXRQs#?wp
zRt^^l))2A#g@zt&322r_GTf3Z@kz=nL|Go1yls^&hmtGc8Lm~Jxmi`M!owQqBE4K`b7z)U!gm77~vtq>BlR5nLabne6Gu9O{iauDy>Q
zJ5F^O%dgp~D_4U@;}Q0=g@LVl%)E3_16E^N2ym?y&$*m2QXn*h*m
z%h8R#?pWgSNPCXgE%BaeiB-@FtKwM=56)3N=@WrGekkct!vqaK5@2@GvZid9O
zmZ6Y8kJAO8?Y+Dm5y1ckMV!Sl5YYh<_0n6}E}yD)*$C~iF`iBE;LO|8g9CDD;5E*O
zkkM8M$Lvy!*(bn>z`2L#{B#bww(c#g+c|iS$0K8CN3GRoN-G(|qoEZJ!#!3`xaXQB
zTWEN0jtq9hb1gLo$njb>8#>%mZ_%q3U;B%YZizA^y@+K&Iva}OWYDwtib%Xws%qMx=tAWhCH&bULMpD@&Z;>-D?_4b+n@jkc@lf_H=t-wS)WbqR+FN_@
zLr?))cD~z6SYSWB;`dCThw?;{5sJsuvJAHqbb(1F3g9A%S3@qxZQj)&};|MQZ!r{40opRN>b7VOxO~4m1qgw5O!Q^U3MfBp?GXCVz^s^aN4~)
z-=EchotTE_XgpH8M?|lYNW7;j=N|}5Mj9FSTJ0oiH^DFFJb`zG%9_{}tWNPa;&_zi
ze-NeAo>HXIL);etA#@+c!G%rx6@#x~fx($?)dUDz?>6|%!S7I2zA-P%#CNPceK|+G@SZQU~X?6BQ
zM!4huUN_12s!4W3bL@_14?HdwOx+$C>+7M7X}i32H=&)=UI4PYJc5V1{kIHvQnYS+
zBO_vYt=kVux4od#-lCsosRoPGP{iQ2foE`L{{DX-!P@PVh(=8X+dX8&Q*!LpAY+*|
z`cc)W8nu~g}K&z6dlg3UN=F)ALJm;bA|Th??_LsMNu03Q9>{ae*j^)gXmd;
zi-O0NjgMRWp)869O8}2+I3Au=dptA-?JCckY`~3M_4e9|-cGbP(CuPf8*f5T#4$m~rQg6j*n{209epW2?nnfx;3Jgz(;rR0-
z5xXapj3;3C_d$u{YtL?LBJ+>M9DWTeoyTt;)#dUy67sUR>3A|^Qr!bRq0W`9kK#{Z
z^aTtZQD!>jk(i}n*W1dm=eRz*nwvzo@u&Jg(@Vyz!Vf)%!Y`UO4vf}^sEC&
zM3a``-Gl4GS++7S;ji@#vA`MSzP7-SwXIYYnT1;J%bMbus%^%~&}P?JF}L8P>?2)Z
zKU+ZSahSH(3QEju(C>%Gh!T5^0>jH;j~qDe+TY4}8Gku#y;p{nqgLVoTVTk#4p&O-
z4+RduW9lkOaLB#leq|}*JPt(mNqD&Tc?BBW2)^^R1_vP{+_$#ZW>`^aAQR_-&_c&w
zmae1<$-HO^iJD^}=GCz^|G$yj2@pr_t9b0lEq805(MWtP$T;*sJ=ik6hQBgUpV75k
zSyey=YA0%Wu(nka=&&*DNCxi;Tl$*jB5kLV6q~#a63A%TrfdP-pLWn1uBwF3fo3T@f&N6{f6rpwVSYYYRN5A)ZfSpIYq#!`5!(aYlk
zACAO-j|~Dc7VvNUwLNpVlgEnvNB17N8=(4*O%fR+0eRc*1tNWBJ~EFXCkvs^3@^iL
zRJxtkR824srtij+!82dmZ2{0>yWOZ+)>15tKP(U?Q8EsOcgE_;FnY`!NYOhS?41Hru75A-h{j{BSpK=tvW?%v
z_d(^~yW`*QmuSLh3u=d8E3c(yNlY?4(soDd0y$(nfahU6oHOqz!&_3iS=Ls~(t{@H
z#goO8(=0UN-FS}1BO$z}G|MQ(qGQZ`y3jhRkO_K0j0vTRSvCUw2ih#|tRU2|hoB&J
z`T&od6nv%?&Z`1)9Dw%^yirUsA8Ii!m(azg1WkQy*Yc
zdABaGaCu@jP-3{4>c_K?;>3g_!0>TC-PeO3PL;F`koL*gn!wVfgcn{!D2w8;UU;3Zq0(*J&@3A(7QN^@
zR2SMr71E2oK%q@lA-yCzRO|Db68b!-MU7T0T(MA#j-VnyJv^Q#)cM;HiA2?Lc0N%}1IFi3NT2;nqN(;;(F)-WOS0
zA@Q^2$_f%5VF^D|gwN|HIT9HKPM88jboL)CzK<_SG=yJi8<9hZ3Eqgu2lrt=_35Cm9~uZ3eLBCA2eoo;!5#9xVH-=;M?0~uk>KG%XLDZ!^h=ounhvz%E%%w3vgvSMK%
zMP_v#pj~r~Cw`{1NCj66h=>
z{yfAHqk5~k#2tpfbZhgaV+UJfsa4=-{N;-EL(G1!Y73l$jAdG22W5e?QS+sE&cWkG
z*V
zYa%g*vu8yhSsNm&T#kicK2;$VbD+?217PtW65G4i@z7c&D$jnX$wm+qwM#XFrB;<*UV#iADLHJq(m
zn=YjCnLd25G@{!jRyTB>^5JM)F6gVY8kgDvy7e>KygMs3E`j(<@dV6^AzZ#9x`=<3
zQ50kkSxI`xGHyFwMh2FJF4Dvo3CZfnSh*{WTVCnFbu760@)4z6ee~{wUh70JXkAVL
zB!hH@2u?+XzZdCPq?E6cGaurK51G1!n
z0%tW>BQs>fSeaI47p2TqP~vJ)Mpx;Y5-h_s%dU#$8eza+H=Rrb!^mK}?6$w>?%fS5
z^Vtb}eK4I@L6fxrT*Ln$MPwXZi<)D)FCWQr=p>&&lfcg7I%I?`5YT-$rTewe`8v^G
zEKe`9CYr;4%iT3fEwa|K)e6?bd_F_ElFRZb{I}fQjere6wsu<@pZN9$)DSl$uctbc
z%i^fp-C8&J1!UaB9?}JFR0ZUAqMNwryhgFMp`XDLYwV5ub^bq94)Fx0pqnU+
zgm|Pb`aaXr-BsgUkA}Gc&y9Fo%oVeA`MSPY3y}_TGdjp&c<5-?g}FX0!`r~R@9v>Q
z+ze_bMrynbkn7nR4{_aQG%8rmzzY916j-K3_EZ+R1s1s#&uz4fSY#A5+Yo)kRNH*8s)$Z2
zx#N(#k=EO@j&}BTndq3n1X!vSi-@{2ENZGMB%(|qE$Xi2iK3sJ7aZwzHO@x6@iyd!<|KCcTJce4rl=x3mA(#qVg3Rr(s
z)}aeL09g_LuFX4LX?q{EydTd4c-$*s^og6wy&Jp~98vN?rNgFBau^uhePJy2%14h)
z)CIlDLms4jH2%H~$Z$Yz)M`I$IUiL8p40`n8^cVk9dTJ8Kr=(t>p|4#Av_P`3EW%%
zoyQW;;~{OG2F3C_VZh%9#M#ico8ia2_*o?TjVQ_59a)=O&lL;`^Iw<|7cY@1T^5&)
zBQUQ$LK!53wi2|g)><|yEyX+VKE@-uP?IVo-XT(`Srw9Dk|dM1{qIZY<90&ZB6EvS
zt*x_Ob}iA=rj}c%TDleACdjOEdkp&qLuqUM!SYmrM{Xkq97>C-BOToD@jQy>587J$
zs6yi4OhIjk$E+ybFoDfot773n#$zH%`UoeWG2Z+3+~V>6w5yer*%f8B3|Z7$?7C=1
zAk^VA1bWfq6h$g!-$Qh5oi*%Q0SJnR`s{SONr|>+jjrgY$YF?>XIuy&FgaLma*DTMJ&?Rs+Wu{_zhG;yd
zIi$i|cyG=3OZ?BhMQZ$KWwEVMiayN7x4U5v;3_@wZ>|e*^1?F!hpX|NGr2jZx{HW
zUZgHBS|NwBDC+VJILBx$URs_O`zbA6g!Gq06VZafgz@w6I;Ey%V~z*4k{eq~7kH(F
zVq5Ck@2}*(44JQpY|Zj&2{HQJxTOaumRB{4Xuk#+CImL*l0#QBQ6`-dyY7H{eT_5(
z;E_HPxGi{~QbbSEujx7;qzdUtI#8%n71ERRYuYfcm(b@aUEuF1K%Wbz?KbuSg%4I@
zUWeuWj>qhlHOm{N#ON9&6$@wEH-t$SnxhKIY-K(#!v0I}_tGlhDh_
zw}*f^j3-+UF~pYJZXx|GH~r`K^c2ew`cF@2`DB)b&~G91J8hhQAtT%;p3?PBse1nd
zhWRI+f6+ji8sUAD|P-2RsJI?=}Nr~mb>v_S~j(&n80P~cWi;9RRK5OPeJ02
zwnF~M&C73>+m|wR5TV57wf{oGJtV^4`_R6T*D2pcMxR4PJ}JSnwXSWiV);a~NNra|ZKtG?*<6-a
zC$xs2G6(#3(H>qshX*Fltm5X*<5S_+ES~`#o&wyr^BBC!DHfTtJ_FN@x*GVm`L6>1
zN9HV3NQ?S>d7=(cEHbHm9u}2Xg>-=Cb1mwN5~5zv3KtZMc-=3;qKc}Jc2ZwR<7@yi
zyNsRgZN2og;!h&$pvbO)pG}Q)*e}tD7@p<3uqYamx^1j$^A!rf6PQVc1=xY{xoz)U
zeIzn=GaV$8GB@}&@@r;#eMBxd#7-6D+Q{6UL09%Jg2O%R8x{bX+ai0lqkMw4V!txb
zm$2Sfc)rH-jfi0F_wc_PS}Jt(Eyz*(*gGtW%AwcB-02&AGcEpYJC&w!;x5n3+?jn&G7HqWrz=k41Xq?2s}bv)NS<(
zGQ!U6OWop&Ra^atHu?$A&v<^(EWe_)WzwZle<~|0|539nQ7pd#?U)oxtZaEKhbk5u
zBaW4kO|!(n!qLI0TXeZx7br(Yqz7naf1|`;>W;oWknnrZ5qO1y*8%=6;O?Z7jW*4^4O^nTG+v|1d$thT-AgN<1rQTcURwV{0*ey1yrusfI!hw~LX&rJT
z!0}62S*%%GWHn^S=)WDkUuS*#w{n#paR>iZLX5o}01Inrz)7ScAoN$*Z
z<``d0Y;~B-I+@r=Ee0V6=VTye5EhAjqMPqn#j*yJbWEBBdMumeIG?3VoXnbJ(=1p~
zFPr7~5-e+lS+JZ~Hp@T>7F>4<>M{x};_$>S`ZO!XB}JrtwBZJo7&^RBc-CPv=qh7x
z9}yEcJ32wJsI#Nkx?0qUs*v5Q#MY%aEs6s~2CCHPNX>GRV$s8WJsDzHew0rS&yxNX
z7JIL8*;BMyqnfjD`yHI{l^OTVadl&6eTbhCzP%9{o+w3&mQQDC49^EptA*MQ9Oh`<
zayFn`&3II*I1Pynwu*Wo?SFdORZmr1Z{EE-0a_p@HhRehCGap^U?W=qPSAzFDs;=7
z?6*v8eYEQacs9hdk!IPrM8%KRET<@zjfY~{WO*#7Dwa)#V%Zcm3fuTGt;=aXOJHho
zAGM?tZNw$b)PfrPY=yg*v^|oWO0u~camJvdwcw>M6`{@~tvHRpJx
z-g}LWL8a*~TJem<{I_0N*|3wf+FPOkHobgpR1W)MSL*^>m8h5gsNm8wRlUZbUR&bX
ziuIFv(XqAZrnLdUarluMe{b-ouHhlHM7C#|E1F@PcI>Dl@xW8;~=Yp@?dQDaYkLwt&th-r#-p@o$c2%
zHVy{f8qXGZ+!a8ssb)3x_s)slsg7*}u`=P$!o2Y%$VO`e?VG>}=DZTfZ7q_^^?iZ-
zwhTYvB*;~eIJ?XK=Ak4~kNv#gLyWZMb_9TtZ2O@#xm9#;B;xDUOPAVOa{I6io^A1L
zr|mSp1jBE|PW*wjb1Xv)NcUySi9qeIUT*NzbKl8wcbvWSU?4s=!81Ym{+`k&R6>Hj
z-4Y{vxK>Ul{G!6rbFEI;62>OrnW$?tsRa5-sS#~*o^O+~+CKA*t=J@8;CxlU1_oo3
zw1~;5!83TC_G)0v?tXLt6La|i3;C-6&F)(Y?2QNNp&^4-b#mM9wH!`h2M`Kb_HCOH
zBScfiIWMr9V!Pz3G8qO5d>Z9KRYzb&+CefVd8b*&!_IVpT}RIb%C$
zQ9GhW;pPoA&?S}yowiIw>F-G|y>tjM_$gD*1#(;*r0u$
zHp#X(3`6U28;$T@
z%-u(#hw04VT@U<3yZibE7r6&Z9M4RH@>@wdNEX|bSQf=&gCVgs#Ns4Q;sd4pu_(6y
z!+x=RPFr_>u?xSy7ja&@5rP^W%2IG%M?m>mnlDvIAJUIkFw@$CyQ6d}ggRbOh;@{A
zr59&(fQ`SaTHXZ&outUQQ+MqveXGTGg|&9WvpXJl5X%*6+IA;nA00FbdAB`n8>NAP
zl}=cptc<_R>h()BVENo3iPSno3kZL{Kem?@F;|PwHrg8*k(SamzDm`2Pts4z#Z!Z4cTotjf${~?
z5T({qwO%`z4!i(5Yy(C&MRK9sqnkQpoKUxk+cxb145m3@I81Y+Xo3bW?_Cy`>Nz1X
zk3C+~Y0xZIX5UdP2hL3q%Uz~
z=WwwZuW9HCG=r4$UJj4!3*4dGI!NsEPsB=%g%%HQ#sb8iFamm_WDJIp9wFt0#Z7wnMC85%u|
z=<+YEY`d>)OfG{zti{}-#4tvNqqg;F$UdYSQ>rA;FnMvp
zxbYJ1Fo6ksCeZ}o5$g4|g17n##<-rFiN|yp5w|gr1?_nJqn42Wnq`eq074Ekj?vaa
zP(((EQ^u{jxpuitDZ>uJwaY9#`-(DLSQm@A!0+C1)b!(hK(&sJUWkd!CXyxb$SIJ%
z^cUN&g!ad3?Xg!8?MsjE+m-gSq4j>$9MArmg=={`|4EM-)};$zq3_(PjKT|a0W3=+
zHCe2i^bV!R0g!(no`dkXJ>~{rSg4!Se!eW!o^bAFpe@8-bnX*Yf!~}bEinNc@{@or
zY=U!g8`RZFk@@FfOT0)E>l)mtY9NlH6E!$kq^}9-i*Yoqeu`6@2$O#KVmuHe<2H7R
zE-(ifcJ6Xj%jg1FUP=My3opH_GvrhqV*0@^Bf
zE30(D8fiRp@yydK-C(g3rE>#2X_k8wi(Z<#FR-ixi~OcL*;5Sc`ZG)g_oMi07Ww=M
z0cj4p(ZdMQn#^aSMnG_&8!SM9@V?8e0mig#t&m^DaV`
z+poyv-a}53upDN;h0tgVZJT?QZ8EUzd^`*A;P+g;-on9s)L88eC7R}xSPeyvHb2%J
zk>3kzaIXw%3sSR<-
zVP_c3CVSJ^b9!aj)+ZE~^x;KJFM%y}Voy3dk00^zl2%31NfCWlLF&n2W$A2A!BB!^{
zNT%}z6zNE~>Q*B23};_f@yy=-VtTQFspwgFKO)axo|Z&b^K27#a;9L?()r0eT#l3?
z^qiFUdW9>;I-Z*;m?=wr9!oBtiq8o>b+$l>Cc?=i^gYkS$5XUXbnYO=K75ynUOa
zW$6q1vxVebXEJt)i)?IcZoyZcb-dW53ojMDq&L@9lk4||5q@d9C*2DLYLmsJ6lR-W
zR>0RUB!LAl=TDi!zDRavXGgjMU;JK>oR^-Q^3IC9igIyrWi}T{yDHVgR&$rrrjj!Bje=+ie}HWi+%Elf`}qWRW|p^@b=ymF_eR
zF+>5j%3Xb3DLp*dr|#}b&*{gq#kcuA{V6vX*ar9F>lu7CbeLRWKiEny3)mDrpLZ*BRS;$
zeJa`SlaTw-LJ@2b4j{{g>3ieH%Z2O`mrAvVWfzV(W62tJ-o`@Mv8Pv9&g
zm0Jj?8-XnM$DUjYI~otjrh5|ap?2Z-6(xKd2EVt+web8EX4V=FydQ{7Y(Z)osm9u|DA4TRPB^q;3N
z3qD`d+*F%rPc*x^iv?e3tFLbLu`Kx4_`Wp_9c_u3PBiWEw?)ZJF*pi{f3et&k0dx#
zvE)lM=`55^JD1D`d3jN$2faP-%F+<8a6F2Zr#8LEGdU2|!zkqSyya=Bd
z!FOPlK$5)P9ZL8+JC9JX-QPeTDLR91h?IX6`Z8Jk2uORTH=XM*lC;pB>v77lIsa);
z&2zQaX9fR7dC}xIDK(hPDf2DgaKX$KkooVqP9od1}Gdq4f9skwn|Sp9@r#NgouA3ll;neYh}^^ie91
z#7^{a0l$dYS5VV9r{zzoHPffnowe2NE{Wddv#E)u>ekt9@#@x^`p))xxV8G`hFU?5
zLXpo~<5--v#Y^XY(N^Dq-)Sw8OKzd}4*-;#O=Qnnk
zR+l2)2nD`1-nF@|tz&9KqOCp3Lc@ILh6;`MeY~-yeRgMC+>La0yC1w%l88N6_(v}p
zt4v9y2mMK`1Rox6l^ph`pRs1C>dNF@@8Oj43*zQdh(qevZk)wS0($1KGH>7D)I|3g
z7RzL%2snn7V;t#!4@>7=aR?q(A(up?5CjdY#KO*Lf}uKWg}!{Q&!rGI+=_OI)Mv#4
zzBiQYacSt8!&btY4kzE5eq~)zSZmk_gY!Om;wFn>t6<58{_4AYYO?CwOxkw{RCcw(
zlB}C~$+kLn0-ZCf8#V1Q$1h3IPyTuh_!kTS~{agYCu9eaYM>4I=39_B5
zaH$mL`(dMcGd(?-LPxfk=`n9Sn6n2d!KPRT3w-%Ey3Vk5G4JKECi2#$d!Ap09~npT
zdM3FUlil2&+#&!>4!p^*^;v~@Q+sP7-X`g6iw&?eX-F?L9?BHP&>6NN{Zkh_JMQHy
z%;0z31;Iwy$SiPh;ld+l(#9rfvLw+Ko6Ph4v*E-fUYmuB2p+Cr*yeVH$KOTuR`mwQzO@BraQt`x`<6*##j8x3x6(CEv!(A5LZSZ`aU?J#L^dlgHOblBwl{hR#4yrcJC5rV&2L
zmTT(ZbZt~%@?=|7C9~1DZ@^Nrl?zN$l1V$%2a>QN9JV8B)dZ&>Z=GotC8jJhc0$D>
z85Fm3Lua@=lc&^2l4-SF8am@`HPtOXIa7D752sSS-OyUqZS`8?-O*T~q&=WJm+fcDyy?m1k~4Q+!%=$y|D|#-=3Ks!ro3dRr`$5o?iTc8zA^
ztM+YaZi2(o87(Xy4`t9{?Nb}CtL|uM??g|iu2DKMvlXaBV@G4j%r?j>naSF>n_GCI
z0XtR)SI4rhH1(i0XEt?Uu`na{Q62%R>=IY`>;;HlMU
zFf4GKZ1(FUQqfgA8vOA?>N!ZRO|-^YQ)f!Dq>xdcsI85=-a`$$s%vVvNp6i-b3JJk
zAx+w*&uUGyy8*%$nQJrR`^IZJ{48?KYeT=mS`kY|XFh7$?WNbX#vKzyWW3~#HX8;s
zvMFLd_Oj-!z#2vYoGEDV1(MZ*jcjJIDIjXIv-K1ZigM!0b>a2wbZsUdq3uiAc!Vj-x*mefYghqJ+4vo!ylZN9>q1|yfasMkiE0*m
zGQF8V!}q7`@7IY!^o0xYt{O&)vjCTui@N7X5!!ZfrqIfL7lM6~%nB}Q$qFRXMubnSlAnv^LLjJ)9KBw$&%C_@V!kFB9zsIZR=B(Zcu
zSkSCt5RqYZ#Wu9UU~h79sXR983HHZ0IA{gKh1ZELaBRLF?7h7&1?WglQsHB$luW^4
z1xv9roQ$0g=VezZ8uSz-)-=~9nx+XM=aEy98gFuAl5Kq&lIjqHsQ2e-CZBFLgoEH7xWk7&UrI6Iv#=D27!P+Dkd0pXpV
zbSI)*E}i6U)ShM4HE3ru8t
zvG+wr?`07IY=-O$Gudv0+>7b1z%Nq!;Z371=dFvpN+l3M_HFwxw-9%P`WmvmQVfNGl8$2-bxB$P*8)Eo@yan-v=tM2K4DJu-MJgxo%ZnL?
zHw=Ugb%m!zTl$cwhF97=iL<(9xC+7h1ydP*^U2wWSI-HivB|EnX{dv9O|1U4TnV(a
zCYs^n-BdwGcpaA$ksLy<=S&!euo5>E&`+kCrB53g*flTLGdH3Vxka>PT|U>_raBaJ
zZ?fC^_Uf7$o$ak&Y|qqlOXS{+06|SdHD;(pV@pGvGccA$&ColJB}rSG7q~OUId$BE
z-=Xlr%l%zyo5A(Mt^HX^CAc5-KGL+wZp`F%uY)svYqa=!FF#l
z6fqoR_q8yt;@00}xW6_ILwZq7Bb~nT0k40V-p%U+e7i|_*xnB^Y8lR;p&zQpiXW@j
znpV>$f?@xDcuqgAOMCsBmiX<|#5B6HM73LaQ2F0AB-+~%k_zUqzdi!P;!UuCgW`z$
zeOJ1GU#nl@?`PQzk1p)3?!iXAt-pZaGY{ZIICKAy?O>oV4_DD{2C^IHw8>*xul_EP
zL+J4mX-{O0i*n^?<39$I*qBc;isTAW!c$DK;ap>NR^(|W!m#Gh$o1Vn;Y-O3&D(cT
zr4}^dGu2H^48*D4&d&7bxY|yV_%Cg&~uRO+7F`
zd!fM$I*=Cy)0i%H=gdKg0a5--9w?N5nUYZ{&dpN@COoJM(S@OLaei>0&K+25F#M)*FHN@VBeq{-Q6|G@gPC!ONT
zu@0+=Ts|;Y|C2|e=+lCrmHw4Rq|a0|ne`(qti+o-2kTqVDn3qlZ+TAG?`CbC)vc}7
zZdRbC|3(l#hlvOpITO-^Vb+H@
zQc3r*et|3wtdDSjoxxtz#D|TB>^&blt`b#e+kYa#-5T>squxX?`_qQ%rfD73)8d_t
zSpU@}5WpARY1q$F{)qL~IlSrbja=64^E?ivC4ocvi*PFj8_heE%c&G}TK@=9aLQGkg
zDXt6_P!;PH=DE!fj=?I{cgsTzjEW6f5<-Y!Td`q2nZ+#@Z|g9PbBXstkk|28Vxw#t
z=Lm>w?3d2x>TublI8`l;**F{P616!@g=t-cQa4GtumdZ*Y1ZtZMG=hoiqTvuYE!an
zZ#$9)S=EHSDtpwnJrL8D=2W6qW;D`vUAQ5okAUF!D#l|{zzs6z_gUu&
z^o8h`T2O-(97!H&B_
zeRJ~+=gVoD9TCe$Yws7F$0~Nh+hle221vfpoQ>l$gOF2?oq3^CZ%(Pllw^Mqy|v$u
z=24Gbu>NQF6gW%n${T%2tcF}YSaLTSso9*pnxb%_X1dd}
zS2d$OQZ7tE?v{AdG#u~ip;o@MrXmX%z;K>opKNbx>HZ~SHx*t0D$5TZm&+v@+(QNp6r+*9Q@~;
z4%eszq;QFB-MYM_&Y=0(OVX{)&FwsPZ;W))EawU^}W1eKzGu=xCHlLNOg123YazO
zWg^2KGx?&o&cSqUZfu(1h|8hB&1DL?2CIl0w9M#3hPh9W_pWG~QO+6mkhXXuj-L_@
zHHft(YN{K|m1$>f&QEz3X=C+BnqjCv~S=WO~GtgW8CY!_FxJPbt7!(KNVHrtfU?*^#
z$SNLQF!3PVmC$5Iw3+Kn({L2!f>G4%NH2Xht_+%M??wt~j`A{8*o-6NXkG{QnaOYr
z?$khkIKAN3y5d;djZBcryzqQBH7TrXzQXDUeN_ICdOpP5V1*h6NX)1E+hvILSo>Rj2dvL~F^j1XLF
zD1+k8Z$jLfhn`qS1@3sTwJyMX)__|9p)8Ke3u~GiaRZQ9rO=2(R9uAMZUQ#|yjwG!
z2n$a2tIAGvv8QJ!hw5J9sT+i_j+c7pvu*K~>egy?Zcc44Yry1)Bk@ocXTi&vHm$X~
zg|{O@`SjLT;HbU5wb?CG*e9;!TO!rYi?L5!g;R!^yn2Ys8`7iL`d7E%n7$eJBU~y?
zdkrt3bhdOf)wFj6!lWD~*J2E}wwKCfHLpVex>O#0^7YWQ$sDDZDnafWJnNN^%u3vd
zO2G`X8>jm9rOcb$U4v-e&8}+&^Vn9mc+!Fy+`8N@Qz%?ouNVv@j6`UZ0>ALOsjY8%7S-=
z3Yr2eNrZ^q3I*?8RzU=|s;Bx1O~&lD0=U*i$?qHb^zVC
z91wg9+?5_EtnU3Gl&5z{r>#-&flxt=`9`=4Px+`utnq^(2;564|A2F?iibi)r()Sv
ziz~&QP4Nz_THRpW5@jC_m0iYou0rwOhKk#JGEtS;Pk$FGJgXkpON^h9rbnQ$;*n4(
z>!CbV-J*$B`+cZnpxbrE;RS2;!TLBr9$hAcZ;iDkYMpbTkUxYFfi7EG$YaZdgoRM8
z$3uvg<`#R8#|*sApoioF=n2k_^%!5B5tqp9KXRHZolVE}B+;1vqG0AeMR3VnP9{$i
z8xhK!KM@zn;XruC!?egDF8UrWJ-}5pC;a6krnY|
zsJr4N1TVS+=a*!E8O!dxKIh>S@e0|igZF$mO};uec0tH5ZejH|7G;f%MV4^d)&
zA;;z4o4D*GB&@_+492N6PT>D$THyW@Tj@V@9gq{<+urr6V2pz8{EpkX=rAD_{x45i
zT^vp468CN(S9D|pyjSe)!v({%HYas|-|Q;=`q54wpe)w;0%w2v&|ZtiI;FF^ttR1u
zvy}Rg%WSXfoFXvx@{e`Sq@5&-jGqLvraE85%uj=v=KWc-S>Y=1vv6kT)Mj@JnNmO3
z1-758rG632@`)++%V4Ij5~Y3>%*2ttlF9;K2MbIM6rij6MhYa_nmeaV*>RUn7a?c%
zw~=h8IkUfuWbYsqWA^uvYQ
zgZv`-Gnx}qI$H(GtX~6J9V)A`OtKo=CQaVa4O^fpV}UGZMrM@;9nRm#|z{kSAa%~1}T6sOBtr7-y-SE{O3j~
z=lL;(RBoL2PnsxylXR*(hgSpz!s>3y3;mrqH*ae1oL)V%x|6TIsk<>W?C4S%m=G&B
ztBp_Xa91rceOGSYpEs{e8KY3<7GCt;>BT}-J-z1bAyWubVC5LRj~}{0M(mb$-zxgj
zG+VXcH9Bk~{VfwsGnSzxe-A_5#+eP8Kv|8gaigcEzO}gtrz*9Q!8X`tW^)7JzMrO`
zZLyX|>`n#fC}=zEO1$@0U1u1NMHjy1pf1~yb3*mhHr~K%7ePc%L{cJ{G-)c9$kW`s
z#A;7Qu(rB&TALu5wmrfzowaptbHTJ7n1(2glw%!t)p|#%I
zD}~wAMAu9!l$4W)7h>hin|Rn(4JLSHRT^@m8?Dl7V$XWgS=kQ)eT7
zQQ}4rA`z9-uJ7r
zT!<*kj@*D-Px=Y~U0LHCcSz2EHl^H~2vm&U7{@CEq8Ob@3+~W3FN45PN$C%@}wPR$z-p`45K$lP6{W+XFaAO=FEeW0i
za0)$uxjb_TX0ZVeWLBa%n8EIHke2~vaox*1b`BPz!ksMClnxy{&>J4ylf;!_+%uQ@
zu@RHOgI%`E9Pa)~%mgV+xO#)hHt4duDjYTmE88H=yZV9fHx-!Mhly9;t{kfad9TsWY}SS3AKQPIUr#5zN89Q{k?;C)(2pyr2SNumG!n^d7+{!L@y
z$O~7DB!!K8IPR4s6XDb&+(kwyOZFqx&XxZ@DwS~qka{28W54?&AnJV#-wanCgK8Wr
z-_|j67Aqi+!Iq9beX%Q-7D=LCD_*t_K*DpBtf
zl^LnxNnJP~?DKDWP}s>`Io$J5iR`_n=##h(6N}*m1arq$1hBzRHK%by6kvBb%@U!A
zx%%kLNEd#3W^SW*S+uJS7d~7Av$@W|<(;g#TO{&07SFV)_NyC`Mc;B3Eg4E@{m!<1
z(n)6FrF2B>oXW`btmmlo2J@{U5y9bcZbxjB?eoiwyQ_We(8&4caQ#piyv0Uz^ltIRwP;eLZhVDH}O+yale
z|4r?~@YPIA?Pqy=0;{#j+3kFle`EwN(z!*j(Kq8g)_yp(!;8|f?}^jwqvv$)#;0(i
zZ@=OybJ}D5di22^Uz`Nv5gq4g=(aua8KAbYuTF6L9?zMA*AV8qh0)>@IU}*--~%}P
zdXaP%HusiZ_3QHiDBJ+`HkMoeWS{oY=L^}Zwhm}quO3eRdbI6~FA%sUSk|^)J@GD%
z_lyfikf-`^!+19hk1XLtwztb?V?XWi@w&WchBevVx*x7?`)zUednQI7n}>Vuv+j(!
zZR@t3aKqO5wuWpRJHm7LsFQqO&)a2oIDRo#snd31cXeJKiOxH?9lJ)&$-#iZX^wxF
z<&1AP4jp(EzVk>79eCHUPi$GZyPEdAjI({@^Jcj%u$Sz?3kUsXjP@?UQ1=4wM|JPx
zUG<{wMMvjd?xOA`N7umhEVuV%IR?2JI`tLQVTjZtx?$`Ld&%@oH^|<{qd2C-v9FD>
ztXHYWkSywAYu)~6>?n!+OHY#yy+->Pb22w&wg@1
zrUU&k9rTWz+-csNF^vy6PaihX_uePB>L8!dZO`uwx>ewy^j2&s`2w}>JB;t)d>#pK
zNzLC14^bRW=@kfULox+IN;wEYYEnp`uo6OuLJ&e4g;WS(3LyyT6uyHHp^ye4gTgon
znH0hhvM8iO$VY*N=cmvCLIDaH5DHSrgiwe=We9~SWI-rGAs>XI6!JqTM&Wk|#VHhk
zP=Z212qh^Lf>4UWWe`eJC=8(tg=rAVQYZqU9EG9~%2Ox?;S>tRAylAH0zyR!B_ULz
zFbu+}6iPv;OyPA1RVb8(P?bU%2-PV30HHdCvJh%epnGdl=mMb@h4K(;Q#b{}X%s3z
zs6(M5glr0xAk>AB!iv?S=2QsvDb$6~fI<}r4JlNG(1=1c2#qOJhtPyV4G2vs)P&HC
z!aNAgDb#{+I)%3(w4hKM!Wk4!gK#E=IuOpHkPV?Fg?bQLQK%20HH8Kc+E8c+p)G~I
z5ZX~_1fe~J#t=GCXab=lg{BZXQD_FCGlk|5x==VBLRShcAatW}288Yu&VLg+)GHH5wpQrPSIQPT!Oe+q3OoI{}!Z{EoP#6GVB877yOrmfegvk^JLYP8f1%w<5gCI<$
zFc`u#3g<(ZPGJay85EX4m`Pzcgjp0uK$uNoB!oE-Qp!M>OU)<<^QhsTdjU10AzVmd
z421a~%z|(gh1n3UrZ5M>H55LFa4m(o5U!(e0fc1~=0jLc;UWkt
zC@g?*J%xo3ZlJIT!i^LbL%0b-3U|hvsks=!N(z@iSViGd2)9sJ3gK1?mqS=h;R*=1
zQMeMq?G&zpu!h3b5Y|$-2ErW_u7z+Xg!tD??
zQ&_2*OSZ8zJnX@I8dx6ds1~JcUgV_E2~P!V45OLwJ$G
zV-Q}V@Hm8*DLet;6$)D*?4__3!afSyAiPT9DG0AocpAd%6t+WngTgZq_EUHk!T}1;
zL3oqG4hRP+?1b}_y6!t^-jKTp3pHnyp;R_0HLHLrw
zAqdAPyaVAY3hzSrn!)1yg2K0)=TP{O(;o`I
zK?qX#2|_A`pCN=O`~o43!XFUA6#j&ePT?;I5eg?DWI#wk2`QNrAf;qc2tvq5Ar(S?
z3LyvuD5OCsNFfZN5QTIIg(*ZJ6rqp_p(uqc2*oJmhfthC0SF~16ogQcLLmsHC=`ZJ
znnDo>WhfMdP?kao2<0f0gixMBX$YrKC<~zig>n!oQYa6h5`|MBoJyergvt~uLa0Ka
z5`?N0PK8j7LRARWDO7_{gFVuM2(>BHf^Zsz+7RkcI1NHJg*p)GQpko-
zk3wAt^(oYY(11dH2n{JTfY69SLkNv2G=k8CLSqO`DKvr5j6zcg%_%g4a5@CezVHJ}
z5PpYn1_gGBGb!8(;VcR(A+&UbRxZ?<0?BPCFne1HG}w;9RS?>{LI(~o^qXtl*>&~S>kDW)M9fW}tIzkvkp)-WR6uLk-pF(#CLn!ovFqFc%5Qb402w^yd
zK@dhzz%HCJk^=VAlu;0Z?8c)h6oN2@LU9OVDX_1Oqrkp8oJ_6VKxOe}AzV!1AcRXO
z9D;Bug?At