src/share/vm/gc_implementation/parNew/parCardTableModRefBS.cpp

rev 8070 : imported patch gencollected_heap_cleanup

*** 25,36 ****
  #include "precompiled.hpp"
  #include "gc_interface/collectedHeap.hpp"
  #include "memory/allocation.inline.hpp"
  #include "memory/cardTableModRefBS.hpp"
  #include "memory/cardTableRS.hpp"
  #include "memory/space.inline.hpp"
- #include "memory/universe.hpp"
  #include "oops/oop.inline.hpp"
  #include "runtime/java.hpp"
  #include "runtime/mutexLocker.hpp"
  #include "runtime/orderAccess.inline.hpp"
  #include "runtime/virtualspace.hpp"
--- 25,36 ----
  #include "precompiled.hpp"
  #include "gc_interface/collectedHeap.hpp"
  #include "memory/allocation.inline.hpp"
  #include "memory/cardTableModRefBS.hpp"
  #include "memory/cardTableRS.hpp"
+ #include "memory/genCollectedHeap.hpp"
  #include "memory/space.inline.hpp"
  #include "oops/oop.inline.hpp"
  #include "runtime/java.hpp"
  #include "runtime/mutexLocker.hpp"
  #include "runtime/orderAccess.inline.hpp"
  #include "runtime/virtualspace.hpp"
*** 447,457 ****
    // freed "_lowest_non_clean" array.)
  
    // Do a dirty read here. If we pass the conditional then take the rare
    // event lock and do the read again in case some other thread had already
    // succeeded and done the resize.
!   int cur_collection = Universe::heap()->total_collections();
    if (_last_LNC_resizing_collection[i] != cur_collection) {
      MutexLocker x(ParGCRareEvent_lock);
      if (_last_LNC_resizing_collection[i] != cur_collection) {
        if (_lowest_non_clean[i] == NULL ||
            n_chunks != _lowest_non_clean_chunk_size[i]) {
--- 447,457 ----
    // freed "_lowest_non_clean" array.)
  
    // Do a dirty read here. If we pass the conditional then take the rare
    // event lock and do the read again in case some other thread had already
    // succeeded and done the resize.
!   int cur_collection = GenCollectedHeap::heap()->total_collections();
    if (_last_LNC_resizing_collection[i] != cur_collection) {
      MutexLocker x(ParGCRareEvent_lock);
      if (_last_LNC_resizing_collection[i] != cur_collection) {
        if (_lowest_non_clean[i] == NULL ||
            n_chunks != _lowest_non_clean_chunk_size[i]) {