src/share/vm/gc/cms/compactibleFreeListSpace.hpp

@@ -27,10 +27,11 @@
 
 #include "gc/cms/adaptiveFreeList.hpp"
 #include "gc/cms/promotionInfo.hpp"
 #include "gc/shared/blockOffsetTable.hpp"
 #include "gc/shared/space.hpp"
+#include "logging/log.hpp"
 #include "memory/binaryTreeDictionary.hpp"
 #include "memory/freeList.hpp"
 
 // Classes in support of keeping track of promotions into a non-Contiguous
 // space, in this case a CompactibleFreeListSpace.

@@ -273,12 +274,12 @@
   void       refillLinearAllocBlocksIfNeeded();
 
   void       verify_objects_initialized() const;
 
   // Statistics reporting helper functions
-  void       reportFreeListStatistics() const;
-  void       reportIndexedFreeListStatistics() const;
+  void       reportFreeListStatistics(const char* title) const;
+  void       reportIndexedFreeListStatistics(outputStream* st) const;
   size_t     maxChunkSizeInIndexedFreeLists() const;
   size_t     numFreeBlocksInIndexedFreeLists() const;
   // Accessor
   HeapWord* unallocated_block() const {
     if (BlockOffsetArrayUseUnallocatedBlock) {

@@ -448,16 +449,14 @@
 
   // Iteration support for sweeping
   void save_sweep_limit() {
     _sweep_limit = BlockOffsetArrayUseUnallocatedBlock ?
                    unallocated_block() : end();
-    if (CMSTraceSweeper) {
-      gclog_or_tty->print_cr(">>>>> Saving sweep limit " PTR_FORMAT
+    log_develop_trace(gc, sweep)(">>>>> Saving sweep limit " PTR_FORMAT
                              "  for space [" PTR_FORMAT "," PTR_FORMAT ") <<<<<<",
                              p2i(_sweep_limit), p2i(bottom()), p2i(end()));
     }
-  }
   NOT_PRODUCT(
     void clear_sweep_limit() { _sweep_limit = NULL; }
   )
   HeapWord* sweep_limit() { return _sweep_limit; }