src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp

rev 7902 : [mq]: 8073052-Rename-and-clean-up-the-allocation-manager-hierarchy-in-g1Allocator

@@ -182,16 +182,16 @@
   friend class VM_G1IncCollectionPause;
   friend class VMStructs;
   friend class MutatorAllocRegion;
   friend class SurvivorGCAllocRegion;
   friend class OldGCAllocRegion;
-  friend class G1Allocator;
+  friend class AllocRegionManager;
 
   // Closures used in implementation.
   friend class G1ParScanThreadState;
   friend class G1ParTask;
-  friend class G1ParGCAllocator;
+  friend class PLABAllocator;
   friend class G1PrepareCompactClosure;
 
   // Other related classes.
   friend class HeapRegionClaimer;
 

@@ -244,12 +244,12 @@
   G1RegionMappingChangedListener _listener;
 
   // The sequence of all heap regions in the heap.
   HeapRegionManager _hrm;
 
-  // Class that handles the different kinds of allocations.
-  G1Allocator* _allocator;
+  // Handles the different kinds of allocations within a region.
+  AllocRegionManager* _allocator;
 
   // Statistics for each allocation context
   AllocationContextStats _allocation_context_stats;
 
   // PLAB sizing policy for survivors.

@@ -602,11 +602,11 @@
   // after processing.
   void enqueue_discovered_references(uint no_of_gc_workers);
 
 public:
 
-  G1Allocator* allocator() {
+  AllocRegionManager* allocator() {
     return _allocator;
   }
 
   G1MonitoringSupport* g1mm() {
     assert(_g1mm != NULL, "should have been initialized");