8072693: [BACKOUT] GCCause should distinguish jcmd GC.run from System.gc()
Reviewed-by: jwilhelm, tschatzl
--- a/hotspot/src/share/vm/gc_interface/gcCause.cpp Thu Feb 05 14:57:52 2015 -0800
+++ b/hotspot/src/share/vm/gc_interface/gcCause.cpp Fri Feb 06 16:24:25 2015 +0100
@@ -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";
--- a/hotspot/src/share/vm/gc_interface/gcCause.hpp Thu Feb 05 14:57:52 2015 -0800
+++ b/hotspot/src/share/vm/gc_interface/gcCause.hpp Fri Feb 06 16:24:25 2015 +0100
@@ -74,9 +74,6 @@
_g1_humongous_allocation,
_last_ditch_collection,
-
- _dcmd_gc_run,
-
_last_gc_cause
};
--- a/hotspot/src/share/vm/services/diagnosticCommand.cpp Thu Feb 05 14:57:52 2015 -0800
+++ b/hotspot/src/share/vm/services/diagnosticCommand.cpp Fri Feb 06 16:24:25 2015 +0100
@@ -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.");
}