Mercurial > jdk8-mips64-public > hotspot / changeset

     1.1 --- a/src/share/vm/gc_implementation/g1/concurrentMark.cpp	Fri Jan 13 13:27:48 2012 -0800
     1.2 +++ b/src/share/vm/gc_implementation/g1/concurrentMark.cpp	Mon Jan 16 11:21:21 2012 +0100
     1.3 @@ -42,8 +42,7 @@
     1.4  #include "runtime/handles.inline.hpp"
     1.5  #include "runtime/java.hpp"
     1.6  
     1.7 -//
     1.8 -// CMS Bit Map Wrapper
     1.9 +// Concurrent marking bit map wrapper
    1.10  
    1.11  CMBitMapRO::CMBitMapRO(ReservedSpace rs, int shifter) :
    1.12    _bm((uintptr_t*)NULL,0),
    1.13 @@ -53,13 +52,13 @@
    1.14    ReservedSpace brs(ReservedSpace::allocation_align_size_up(
    1.15                       (_bmWordSize >> (_shifter + LogBitsPerByte)) + 1));
    1.16  
    1.17 -  guarantee(brs.is_reserved(), "couldn't allocate CMS bit map");
    1.18 +  guarantee(brs.is_reserved(), "couldn't allocate concurrent marking bit map");
    1.19    // For now we'll just commit all of the bit map up fromt.
    1.20    // Later on we'll try to be more parsimonious with swap.
    1.21    guarantee(_virtual_space.initialize(brs, brs.size()),
    1.22 -            "couldn't reseve backing store for CMS bit map");
    1.23 +            "couldn't reseve backing store for concurrent marking bit map");
    1.24    assert(_virtual_space.committed_size() == brs.size(),
    1.25 -         "didn't reserve backing store for all of CMS bit map?");
    1.26 +         "didn't reserve backing store for all of concurrent marking bit map?");
    1.27    _bm.set_map((uintptr_t*)_virtual_space.low());
    1.28    assert(_virtual_space.committed_size() << (_shifter + LogBitsPerByte) >=
    1.29           _bmWordSize, "inconsistency in bit map sizing");
    1.30 @@ -420,8 +419,6 @@
    1.31      assert(newOop->is_oop(), "Expected an oop");
    1.32      assert(bm == NULL || bm->isMarked((HeapWord*)newOop),
    1.33             "only grey objects on this stack");
    1.34 -    // iterate over the oops in this oop, marking and pushing
    1.35 -    // the ones in CMS generation.
    1.36      newOop->oop_iterate(cl);
    1.37      if (yield_after && _cm->do_yield_check()) {
    1.38        res = false;
    1.39 @@ -739,11 +736,6 @@
    1.40    ShouldNotReachHere();
    1.41  }
    1.42  
    1.43 -// This closure is used to mark refs into the g1 generation
    1.44 -// from external roots in the CMS bit map.
    1.45 -// Called at the first checkpoint.
    1.46 -//
    1.47 -
    1.48  void ConcurrentMark::clearNextBitmap() {
    1.49    G1CollectedHeap* g1h = G1CollectedHeap::heap();
    1.50    G1CollectorPolicy* g1p = g1h->g1_policy();
    1.51 @@ -3401,13 +3393,6 @@
    1.52    _parallel_workers->print_worker_threads_on(st);
    1.53  }
    1.54  
    1.55 -// Closures
    1.56 -// XXX: there seems to be a lot of code  duplication here;
    1.57 -// should refactor and consolidate the shared code.
    1.58 -
    1.59 -// This closure is used to mark refs into the CMS generation in
    1.60 -// the CMS bit map. Called at the first checkpoint.
    1.61 -
    1.62  // We take a break if someone is trying to stop the world.
    1.63  bool ConcurrentMark::do_yield_check(uint worker_id) {
    1.64    if (should_yield()) {

     2.1 --- a/src/share/vm/gc_implementation/g1/concurrentMark.hpp	Fri Jan 13 13:27:48 2012 -0800
     2.2 +++ b/src/share/vm/gc_implementation/g1/concurrentMark.hpp	Mon Jan 16 11:21:21 2012 +0100
     2.3 @@ -386,7 +386,7 @@
     2.4  
     2.5    FreeRegionList        _cleanup_list;
     2.6  
     2.7 -  // CMS marking support structures
     2.8 +  // Concurrent marking support structures
     2.9    CMBitMap                _markBitMap1;
    2.10    CMBitMap                _markBitMap2;
    2.11    CMBitMapRO*             _prevMarkBitMap; // completed mark bitmap