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

rev 4482 : 8013934: Garbage collection event for CMS has wrong cause for System.gc()

*** 61,70 ****
--- 61,71 ----
  #include "services/runtimeService.hpp"
  
  // statics
  CMSCollector* ConcurrentMarkSweepGeneration::_collector = NULL;
  bool CMSCollector::_full_gc_requested = false;
+ GCCause::Cause CMSCollector::_full_gc_cause = GCCause::_no_gc;
  
  //////////////////////////////////////////////////////////////////
  // In support of CMS/VM thread synchronization
  //////////////////////////////////////////////////////////////////
  // We split use of the CGC_lock into 2 "levels".
*** 1681,1696 ****
    acquire_control_and_collect(full, clear_all_soft_refs);
    _full_gcs_since_conc_gc++;
  
  }
  
! void CMSCollector::request_full_gc(unsigned int full_gc_count) {
    GenCollectedHeap* gch = GenCollectedHeap::heap();
    unsigned int gc_count = gch->total_full_collections();
    if (gc_count == full_gc_count) {
      MutexLockerEx y(CGC_lock, Mutex::_no_safepoint_check_flag);
      _full_gc_requested = true;
      CGC_lock->notify();   // nudge CMS thread
    } else {
      assert(gc_count > full_gc_count, "Error: causal loop");
    }
  }
--- 1682,1698 ----
    acquire_control_and_collect(full, clear_all_soft_refs);
    _full_gcs_since_conc_gc++;
  
  }
  
! void CMSCollector::request_full_gc(unsigned int full_gc_count, GCCause::Cause cause) {
    GenCollectedHeap* gch = GenCollectedHeap::heap();
    unsigned int gc_count = gch->total_full_collections();
    if (gc_count == full_gc_count) {
      MutexLockerEx y(CGC_lock, Mutex::_no_safepoint_check_flag);
      _full_gc_requested = true;
+     _full_gc_cause = cause;
      CGC_lock->notify();   // nudge CMS thread
    } else {
      assert(gc_count > full_gc_count, "Error: causal loop");
    }
  }
*** 2203,2221 ****
        assert(!_foregroundGCShouldWait, "Should be clear");
        return;
      } else {
        assert(_collectorState == Idling, "Should be idling before start.");
        _collectorState = InitialMarking;
!       register_gc_start(GCCause::_cms_concurrent_mark);
        // Reset the expansion cause, now that we are about to begin
        // a new cycle.
        clear_expansion_cause();
      }
      // Decide if we want to enable class unloading as part of the
      // ensuing concurrent GC cycle.
      update_should_unload_classes();
      _full_gc_requested = false;           // acks all outstanding full gc requests
      // Signal that we are about to start a collection
      gch->increment_total_full_collections();  // ... starting a collection cycle
      _collection_count_start = gch->total_full_collections();
    }
  
--- 2205,2226 ----
        assert(!_foregroundGCShouldWait, "Should be clear");
        return;
      } else {
        assert(_collectorState == Idling, "Should be idling before start.");
        _collectorState = InitialMarking;
!       GCCause::Cause cause =
!         _full_gc_requested ? _full_gc_cause : GCCause::_cms_concurrent_mark;
!       register_gc_start(cause);
        // Reset the expansion cause, now that we are about to begin
        // a new cycle.
        clear_expansion_cause();
      }
      // Decide if we want to enable class unloading as part of the
      // ensuing concurrent GC cycle.
      update_should_unload_classes();
      _full_gc_requested = false;           // acks all outstanding full gc requests
+     _full_gc_cause = GCCause::_no_gc;
      // Signal that we are about to start a collection
      gch->increment_total_full_collections();  // ... starting a collection cycle
      _collection_count_start = gch->total_full_collections();
    }