archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-21 11:34:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8144584: Change FilterIntoCSClosure to inherit OopClosure

Browse source 
Reviewed-by: kbarrett, mgerdin
This commit is contained in:
Stefan Johansson 2015-12-11 17:49:40 +01:00
parent 27c56ca8af
commit 79ddc15248
4 changed files with 7 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

15
hotspot/src/share/vm/gc/g1/g1OopClosures.hpp
View file

@ -144,20 +144,15 @@ class G1KlassScanClosure : public KlassClosure {
void do_klass(Klass* klass); void do_klass(Klass* klass);
}; };
class FilterIntoCSClosure: public ExtendedOopClosure { class FilterIntoCSClosure: public OopClosure {
G1CollectedHeap* _g1; G1CollectedHeap* _g1;
OopClosure* _oc; OopClosure* _oc;
DirtyCardToOopClosure* _dcto_cl;
public: public:
FilterIntoCSClosure( DirtyCardToOopClosure* dcto_cl, FilterIntoCSClosure(G1CollectedHeap* g1, OopClosure* oc) : _g1(g1), _oc(oc) { }
G1CollectedHeap* g1,
OopClosure* oc) :
_dcto_cl(dcto_cl), _g1(g1), _oc(oc) { }
template <class T> void do_oop_nv(T* p); template <class T> void do_oop_work(T* p);
virtual void do_oop(oop* p) { do_oop_nv(p); } virtual void do_oop(oop* p) { do_oop_work(p); }
virtual void do_oop(narrowOop* p) { do_oop_nv(p); } virtual void do_oop(narrowOop* p) { do_oop_work(p); }
bool apply_to_weak_ref_discovered_field() { return true; }
}; };
class FilterOutOfRegionClosure: public ExtendedOopClosure { class FilterOutOfRegionClosure: public ExtendedOopClosure {

2
hotspot/src/share/vm/gc/g1/g1OopClosures.inline.hpp
View file

@ -42,7 +42,7 @@
*/ */
template <class T> template <class T>
inline void FilterIntoCSClosure::do_oop_nv(T* p) { inline void FilterIntoCSClosure::do_oop_work(T* p) {
T heap_oop = oopDesc::load_heap_oop(p); T heap_oop = oopDesc::load_heap_oop(p);
if (!oopDesc::is_null(heap_oop) && if (!oopDesc::is_null(heap_oop) &&
_g1->is_in_cset_or_humongous(oopDesc::decode_heap_oop_not_null(heap_oop))) { _g1->is_in_cset_or_humongous(oopDesc::decode_heap_oop_not_null(heap_oop))) {

2
hotspot/src/share/vm/gc/g1/g1RemSet.cpp
View file

@ -448,7 +448,7 @@ bool G1RemSet::refine_card(jbyte* card_ptr, uint worker_i,
update_rs_oop_cl.set_from(r); update_rs_oop_cl.set_from(r);
G1TriggerClosure trigger_cl; G1TriggerClosure trigger_cl;
FilterIntoCSClosure into_cs_cl(NULL, _g1, &trigger_cl); FilterIntoCSClosure into_cs_cl(_g1, &trigger_cl);
G1InvokeIfNotTriggeredClosure invoke_cl(&trigger_cl, &into_cs_cl); G1InvokeIfNotTriggeredClosure invoke_cl(&trigger_cl, &into_cs_cl);
G1Mux2Closure mux(&invoke_cl, &update_rs_oop_cl); G1Mux2Closure mux(&invoke_cl, &update_rs_oop_cl);

2
hotspot/src/share/vm/gc/g1/g1_specialized_oop_closures.hpp
View file

@ -35,7 +35,6 @@
class G1ParScanClosure; class G1ParScanClosure;
class G1ParPushHeapRSClosure; class G1ParPushHeapRSClosure;
class FilterIntoCSClosure;
class FilterOutOfRegionClosure; class FilterOutOfRegionClosure;
class G1CMOopClosure; class G1CMOopClosure;
class G1RootRegionScanClosure; class G1RootRegionScanClosure;
@ -48,7 +47,6 @@ class G1InvokeIfNotTriggeredClosure;
#define SPECIALIZED_OOP_OOP_ITERATE_CLOSURES_G1(f) \ #define SPECIALIZED_OOP_OOP_ITERATE_CLOSURES_G1(f) \
f(G1ParScanClosure,_nv) \ f(G1ParScanClosure,_nv) \
f(G1ParPushHeapRSClosure,_nv) \ f(G1ParPushHeapRSClosure,_nv) \
f(FilterIntoCSClosure,_nv) \
f(FilterOutOfRegionClosure,_nv) \ f(FilterOutOfRegionClosure,_nv) \
f(G1CMOopClosure,_nv) \ f(G1CMOopClosure,_nv) \
f(G1RootRegionScanClosure,_nv) \ f(G1RootRegionScanClosure,_nv) \