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

rev 13113 : imported patch 8181917-refactor-ul-logstream
rev 13114 : imported patch 8181917-refactor-ul-logstream-changes-2

*** 30,40 ****
  #include "gc/shared/blockOffsetTable.inline.hpp"
  #include "gc/shared/collectedHeap.inline.hpp"
  #include "gc/shared/genCollectedHeap.hpp"
  #include "gc/shared/space.inline.hpp"
  #include "gc/shared/spaceDecorator.hpp"
! #include "logging/logStream.inline.hpp"
  #include "memory/allocation.inline.hpp"
  #include "memory/resourceArea.hpp"
  #include "memory/universe.inline.hpp"
  #include "oops/oop.inline.hpp"
  #include "runtime/globals.hpp"
--- 30,41 ----
  #include "gc/shared/blockOffsetTable.inline.hpp"
  #include "gc/shared/collectedHeap.inline.hpp"
  #include "gc/shared/genCollectedHeap.hpp"
  #include "gc/shared/space.inline.hpp"
  #include "gc/shared/spaceDecorator.hpp"
! #include "logging/log.hpp"
! #include "logging/logStream.hpp"
  #include "memory/allocation.inline.hpp"
  #include "memory/resourceArea.hpp"
  #include "memory/universe.inline.hpp"
  #include "oops/oop.inline.hpp"
  #include "runtime/globals.hpp"
*** 2194,2205 ****
        log.error("Livelock: no rank reduction!");
        log.error(" Current:  addr = " PTR_FORMAT ", size = " SIZE_FORMAT ", obj = %s, live = %s \n"
                  " Previous: addr = " PTR_FORMAT ", size = " SIZE_FORMAT ", obj = %s, live = %s \n",
          p2i(addr),       res,        was_obj      ?"true":"false", was_live      ?"true":"false",
          p2i(_last_addr), _last_size, _last_was_obj?"true":"false", _last_was_live?"true":"false");
!       ResourceMark rm;
!       _sp->print_on(log.error_stream());
        guarantee(false, "Verification failed.");
      }
      _last_addr = addr;
      _last_size = res;
      _last_was_obj  = was_obj;
--- 2195,2206 ----
        log.error("Livelock: no rank reduction!");
        log.error(" Current:  addr = " PTR_FORMAT ", size = " SIZE_FORMAT ", obj = %s, live = %s \n"
                  " Previous: addr = " PTR_FORMAT ", size = " SIZE_FORMAT ", obj = %s, live = %s \n",
          p2i(addr),       res,        was_obj      ?"true":"false", was_live      ?"true":"false",
          p2i(_last_addr), _last_size, _last_was_obj?"true":"false", _last_was_live?"true":"false");
!       LogStream ls(log.error());
!       _sp->print_on(&ls);
        guarantee(false, "Verification failed.");
      }
      _last_addr = addr;
      _last_size = res;
      _last_was_obj  = was_obj;
*** 2369,2379 ****
      return;
    }
    AdaptiveFreeList<FreeChunk> total;
    log.print("end sweep# " SIZE_FORMAT, sweep_count);
    ResourceMark rm;
!   outputStream* out = log.stream();
    AdaptiveFreeList<FreeChunk>::print_labels_on(out, "size");
    size_t total_free = 0;
    for (size_t i = IndexSetStart; i < IndexSetSize; i += IndexSetStride) {
      const AdaptiveFreeList<FreeChunk> *fl = &_indexedFreeList[i];
      total_free += fl->count() * fl->size();
--- 2370,2381 ----
      return;
    }
    AdaptiveFreeList<FreeChunk> total;
    log.print("end sweep# " SIZE_FORMAT, sweep_count);
    ResourceMark rm;
!   LogStream ls(log);
!   outputStream* out = &ls;
    AdaptiveFreeList<FreeChunk>::print_labels_on(out, "size");
    size_t total_free = 0;
    for (size_t i = IndexSetStart; i < IndexSetSize; i += IndexSetStride) {
      const AdaptiveFreeList<FreeChunk> *fl = &_indexedFreeList[i];
      total_free += fl->count() * fl->size();