hotspot/src/share/vm/gc_implementation/includeDB_gc_parallelScavenge

rev 410 : Merge

@@ -1,7 +1,7 @@
 //
-// Copyright 2001-2007 Sun Microsystems, Inc.  All Rights Reserved.
+// Copyright 2001-2008 Sun Microsystems, Inc.  All Rights Reserved.
 // 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.

@@ -59,19 +59,21 @@
 asPSYoungGen.hpp                        mutableSpace.hpp
 asPSYoungGen.hpp                        objectStartArray.hpp
 asPSYoungGen.hpp                        spaceCounters.hpp
 asPSYoungGen.hpp                        psVirtualspace.hpp
 asPSYoungGen.hpp                        psYoungGen.hpp
+asPSYoungGen.hpp                        spaceDecorator.hpp
 
 asPSYoungGen.cpp                        gcUtil.hpp
 asPSYoungGen.cpp                        java.hpp
 asPSYoungGen.cpp                        oop.inline.hpp
 asPSYoungGen.cpp                        parallelScavengeHeap.hpp
 asPSYoungGen.cpp                        psMarkSweepDecorator.hpp
 asPSYoungGen.cpp                        psScavenge.hpp
 asPSYoungGen.cpp                        asPSYoungGen.hpp
 asPSYoungGen.cpp                        psYoungGen.hpp
+asPSYoungGen.cpp                        spaceDecorator.hpp
 
 cardTableExtension.cpp                  cardTableExtension.hpp
 cardTableExtension.cpp                  gcTaskManager.hpp
 cardTableExtension.cpp                  oop.inline.hpp
 cardTableExtension.cpp                  oop.psgc.inline.hpp

@@ -146,20 +148,18 @@
 parallelScavengeHeap.hpp                psOldGen.hpp
 parallelScavengeHeap.hpp                psPermGen.hpp
 parallelScavengeHeap.hpp                psYoungGen.hpp
 parallelScavengeHeap.hpp                ostream.hpp
 
-parMarkBitMap.cpp                       bitMap.hpp
 parMarkBitMap.cpp                       bitMap.inline.hpp
 parMarkBitMap.cpp                       oop.inline.hpp
 parMarkBitMap.cpp                       os.hpp
 parMarkBitMap.cpp                       os_<os_family>.inline.hpp
 parMarkBitMap.cpp                       parMarkBitMap.hpp
 parMarkBitMap.cpp                       parMarkBitMap.inline.hpp
 parMarkBitMap.cpp                       psParallelCompact.hpp
 
-parMarkBitMap.hpp                       bitMap.hpp
 parMarkBitMap.hpp                       bitMap.inline.hpp
 parMarkBitMap.hpp                       psVirtualspace.hpp
 
 psAdaptiveSizePolicy.cpp                gcPolicyCounters.hpp
 psAdaptiveSizePolicy.cpp                gcCause.hpp

@@ -223,10 +223,11 @@
 psMarkSweep.cpp                         psScavenge.hpp
 psMarkSweep.cpp                         psYoungGen.hpp
 psMarkSweep.cpp                         referencePolicy.hpp
 psMarkSweep.cpp                         referenceProcessor.hpp
 psMarkSweep.cpp                         safepoint.hpp
+psMarkSweep.cpp                         spaceDecorator.hpp
 psMarkSweep.cpp                         symbolTable.hpp
 psMarkSweep.cpp                         systemDictionary.hpp
 psMarkSweep.cpp                         vmThread.hpp
 
 psMarkSweep.hpp                         markSweep.inline.hpp

@@ -237,10 +238,11 @@
 psMarkSweepDecorator.cpp                objectStartArray.hpp
 psMarkSweepDecorator.cpp                oop.inline.hpp
 psMarkSweepDecorator.cpp                parallelScavengeHeap.hpp
 psMarkSweepDecorator.cpp                psMarkSweep.hpp
 psMarkSweepDecorator.cpp                psMarkSweepDecorator.hpp
+psMarkSweepDecorator.cpp                spaceDecorator.hpp
 psMarkSweepDecorator.cpp                systemDictionary.hpp
 
 psMarkSweepDecorator.hpp                mutableSpace.hpp
 
 psParallelCompact.cpp                   psAdaptiveSizePolicy.hpp

@@ -277,20 +279,22 @@
 psParallelCompact.hpp                   markSweep.hpp
 psParallelCompact.hpp                   mutableSpace.hpp
 psParallelCompact.hpp                   objectStartArray.hpp
 psParallelCompact.hpp                   oop.hpp
 psParallelCompact.hpp                   parMarkBitMap.hpp
+psParallelCompact.hpp                   psCompactionManager.hpp
 psParallelCompact.hpp                   sharedHeap.hpp
 
 psOldGen.cpp                            psAdaptiveSizePolicy.hpp
 psOldGen.cpp                            cardTableModRefBS.hpp
 psOldGen.cpp                            gcLocker.inline.hpp
 psOldGen.cpp                            java.hpp
 psOldGen.cpp                            oop.inline.hpp
 psOldGen.cpp                            parallelScavengeHeap.hpp
 psOldGen.cpp                            psMarkSweepDecorator.hpp
 psOldGen.cpp                            psOldGen.hpp
+psOldGen.cpp                            spaceDecorator.hpp
 
 psOldGen.hpp                            psGenerationCounters.hpp
 psOldGen.hpp                            mutableSpace.hpp
 psOldGen.hpp                            objectStartArray.hpp
 psOldGen.hpp                            psVirtualspace.hpp

@@ -348,10 +352,11 @@
 psScavenge.cpp                          psScavenge.inline.hpp
 psScavenge.cpp                          psTasks.hpp
 psScavenge.cpp                          referencePolicy.hpp
 psScavenge.cpp                          referenceProcessor.hpp
 psScavenge.cpp                          resourceArea.hpp
+psScavenge.cpp                          spaceDecorator.hpp
 psScavenge.cpp                          threadCritical.hpp
 psScavenge.cpp                          vmThread.hpp
 psScavenge.cpp                          vm_operations.hpp
 
 psScavenge.hpp                          allocation.hpp

@@ -417,10 +422,11 @@
 psYoungGen.cpp                          parallelScavengeHeap.hpp
 psYoungGen.cpp                          psMarkSweepDecorator.hpp
 psYoungGen.cpp                          psScavenge.hpp
 psYoungGen.cpp                          psYoungGen.hpp
 psYoungGen.cpp                          mutableNUMASpace.hpp
+psYoungGen.cpp                          spaceDecorator.hpp
 
 psYoungGen.hpp                          psGenerationCounters.hpp
 psYoungGen.hpp                          mutableSpace.hpp
 psYoungGen.hpp                          objectStartArray.hpp
 psYoungGen.hpp                          spaceCounters.hpp