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

rev 13105 : imported patch 8181917-refactor-ul-logstream-alt1-callsite-changes

@@ -21,11 +21,10 @@
  * questions.
  *
  */
 
 #include "precompiled.hpp"
-#include "logging/log.hpp"
 #include "gc/g1/concurrentMarkThread.hpp"
 #include "gc/g1/g1Allocator.inline.hpp"
 #include "gc/g1/g1CollectedHeap.hpp"
 #include "gc/g1/g1CollectedHeap.inline.hpp"
 #include "gc/g1/g1HeapVerifier.hpp"

@@ -34,10 +33,12 @@
 #include "gc/g1/g1RootProcessor.hpp"
 #include "gc/g1/heapRegion.hpp"
 #include "gc/g1/heapRegion.inline.hpp"
 #include "gc/g1/heapRegionRemSet.hpp"
 #include "gc/g1/g1StringDedup.hpp"
+#include "logging/log.hpp"
+#include "logging/logStream.hpp"
 #include "memory/resourceArea.hpp"
 #include "oops/oop.inline.hpp"
 
 class VerifyRootsClosure: public OopClosure {
 private:

@@ -64,11 +65,13 @@
         log.info("Root location " PTR_FORMAT " points to dead obj " PTR_FORMAT, p2i(p), p2i(obj));
         if (_vo == VerifyOption_G1UseMarkWord) {
           log.error("  Mark word: " PTR_FORMAT, p2i(obj->mark()));
         }
         ResourceMark rm;
-        obj->print_on(log.error_stream());
+        // Unconditional write?
+        LogStream ls(log.error());
+        obj->print_on(&ls);
         _failures = true;
       }
     }
   }
 

@@ -406,11 +409,13 @@
     // It helps to have the per-region information in the output to
     // help us track down what went wrong. This is why we call
     // print_extended_on() instead of print_on().
     Log(gc, verify) log;
     ResourceMark rm;
-    _g1h->print_extended_on(log.error_stream());
+    // Unconditional write?
+    LogStream ls(log.error());
+    _g1h->print_extended_on(&ls);
   }
   guarantee(!failures, "there should not have been any failures");
 }
 
 // Heap region set verification