< prev index next >
src/share/vm/gc/g1/g1EvacuationClosures.hpp
Print this page
rev 9081 : imported patch rootclosureset
rev 9083 : imported patch erik-review
@@ -26,37 +26,37 @@
#define SHARE_VM_GC_G1_G1SCAVENGECLOSURES_HPP
#include "gc/g1/bufferingOopClosure.hpp"
#include "gc/g1/g1CodeBlobClosure.hpp"
#include "gc/g1/g1OopClosures.hpp"
-#include "gc/g1/g1RootClosureSet.hpp"
+#include "gc/g1/g1RootClosures.hpp"
class G1CollectedHeap;
class G1ParScanThreadState;
// Simple holder object for a complete set of closures used by the G1 evacuation code.
template <G1Mark Mark>
-class G1ClosureSet VALUE_OBJ_CLASS_SPEC {
+class G1SharedClosures VALUE_OBJ_CLASS_SPEC {
public:
G1ParCopyClosure<G1BarrierNone, Mark> _oops;
G1ParCopyClosure<G1BarrierKlass, Mark> _oop_in_klass;
G1KlassScanClosure _klass_in_cld_closure;
CLDToKlassAndOopClosure _clds;
G1CodeBlobClosure _codeblobs;
BufferingOopClosure _buffered_oops;
- G1ClosureSet(G1CollectedHeap* g1h, G1ParScanThreadState* pss, bool process_only_dirty_klasses, bool must_claim_cld) :
+ G1SharedClosures(G1CollectedHeap* g1h, G1ParScanThreadState* pss, bool process_only_dirty_klasses, bool must_claim_cld) :
_oops(g1h, pss),
_oop_in_klass(g1h, pss),
_klass_in_cld_closure(&_oop_in_klass, process_only_dirty_klasses),
_clds(&_klass_in_cld_closure, &_oops, must_claim_cld),
_codeblobs(&_oops),
_buffered_oops(&_oops) {}
};
-class G1EvacuationClosures : public G1EvacuationRootClosureSet {
- G1ClosureSet<G1MarkNone> _closures;
+class G1EvacuationClosures : public G1EvacuationRootClosures {
+ G1SharedClosures<G1MarkNone> _closures;
public:
G1EvacuationClosures(G1CollectedHeap* g1h,
G1ParScanThreadState* pss,
bool gcs_are_young) :
@@ -83,13 +83,13 @@
// Closures used during initial mark.
// The treatment of "weak" roots is selectable through the template parameter,
// this is usually used to control unloading of classes and interned strings.
template <G1Mark MarkWeak>
-class G1InitalMarkClosures : public G1EvacuationRootClosureSet {
- G1ClosureSet<G1MarkFromRoot> _strong;
- G1ClosureSet<MarkWeak> _weak;
+class G1InitalMarkClosures : public G1EvacuationRootClosures {
+ G1SharedClosures<G1MarkFromRoot> _strong;
+ G1SharedClosures<MarkWeak> _weak;
// Filter method to help with returning the appropriate closures
// depending on the class template parameter.
template <G1Mark Mark, typename T>
T* null_if(T* t) {
< prev index next >