src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp

*** 1968,1977 ****
--- 1968,1980 ----
      _cmsGen->cmsSpace()->beginSweepFLCensus((float)(_inter_sweep_timer.seconds()),
                                              _inter_sweep_estimate.padded_average(),
                                              _intra_sweep_estimate.padded_average());
    }
  
+   {
+     TraceCMSMemoryManagerStats();
+   }
    GenMarkSweep::invoke_at_safepoint(_cmsGen->level(),
      ref_processor(), clear_all_soft_refs);
    #ifdef ASSERT
      CompactibleFreeListSpace* cms_space = _cmsGen->cmsSpace();
      size_t free_size = cms_space->free();
*** 3418,3427 ****
--- 3421,3431 ----
  // this generation. [Note this initial checkpoint need only
  // be approximate -- we'll do a catch up phase subsequently.]
  void CMSCollector::checkpointRootsInitial(bool asynch) {
    assert(_collectorState == InitialMarking, "Wrong collector state");
    check_correct_thread_executing();
+   TraceCMSMemoryManagerStats tms(_collectorState);
    ReferenceProcessor* rp = ref_processor();
    SpecializationStats::clear();
    assert(_restart_addr == NULL, "Control point invariant");
    if (asynch) {
      // acquire locks for subsequent manipulations
*** 4751,4760 ****
--- 4755,4765 ----
    assert(_collectorState == FinalMarking, "incorrect state transition?");
    check_correct_thread_executing();
    // world is stopped at this checkpoint
    assert(SafepointSynchronize::is_at_safepoint(),
           "world should be stopped");
+   TraceCMSMemoryManagerStats tms(_collectorState);
    verify_work_stacks_empty();
    verify_overflow_empty();
  
    SpecializationStats::clear();
    if (PrintGCDetails) {
*** 5852,5861 ****
--- 5857,5868 ----
    assert(_collectorState == Sweeping, "just checking");
    check_correct_thread_executing();
    verify_work_stacks_empty();
    verify_overflow_empty();
    increment_sweep_count();
+   TraceCMSMemoryManagerStats tms(_collectorState);
+ 
    _inter_sweep_timer.stop();
    _inter_sweep_estimate.sample(_inter_sweep_timer.seconds());
    size_policy()->avg_cms_free_at_sweep()->sample(_cmsGen->free());
  
    // PermGen verification support: If perm gen sweeping is disabled in
*** 9124,9128 ****
--- 9131,9189 ----
        _dead_bit_map->mark(addr);      // mark the dead object
      }
    }
    return res;
  }
+ 
+ TraceCMSMemoryManagerStats::TraceCMSMemoryManagerStats(CMSCollector::CollectorState phase): TraceMemoryManagerStats() {
+ 
+   switch (phase) {
+     case CMSCollector::InitialMarking:
+       initialize(true  /* fullGC */ ,
+                  true  /* recordGCBeginTime */,
+                  true  /* recordPreGCUsage */,
+                  false /* recordPeakUsage */,
+                  false /* recordPostGCusage */,
+                  true  /* recordAccumulatedGCTime */,
+                  false /* recordGCEndTime */,
+                  false /* countCollection */  );
+       break;
+ 
+     case CMSCollector::FinalMarking:
+       initialize(true  /* fullGC */ ,
+                  false /* recordGCBeginTime */,
+                  false /* recordPreGCUsage */,
+                  false /* recordPeakUsage */,
+                  false /* recordPostGCusage */,
+                  true  /* recordAccumulatedGCTime */,
+                  false /* recordGCEndTime */,
+                  false /* countCollection */  );
+       break;
+ 
+     case CMSCollector::Sweeping:
+       initialize(true  /* fullGC */ ,
+                  false /* recordGCBeginTime */,
+                  false /* recordPreGCUsage */,
+                  true  /* recordPeakUsage */,
+                  true  /* recordPostGCusage */,
+                  false /* recordAccumulatedGCTime */,
+                  true  /* recordGCEndTime */,
+                  true  /* countCollection */  );
+       break;
+ 
+     default:
+       ShouldNotReachHere();
+   }
+ }
+ 
+ // when bailing out of cms in concurrent mode failure
+ TraceCMSMemoryManagerStats::TraceCMSMemoryManagerStats(): TraceMemoryManagerStats() {
+   initialize(true /* fullGC */ ,
+              true /* recordGCBeginTime */,
+              true /* recordPreGCUsage */,
+              true /* recordPeakUsage */,
+              true /* recordPostGCusage */,
+              true /* recordAccumulatedGCTime */,
+              true /* recordGCEndTime */,
+              true /* countCollection */ );
+ }
+