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

rev 47957 : 8191564: Refactor GC related servicability code into GC specific subclasses

@@ -195,12 +195,12 @@
     promo.setSpace(cfls);
   }
 };
 
 ConcurrentMarkSweepGeneration::ConcurrentMarkSweepGeneration(
-     ReservedSpace rs, size_t initial_byte_size, CardTableRS* ct) :
-  CardGeneration(rs, initial_byte_size, ct),
+  ReservedSpace rs, size_t initial_byte_size, GCMemoryManager* mem_mgr, CardTableRS* ct) :
+  CardGeneration(rs, initial_byte_size, mem_mgr, ct),
   _dilatation_factor(((double)MinChunkSize)/((double)(CollectedHeap::min_fill_size()))),
   _did_compact(false)
 {
   HeapWord* bottom = (HeapWord*) _virtual_space.low();
   HeapWord* end    = (HeapWord*) _virtual_space.high();

@@ -8114,14 +8114,14 @@
   // Could be 0, if the block size could not be computed without stalling.
   return res;
 }
 
 TraceCMSMemoryManagerStats::TraceCMSMemoryManagerStats(CMSCollector::CollectorState phase, GCCause::Cause cause): TraceMemoryManagerStats() {
-
+  GCMemoryManager* mgr = CMSHeap::heap()->major_mgr();
   switch (phase) {
     case CMSCollector::InitialMarking:
-      initialize(true  /* fullGC */ ,
+      initialize(mgr   /* major */ ,
                  cause /* cause of the GC */,
                  true  /* recordGCBeginTime */,
                  true  /* recordPreGCUsage */,
                  false /* recordPeakUsage */,
                  false /* recordPostGCusage */,

@@ -8129,11 +8129,11 @@
                  false /* recordGCEndTime */,
                  false /* countCollection */  );
       break;
 
     case CMSCollector::FinalMarking:
-      initialize(true  /* fullGC */ ,
+      initialize(mgr   /* major */ ,
                  cause /* cause of the GC */,
                  false /* recordGCBeginTime */,
                  false /* recordPreGCUsage */,
                  false /* recordPeakUsage */,
                  false /* recordPostGCusage */,

@@ -8141,11 +8141,11 @@
                  false /* recordGCEndTime */,
                  false /* countCollection */  );
       break;
 
     case CMSCollector::Sweeping:
-      initialize(true  /* fullGC */ ,
+      initialize(mgr   /* major */ ,
                  cause /* cause of the GC */,
                  false /* recordGCBeginTime */,
                  false /* recordPreGCUsage */,
                  true  /* recordPeakUsage */,
                  true  /* recordPostGCusage */,