src/share/vm/gc/g1/g1ParScanThreadState.hpp

rev 9080 : imported patch move-code
rev 9081 : imported patch rootclosureset
rev 9083 : imported patch erik-review

*** 28,38 ****
  #include "gc/g1/dirtyCardQueue.hpp"
  #include "gc/g1/g1CollectedHeap.hpp"
  #include "gc/g1/g1CollectorPolicy.hpp"
  #include "gc/g1/g1OopClosures.hpp"
  #include "gc/g1/g1RemSet.hpp"
! #include "gc/g1/g1RootClosureSet.hpp"
  #include "gc/g1/g1SATBCardTableModRefBS.hpp"
  #include "gc/shared/ageTable.hpp"
  #include "memory/allocation.hpp"
  #include "oops/oop.hpp"
  
--- 28,38 ----
  #include "gc/g1/dirtyCardQueue.hpp"
  #include "gc/g1/g1CollectedHeap.hpp"
  #include "gc/g1/g1CollectorPolicy.hpp"
  #include "gc/g1/g1OopClosures.hpp"
  #include "gc/g1/g1RemSet.hpp"
! #include "gc/g1/g1RootClosures.hpp"
  #include "gc/g1/g1SATBCardTableModRefBS.hpp"
  #include "gc/shared/ageTable.hpp"
  #include "memory/allocation.hpp"
  #include "oops/oop.hpp"
  
*** 44,54 ****
   private:
    G1CollectedHeap* _g1h;
    RefToScanQueue*  _refs;
    DirtyCardQueue   _dcq;
    G1SATBCardTableModRefBS* _ct_bs;
!   G1EvacuationRootClosureSet* _closures;
  
    G1PLABAllocator*  _plab_allocator;
  
    ageTable          _age_table;
    InCSetState       _dest[InCSetState::Num];
--- 44,54 ----
   private:
    G1CollectedHeap* _g1h;
    RefToScanQueue*  _refs;
    DirtyCardQueue   _dcq;
    G1SATBCardTableModRefBS* _ct_bs;
!   G1EvacuationRootClosures* _closures;
  
    G1PLABAllocator*  _plab_allocator;
  
    ageTable          _age_table;
    InCSetState       _dest[InCSetState::Num];
*** 80,90 ****
      assert(_dest[original.value()].is_valid_gen(),
             "Dest state is invalid: " CSETSTATE_FORMAT, _dest[original.value()].value());
      return _dest[original.value()];
    }
  
!   G1EvacuationRootClosureSet* new_root_closure_set();
   public:
    G1ParScanThreadState(G1CollectedHeap* g1h, uint worker_id, size_t young_cset_length);
    ~G1ParScanThreadState();
  
    void set_ref_processor(ReferenceProcessor* rp) { _scanner.set_ref_processor(rp); }
--- 80,90 ----
      assert(_dest[original.value()].is_valid_gen(),
             "Dest state is invalid: " CSETSTATE_FORMAT, _dest[original.value()].value());
      return _dest[original.value()];
    }
  
!   G1EvacuationRootClosures* new_root_closures();
   public:
    G1ParScanThreadState(G1CollectedHeap* g1h, uint worker_id, size_t young_cset_length);
    ~G1ParScanThreadState();
  
    void set_ref_processor(ReferenceProcessor* rp) { _scanner.set_ref_processor(rp); }
*** 109,119 ****
          dirty_card_queue().enqueue((jbyte*)ctbs()->byte_for_index(card_index));
        }
      }
    }
  
!   G1EvacuationRootClosureSet* closures() { return _closures; }
    uint worker_id() { return _worker_id; }
  
    // Returns the current amount of waste due to alignment or not being able to fit
    // objects within LABs and the undo waste.
    virtual void waste(size_t& wasted, size_t& undo_wasted);
--- 109,119 ----
          dirty_card_queue().enqueue((jbyte*)ctbs()->byte_for_index(card_index));
        }
      }
    }
  
!   G1EvacuationRootClosures* closures() { return _closures; }
    uint worker_id() { return _worker_id; }
  
    // Returns the current amount of waste due to alignment or not being able to fit
    // objects within LABs and the undo waste.
    virtual void waste(size_t& wasted, size_t& undo_wasted);