From 2563f216c9d6270c0a7a9cc58552e063fb5d0b0f Mon Sep 17 00:00:00 2001
From: tonyp <unknown>
Date: Tue, 17 Aug 2010 14:40:00 -0400
Subject: [PATCH] 6975964: G1: print out a more descriptive message for
 evacuation failure when +PrintGCDetails is set Summary: we're renaming
 "evacuation failure" to "to-space overflow". I'm also piggy-backing a small
 additional change which removes the "Mark closure took..." output.
 Reviewed-by: ysr, johnc

---
 src/share/vm/gc_implementation/g1/concurrentMark.cpp  | 3 ---
 src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp | 4 ++--
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/share/vm/gc_implementation/g1/concurrentMark.cpp b/src/share/vm/gc_implementation/g1/concurrentMark.cpp
index ddbad890d..4dd197ebd 100644
--- a/src/share/vm/gc_implementation/g1/concurrentMark.cpp
+++ b/src/share/vm/gc_implementation/g1/concurrentMark.cpp
@@ -2586,9 +2586,6 @@ void ConcurrentMark::complete_marking_in_collection_set() {
   double end_time = os::elapsedTime();
   double elapsed_time_ms = (end_time - start) * 1000.0;
   g1h->g1_policy()->record_mark_closure_time(elapsed_time_ms);
-  if (PrintGCDetails) {
-    gclog_or_tty->print_cr("Mark closure took %5.2f ms.", elapsed_time_ms);
-  }
 
   ClearMarksInHRClosure clr(nextMarkBitMap());
   g1h->collection_set_iterate(&clr);
diff --git a/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp b/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp
index 0e48e05b4..e71c10978 100644
--- a/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp
+++ b/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp
@@ -3608,7 +3608,7 @@ void G1CollectedHeap::handle_evacuation_failure_common(oop old, markOop m) {
   if (!r->evacuation_failed()) {
     r->set_evacuation_failed(true);
     if (G1PrintHeapRegions) {
-      gclog_or_tty->print("evacuation failed in heap region "PTR_FORMAT" "
+      gclog_or_tty->print("overflow in heap region "PTR_FORMAT" "
                           "["PTR_FORMAT","PTR_FORMAT")\n",
                           r, r->bottom(), r->end());
     }
@@ -4321,7 +4321,7 @@ void G1CollectedHeap::evacuate_collection_set() {
   if (evacuation_failed()) {
     remove_self_forwarding_pointers();
     if (PrintGCDetails) {
-      gclog_or_tty->print(" (evacuation failed)");
+      gclog_or_tty->print(" (to-space overflow)");
     } else if (PrintGC) {
       gclog_or_tty->print("--");
     }
-- 
GitLab