From ec90516522e4e810b51e0a2d098b5e941d1aeb5e Mon Sep 17 00:00:00 2001
From: stefank <unknown>
Date: Fri, 13 Sep 2013 22:23:48 +0200
Subject: [PATCH] 8024751: Fix bugs in TraceMetadata Reviewed-by: jmasa,
 brutisso

---
 src/share/vm/memory/metaspace.cpp | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/share/vm/memory/metaspace.cpp b/src/share/vm/memory/metaspace.cpp
index 9d7834a56..9b73b6303 100644
--- a/src/share/vm/memory/metaspace.cpp
+++ b/src/share/vm/memory/metaspace.cpp
@@ -2366,10 +2366,10 @@ Metachunk* SpaceManager::get_new_chunk(size_t word_size,
                                              grow_chunks_by_words,
                                              medium_chunk_bunch());
 
-  if (TraceMetadataHumongousAllocation &&
+  if (TraceMetadataHumongousAllocation && next != NULL &&
       SpaceManager::is_humongous(next->word_size())) {
-    gclog_or_tty->print_cr("  new humongous chunk word size " PTR_FORMAT,
-                           next->word_size());
+    gclog_or_tty->print_cr("  new humongous chunk word size "
+                           PTR_FORMAT, next->word_size());
   }
 
   return next;
@@ -2487,9 +2487,6 @@ void SpaceManager::dump(outputStream* const out) const {
          curr = curr->next()) {
       out->print("%d) ", i++);
       curr->print_on(out);
-      if (TraceMetadataChunkAllocation && Verbose) {
-        block_freelists()->print_on(out);
-      }
       curr_total += curr->word_size();
       used += curr->used_word_size();
       capacity += curr->capacity_word_size();
@@ -2497,6 +2494,10 @@ void SpaceManager::dump(outputStream* const out) const {
     }
   }
 
+  if (TraceMetadataChunkAllocation && Verbose) {
+    block_freelists()->print_on(out);
+  }
+
   size_t free = current_chunk() == NULL ? 0 : current_chunk()->free_word_size();
   // Free space isn't wasted.
   waste -= free;
-- 
GitLab