hotspot/src/share/vm/gc_implementation/parNew/parOopClosures.hpp

Print this page
rev 611 : Merge

*** 27,100 **** // Closures for ParNewGeneration class ParScanThreadState; class ParNewGeneration; ! template<class E> class GenericTaskQueueSet; ! typedef GenericTaskQueueSet<oop> ObjToScanQueueSet; class ParallelTaskTerminator; class ParScanClosure: public OopsInGenClosure { ! protected: ParScanThreadState* _par_scan_state; ParNewGeneration* _g; HeapWord* _boundary; ! void do_oop_work(oop* p, bool gc_barrier, bool root_scan); ! ! void par_do_barrier(oop* p); ! ! public: ParScanClosure(ParNewGeneration* g, ParScanThreadState* par_scan_state); }; class ParScanWithBarrierClosure: public ParScanClosure { ! public: ! void do_oop(oop* p) { do_oop_work(p, true, false); } ! void do_oop_nv(oop* p) { do_oop_work(p, true, false); } ParScanWithBarrierClosure(ParNewGeneration* g, ParScanThreadState* par_scan_state) : ParScanClosure(g, par_scan_state) {} }; class ParScanWithoutBarrierClosure: public ParScanClosure { ! public: ParScanWithoutBarrierClosure(ParNewGeneration* g, ParScanThreadState* par_scan_state) : ParScanClosure(g, par_scan_state) {} ! void do_oop(oop* p) { do_oop_work(p, false, false); } ! void do_oop_nv(oop* p) { do_oop_work(p, false, false); } }; class ParRootScanWithBarrierTwoGensClosure: public ParScanClosure { ! public: ParRootScanWithBarrierTwoGensClosure(ParNewGeneration* g, ParScanThreadState* par_scan_state) : ParScanClosure(g, par_scan_state) {} ! void do_oop(oop* p) { do_oop_work(p, true, true); } }; class ParRootScanWithoutBarrierClosure: public ParScanClosure { ! public: ParRootScanWithoutBarrierClosure(ParNewGeneration* g, ParScanThreadState* par_scan_state) : ParScanClosure(g, par_scan_state) {} ! void do_oop(oop* p) { do_oop_work(p, false, true); } }; class ParScanWeakRefClosure: public ScanWeakRefClosure { ! protected: ParScanThreadState* _par_scan_state; ! public: ParScanWeakRefClosure(ParNewGeneration* g, ParScanThreadState* par_scan_state); ! void do_oop(oop* p); ! void do_oop_nv(oop* p); }; class ParEvacuateFollowersClosure: public VoidClosure { ParScanThreadState* _par_scan_state; ParScanThreadState* par_scan_state() { return _par_scan_state; } // We want to preserve the specific types here (rather than "OopClosure") // for later de-virtualization of do_oop calls. --- 27,107 ---- // Closures for ParNewGeneration class ParScanThreadState; class ParNewGeneration; ! typedef OopTaskQueueSet ObjToScanQueueSet; class ParallelTaskTerminator; class ParScanClosure: public OopsInGenClosure { ! protected: ParScanThreadState* _par_scan_state; ParNewGeneration* _g; HeapWord* _boundary; ! template <class T> void inline par_do_barrier(T* p); ! template <class T> void inline do_oop_work(T* p, bool gc_barrier, bool root_scan); ! public: ParScanClosure(ParNewGeneration* g, ParScanThreadState* par_scan_state); }; class ParScanWithBarrierClosure: public ParScanClosure { ! public: ParScanWithBarrierClosure(ParNewGeneration* g, ParScanThreadState* par_scan_state) : ParScanClosure(g, par_scan_state) {} + virtual void do_oop(oop* p); + virtual void do_oop(narrowOop* p); + inline void do_oop_nv(oop* p); + inline void do_oop_nv(narrowOop* p); }; class ParScanWithoutBarrierClosure: public ParScanClosure { ! public: ParScanWithoutBarrierClosure(ParNewGeneration* g, ParScanThreadState* par_scan_state) : ParScanClosure(g, par_scan_state) {} ! virtual void do_oop(oop* p); ! virtual void do_oop(narrowOop* p); ! inline void do_oop_nv(oop* p); ! inline void do_oop_nv(narrowOop* p); }; class ParRootScanWithBarrierTwoGensClosure: public ParScanClosure { ! public: ParRootScanWithBarrierTwoGensClosure(ParNewGeneration* g, ParScanThreadState* par_scan_state) : ParScanClosure(g, par_scan_state) {} ! virtual void do_oop(oop* p); ! virtual void do_oop(narrowOop* p); }; class ParRootScanWithoutBarrierClosure: public ParScanClosure { ! public: ParRootScanWithoutBarrierClosure(ParNewGeneration* g, ParScanThreadState* par_scan_state) : ParScanClosure(g, par_scan_state) {} ! virtual void do_oop(oop* p); ! virtual void do_oop(narrowOop* p); }; class ParScanWeakRefClosure: public ScanWeakRefClosure { ! protected: ParScanThreadState* _par_scan_state; ! template <class T> inline void do_oop_work(T* p); ! public: ParScanWeakRefClosure(ParNewGeneration* g, ParScanThreadState* par_scan_state); ! virtual void do_oop(oop* p); ! virtual void do_oop(narrowOop* p); ! inline void do_oop_nv(oop* p); ! inline void do_oop_nv(narrowOop* p); }; class ParEvacuateFollowersClosure: public VoidClosure { + private: ParScanThreadState* _par_scan_state; ParScanThreadState* par_scan_state() { return _par_scan_state; } // We want to preserve the specific types here (rather than "OopClosure") // for later de-virtualization of do_oop calls.
*** 122,139 **** ObjToScanQueueSet* _task_queues; ObjToScanQueueSet* task_queues() { return _task_queues; } ParallelTaskTerminator* _terminator; ParallelTaskTerminator* terminator() { return _terminator; } ! ! public: ParEvacuateFollowersClosure( ParScanThreadState* par_scan_state_, ParScanWithoutBarrierClosure* to_space_closure_, ParScanWithBarrierClosure* old_gen_closure_, ParRootScanWithoutBarrierClosure* to_space_root_closure_, ParNewGeneration* par_gen_, ParRootScanWithBarrierTwoGensClosure* old_gen_root_closure_, ObjToScanQueueSet* task_queues_, ParallelTaskTerminator* terminator_); ! void do_void(); }; --- 129,145 ---- ObjToScanQueueSet* _task_queues; ObjToScanQueueSet* task_queues() { return _task_queues; } ParallelTaskTerminator* _terminator; ParallelTaskTerminator* terminator() { return _terminator; } ! public: ParEvacuateFollowersClosure( ParScanThreadState* par_scan_state_, ParScanWithoutBarrierClosure* to_space_closure_, ParScanWithBarrierClosure* old_gen_closure_, ParRootScanWithoutBarrierClosure* to_space_root_closure_, ParNewGeneration* par_gen_, ParRootScanWithBarrierTwoGensClosure* old_gen_root_closure_, ObjToScanQueueSet* task_queues_, ParallelTaskTerminator* terminator_); ! virtual void do_void(); };