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

rev 8070 : imported patch gencollected_heap_cleanup

*** 115,125 ****
  }
  
  void ParScanThreadState::scan_partial_array_and_push_remainder(oop old) {
    assert(old->is_objArray(), "must be obj array");
    assert(old->is_forwarded(), "must be forwarded");
!   assert(Universe::heap()->is_in_reserved(old), "must be in heap.");
    assert(!old_gen()->is_in(old), "must be in young generation.");
  
    objArrayOop obj = objArrayOop(old->forwardee());
    // Process ParGCArrayScanChunk elements now
    // and push the remainder back onto queue
--- 115,125 ----
  }
  
  void ParScanThreadState::scan_partial_array_and_push_remainder(oop old) {
    assert(old->is_objArray(), "must be obj array");
    assert(old->is_forwarded(), "must be forwarded");
!   assert(GenCollectedHeap::heap()->is_in_reserved(old), "must be in heap.");
    assert(!old_gen()->is_in(old), "must be in young generation.");
  
    objArrayOop obj = objArrayOop(old->forwardee());
    // Process ParGCArrayScanChunk elements now
    // and push the remainder back onto queue
*** 197,209 ****
    // Transfer the most recent num_take_elems from the overflow
    // stack to our work queue.
    for (size_t i = 0; i != num_take_elems; i++) {
      oop cur = of_stack->pop();
      oop obj_to_push = cur->forwardee();
!     assert(Universe::heap()->is_in_reserved(cur), "Should be in heap");
      assert(!old_gen()->is_in_reserved(cur), "Should be in young gen");
!     assert(Universe::heap()->is_in_reserved(obj_to_push), "Should be in heap");
      if (should_be_partially_scanned(obj_to_push, cur)) {
        assert(arrayOop(cur)->length() == 0, "entire array remaining to be scanned");
        obj_to_push = cur;
      }
      bool ok = queue->push(obj_to_push);
--- 197,209 ----
    // Transfer the most recent num_take_elems from the overflow
    // stack to our work queue.
    for (size_t i = 0; i != num_take_elems; i++) {
      oop cur = of_stack->pop();
      oop obj_to_push = cur->forwardee();
!     assert(GenCollectedHeap::heap()->is_in_reserved(cur), "Should be in heap");
      assert(!old_gen()->is_in_reserved(cur), "Should be in young gen");
!     assert(GenCollectedHeap::heap()->is_in_reserved(obj_to_push), "Should be in heap");
      if (should_be_partially_scanned(obj_to_push, cur)) {
        assert(arrayOop(cur)->length() == 0, "entire array remaining to be scanned");
        obj_to_push = cur;
      }
      bool ok = queue->push(obj_to_push);
*** 693,703 ****
    }
  #endif // ASSERT
  
    _par_cl->do_oop_nv(p);
  
!   if (Universe::heap()->is_in_reserved(p)) {
      oop obj = oopDesc::load_decode_heap_oop_not_null(p);
      _rs->write_ref_field_gc_par(p, obj);
    }
  }
  
--- 693,703 ----
    }
  #endif // ASSERT
  
    _par_cl->do_oop_nv(p);
  
!   if (GenCollectedHeap::heap()->is_in_reserved(p)) {
      oop obj = oopDesc::load_decode_heap_oop_not_null(p);
      _rs->write_ref_field_gc_par(p, obj);
    }
  }
  
*** 720,730 ****
    }
  #endif // ASSERT
  
    _cl->do_oop_nv(p);
  
!   if (Universe::heap()->is_in_reserved(p)) {
      oop obj = oopDesc::load_decode_heap_oop_not_null(p);
      _rs->write_ref_field_gc_par(p, obj);
    }
  }
  
--- 720,730 ----
    }
  #endif // ASSERT
  
    _cl->do_oop_nv(p);
  
!   if (GenCollectedHeap::heap()->is_in_reserved(p)) {
      oop obj = oopDesc::load_decode_heap_oop_not_null(p);
      _rs->write_ref_field_gc_par(p, obj);
    }
  }
  
*** 819,830 ****
  
  
  void ParNewRefProcTaskExecutor::execute(ProcessTask& task)
  {
    GenCollectedHeap* gch = GenCollectedHeap::heap();
-   assert(gch->kind() == CollectedHeap::GenCollectedHeap,
-          "not a generational heap");
    FlexibleWorkGang* workers = gch->workers();
    assert(workers != NULL, "Need parallel worker threads.");
    _state_set.reset(workers->active_workers(), _generation.promotion_failed());
    ParNewRefProcTaskProxy rp_task(task, _generation, *_generation.next_gen(),
                                   _generation.reserved().end(), _state_set);
--- 819,828 ----
*** 895,905 ****
    // Single threaded code may have reported promotion failure to the global state
    if (_promotion_failed_info.has_failed()) {
      _gc_tracer.report_promotion_failed(_promotion_failed_info);
    }
    // Reset the PromotionFailureALot counters.
!   NOT_PRODUCT(Universe::heap()->reset_promotion_should_fail();)
  }
  
  void ParNewGeneration::collect(bool   full,
                                 bool   clear_all_soft_refs,
                                 size_t size,
--- 893,903 ----
    // Single threaded code may have reported promotion failure to the global state
    if (_promotion_failed_info.has_failed()) {
      _gc_tracer.report_promotion_failed(_promotion_failed_info);
    }
    // Reset the PromotionFailureALot counters.
!   NOT_PRODUCT(gch->reset_promotion_should_fail();)
  }
  
  void ParNewGeneration::collect(bool   full,
                                 bool   clear_all_soft_refs,
                                 size_t size,
*** 908,919 ****
  
    GenCollectedHeap* gch = GenCollectedHeap::heap();
  
    _gc_timer->register_gc_start();
  
-   assert(gch->kind() == CollectedHeap::GenCollectedHeap,
-     "not a CMS generational heap");
    AdaptiveSizePolicy* size_policy = gch->gen_policy()->size_policy();
    FlexibleWorkGang* workers = gch->workers();
    assert(workers != NULL, "Need workgang for parallel work");
    int active_workers =
        AdaptiveSizePolicy::calc_active_workers(workers->total_workers(),
--- 906,915 ----
*** 1188,1198 ****
      old->forward_to(new_obj);
      forward_ptr = NULL;
    } else {
      // Is in to-space; do copying ourselves.
      Copy::aligned_disjoint_words((HeapWord*)old, (HeapWord*)new_obj, sz);
!     assert(Universe::heap()->is_in_reserved(new_obj), "illegal forwarding pointer value.");
      forward_ptr = old->forward_to_atomic(new_obj);
      // Restore the mark word copied above.
      new_obj->set_mark(m);
      // Increment age if obj still in new generation
      new_obj->incr_age();
--- 1184,1194 ----
      old->forward_to(new_obj);
      forward_ptr = NULL;
    } else {
      // Is in to-space; do copying ourselves.
      Copy::aligned_disjoint_words((HeapWord*)old, (HeapWord*)new_obj, sz);
!     assert(GenCollectedHeap::heap()->is_in_reserved(new_obj), "illegal forwarding pointer value.");
      forward_ptr = old->forward_to_atomic(new_obj);
      // Restore the mark word copied above.
      new_obj->set_mark(m);
      // Increment age if obj still in new generation
      new_obj->incr_age();