# HG changeset patch # User mgerdin # Date 1423235287 -3600 # Fri Feb 06 16:08:07 2015 +0100 # Node ID f2feb5a0432fa67722e080058307008729e1220f # Parent a22252e998fca4c8d6d4433951129fa1e33d4c10 8072693: [BACKOUT] GCCause should distinguish jcmd GC.run from System.gc() Reviewed-by: diff --git a/src/share/vm/gc_interface/gcCause.cpp b/src/share/vm/gc_interface/gcCause.cpp --- a/src/share/vm/gc_interface/gcCause.cpp +++ b/src/share/vm/gc_interface/gcCause.cpp @@ -103,9 +103,6 @@ case _last_ditch_collection: return "Last ditch collection"; - case _dcmd_gc_run: - return "Diagnostic Command"; - case _last_gc_cause: return "ILLEGAL VALUE - last gc cause - ILLEGAL VALUE"; diff --git a/src/share/vm/gc_interface/gcCause.hpp b/src/share/vm/gc_interface/gcCause.hpp --- a/src/share/vm/gc_interface/gcCause.hpp +++ b/src/share/vm/gc_interface/gcCause.hpp @@ -74,9 +74,6 @@ _g1_humongous_allocation, _last_ditch_collection, - - _dcmd_gc_run, - _last_gc_cause }; diff --git a/src/share/vm/services/diagnosticCommand.cpp b/src/share/vm/services/diagnosticCommand.cpp --- a/src/share/vm/services/diagnosticCommand.cpp +++ b/src/share/vm/services/diagnosticCommand.cpp @@ -267,7 +267,7 @@ void SystemGCDCmd::execute(DCmdSource source, TRAPS) { if (!DisableExplicitGC) { - Universe::heap()->collect(GCCause::_dcmd_gc_run); + Universe::heap()->collect(GCCause::_java_lang_system_gc); } else { output()->print_cr("Explicit GC is disabled, no GC has been performed."); }