src/share/vm/gc/g1/g1EvacStats.cpp

@@ -23,25 +23,27 @@
  */
 
 #include "precompiled.hpp"
 #include "gc/g1/g1EvacStats.hpp"
 #include "gc/shared/gcId.hpp"
+#include "logging/log.hpp"
 #include "trace/tracing.hpp"
 
 void G1EvacStats::adjust_desired_plab_sz() {
-  if (PrintPLAB) {
-    gclog_or_tty->print(" (allocated = " SIZE_FORMAT " wasted = " SIZE_FORMAT " "
+  if (!ResizePLAB) {
+    log_debug(gc, plab)(" (allocated = " SIZE_FORMAT " wasted = " SIZE_FORMAT " "
                         "unused = " SIZE_FORMAT " used = " SIZE_FORMAT " "
                         "undo_waste = " SIZE_FORMAT " region_end_waste = " SIZE_FORMAT " "
                         "regions filled = %u direct_allocated = " SIZE_FORMAT " "
                         "failure_used = " SIZE_FORMAT " failure_waste = " SIZE_FORMAT ") ",
                         _allocated, _wasted, _unused, used(), _undo_wasted, _region_end_waste,
                         _regions_filled, _direct_allocated, _failure_used, _failure_waste);
+    // Clear accumulators for next round.
+    reset();
+    return;
   }
 
-  if (ResizePLAB) {
-
     assert(is_object_aligned(max_size()) && min_size() <= max_size(),
            "PLAB clipping computation may be incorrect");
 
     if (_allocated == 0) {
       assert((_unused == 0),

@@ -101,16 +103,20 @@
     plab_sz = MAX2(min_size(), (size_t)_filter.average());
     plab_sz = MIN2(max_size(), plab_sz);
     plab_sz = align_object_size(plab_sz);
     // Latch the result
     _desired_net_plab_sz = plab_sz;
-    if (PrintPLAB) {
-      gclog_or_tty->print(" (plab_sz = " SIZE_FORMAT " desired_plab_sz = " SIZE_FORMAT ") ", cur_plab_sz, plab_sz);
-    }
-  }
-  if (PrintPLAB) {
-    gclog_or_tty->cr();
-  }
+
+  log_debug(gc, plab)(" (allocated = " SIZE_FORMAT " wasted = " SIZE_FORMAT " "
+                      "unused = " SIZE_FORMAT " used = " SIZE_FORMAT " "
+                      "undo_waste = " SIZE_FORMAT " region_end_waste = " SIZE_FORMAT " "
+                      "regions filled = %u direct_allocated = " SIZE_FORMAT " "
+                      "failure_used = " SIZE_FORMAT " failure_waste = " SIZE_FORMAT ") "
+                      " (plab_sz = " SIZE_FORMAT " desired_plab_sz = " SIZE_FORMAT ")",
+                      _allocated, _wasted, _unused, used(), _undo_wasted, _region_end_waste,
+                      _regions_filled, _direct_allocated, _failure_used, _failure_waste,
+                      cur_plab_sz, plab_sz);
+
   // Clear accumulators for next round.
   reset();
 }