hotspot/src/share/vm/gc_implementation/includeDB_gc_concurrentMarkSweep

rev 410 : Merge

*** 1,7 ****
  //
! // Copyright 2004-2006 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.
--- 1,7 ----
  //
! // Copyright 2004-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.
*** 26,35 ****
--- 26,36 ----
  
  binaryTreeDictionary.cpp                allocationStats.hpp
  binaryTreeDictionary.cpp                binaryTreeDictionary.hpp
  binaryTreeDictionary.cpp                globals.hpp
  binaryTreeDictionary.cpp                ostream.hpp
+ binaryTreeDictionary.cpp                spaceDecorator.hpp
  
  binaryTreeDictionary.hpp                freeBlockDictionary.hpp
  binaryTreeDictionary.hpp                freeList.hpp
  
  cmsAdaptiveSizePolicy.cpp               cmsAdaptiveSizePolicy.hpp
*** 112,141 ****
  compactibleFreeListSpace.cpp            init.hpp
  compactibleFreeListSpace.cpp            java.hpp
  compactibleFreeListSpace.cpp            liveRange.hpp
  compactibleFreeListSpace.cpp            oop.inline.hpp
  compactibleFreeListSpace.cpp            resourceArea.hpp
  compactibleFreeListSpace.cpp            universe.inline.hpp
  compactibleFreeListSpace.cpp            vmThread.hpp
  
  compactibleFreeListSpace.hpp            binaryTreeDictionary.hpp
  compactibleFreeListSpace.hpp            freeList.hpp
  compactibleFreeListSpace.hpp            space.hpp
  
  compactingPermGenGen.cpp                concurrentMarkSweepGeneration.inline.hpp
  
- concurrentGCThread.cpp                  concurrentGCThread.hpp
- concurrentGCThread.cpp                  init.hpp
- concurrentGCThread.cpp                  instanceRefKlass.hpp
- concurrentGCThread.cpp                  interfaceSupport.hpp
- concurrentGCThread.cpp                  java.hpp
- concurrentGCThread.cpp                  javaCalls.hpp
- concurrentGCThread.cpp                  oop.inline.hpp
- concurrentGCThread.cpp                  systemDictionary.hpp
- 
- concurrentGCThread.hpp                  thread.hpp
- 
  concurrentMarkSweepGeneration.cpp       cardTableRS.hpp
  concurrentMarkSweepGeneration.cpp       cmsAdaptiveSizePolicy.hpp
  concurrentMarkSweepGeneration.cpp       cmsCollectorPolicy.hpp
  concurrentMarkSweepGeneration.cpp       cmsGCAdaptivePolicyCounters.hpp
  concurrentMarkSweepGeneration.cpp       cmsOopClosures.inline.hpp
--- 113,132 ----
  compactibleFreeListSpace.cpp            init.hpp
  compactibleFreeListSpace.cpp            java.hpp
  compactibleFreeListSpace.cpp            liveRange.hpp
  compactibleFreeListSpace.cpp            oop.inline.hpp
  compactibleFreeListSpace.cpp            resourceArea.hpp
+ compactibleFreeListSpace.cpp            spaceDecorator.hpp
  compactibleFreeListSpace.cpp            universe.inline.hpp
  compactibleFreeListSpace.cpp            vmThread.hpp
  
  compactibleFreeListSpace.hpp            binaryTreeDictionary.hpp
  compactibleFreeListSpace.hpp            freeList.hpp
  compactibleFreeListSpace.hpp            space.hpp
  
  compactingPermGenGen.cpp                concurrentMarkSweepGeneration.inline.hpp
  
  concurrentMarkSweepGeneration.cpp       cardTableRS.hpp
  concurrentMarkSweepGeneration.cpp       cmsAdaptiveSizePolicy.hpp
  concurrentMarkSweepGeneration.cpp       cmsCollectorPolicy.hpp
  concurrentMarkSweepGeneration.cpp       cmsGCAdaptivePolicyCounters.hpp
  concurrentMarkSweepGeneration.cpp       cmsOopClosures.inline.hpp
*** 163,173 ****
  concurrentMarkSweepGeneration.cpp       symbolTable.hpp
  concurrentMarkSweepGeneration.cpp       systemDictionary.hpp
  concurrentMarkSweepGeneration.cpp       vmCMSOperations.hpp
  concurrentMarkSweepGeneration.cpp       vmThread.hpp
  
! concurrentMarkSweepGeneration.hpp       bitMap.hpp
  concurrentMarkSweepGeneration.hpp       freeBlockDictionary.hpp
  concurrentMarkSweepGeneration.hpp       gSpaceCounters.hpp
  concurrentMarkSweepGeneration.hpp       gcStats.hpp
  concurrentMarkSweepGeneration.hpp       generation.hpp
  concurrentMarkSweepGeneration.hpp       generationCounters.hpp
--- 154,164 ----
  concurrentMarkSweepGeneration.cpp       symbolTable.hpp
  concurrentMarkSweepGeneration.cpp       systemDictionary.hpp
  concurrentMarkSweepGeneration.cpp       vmCMSOperations.hpp
  concurrentMarkSweepGeneration.cpp       vmThread.hpp
  
! concurrentMarkSweepGeneration.hpp       bitMap.inline.hpp
  concurrentMarkSweepGeneration.hpp       freeBlockDictionary.hpp
  concurrentMarkSweepGeneration.hpp       gSpaceCounters.hpp
  concurrentMarkSweepGeneration.hpp       gcStats.hpp
  concurrentMarkSweepGeneration.hpp       generation.hpp
  concurrentMarkSweepGeneration.hpp       generationCounters.hpp
*** 204,221 ****
--- 195,221 ----
  freeBlockDictionary.cpp                 freeBlockDictionary.hpp
  freeBlockDictionary.cpp                 thread_<os_family>.inline.hpp
  
  freeBlockDictionary.hpp                 allocation.hpp
  freeBlockDictionary.hpp                 debug.hpp
+ freeBlockDictionary.hpp                 freeChunk.hpp
  freeBlockDictionary.hpp                 globalDefinitions.hpp
  freeBlockDictionary.hpp                 memRegion.hpp
  freeBlockDictionary.hpp                 mutex.hpp
  freeBlockDictionary.hpp                 ostream.hpp
  
  freeChunk.cpp                           copy.hpp
  freeChunk.cpp                           freeBlockDictionary.hpp
  
+ freeChunk.hpp                           allocation.hpp
+ freeChunk.hpp                           debug.hpp
+ freeChunk.hpp                           globalDefinitions.hpp
+ freeChunk.hpp                           markOop.hpp
+ freeChunk.hpp                           memRegion.hpp
+ freeChunk.hpp                           mutex.hpp
+ freeChunk.hpp                           ostream.hpp
+ 
  freeList.cpp                            freeBlockDictionary.hpp
  freeList.cpp                            freeList.hpp
  freeList.cpp                            globals.hpp
  freeList.cpp                            mutex.hpp
  freeList.cpp                            sharedHeap.hpp