Mercurial > jdk8-mips64-public > hotspot / changeset

     1.1 --- a/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp	Thu Aug 07 22:28:16 2014 +0200
     1.2 +++ b/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp	Thu Aug 07 22:28:53 2014 +0200
     1.3 @@ -2589,15 +2589,12 @@
     1.4  
     1.5  // Iteration functions.
     1.6  
     1.7 -// Iterates an OopClosure over all ref-containing fields of objects
     1.8 -// within a HeapRegion.
     1.9 +// Applies an ExtendedOopClosure onto all references of objects within a HeapRegion.
    1.10  
    1.11  class IterateOopClosureRegionClosure: public HeapRegionClosure {
    1.12 -  MemRegion _mr;
    1.13    ExtendedOopClosure* _cl;
    1.14  public:
    1.15 -  IterateOopClosureRegionClosure(MemRegion mr, ExtendedOopClosure* cl)
    1.16 -    : _mr(mr), _cl(cl) {}
    1.17 +  IterateOopClosureRegionClosure(ExtendedOopClosure* cl) : _cl(cl) {}
    1.18    bool doHeapRegion(HeapRegion* r) {
    1.19      if (!r->continuesHumongous()) {
    1.20        r->oop_iterate(_cl);
    1.21 @@ -2607,12 +2604,7 @@
    1.22  };
    1.23  
    1.24  void G1CollectedHeap::oop_iterate(ExtendedOopClosure* cl) {
    1.25 -  IterateOopClosureRegionClosure blk(_g1_committed, cl);
    1.26 -  heap_region_iterate(&blk);
    1.27 -}
    1.28 -
    1.29 -void G1CollectedHeap::oop_iterate(MemRegion mr, ExtendedOopClosure* cl) {
    1.30 -  IterateOopClosureRegionClosure blk(mr, cl);
    1.31 +  IterateOopClosureRegionClosure blk(cl);
    1.32    heap_region_iterate(&blk);
    1.33  }
    1.34  
    1.35 @@ -4812,11 +4804,6 @@
    1.36    Mutex _stats_lock;
    1.37    Mutex* stats_lock() { return &_stats_lock; }
    1.38  
    1.39 -  size_t getNCards() {
    1.40 -    return (_g1h->capacity() + G1BlockOffsetSharedArray::N_bytes - 1)
    1.41 -      / G1BlockOffsetSharedArray::N_bytes;
    1.42 -  }
    1.43 -
    1.44  public:
    1.45    G1ParTask(G1CollectedHeap* g1h, RefToScanQueueSet *task_queues)
    1.46      : AbstractGangTask("G1 collection"),

     2.1 --- a/src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp	Thu Aug 07 22:28:16 2014 +0200
     2.2 +++ b/src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp	Thu Aug 07 22:28:53 2014 +0200
     2.3 @@ -1380,9 +1380,6 @@
     2.4    // "cl.do_oop" on each.
     2.5    virtual void oop_iterate(ExtendedOopClosure* cl);
     2.6  
     2.7 -  // Same as above, restricted to a memory region.
     2.8 -  void oop_iterate(MemRegion mr, ExtendedOopClosure* cl);
     2.9 -
    2.10    // Iterate over all objects, calling "cl.do_object" on each.
    2.11    virtual void object_iterate(ObjectClosure* cl);
    2.12