@@ -34,91 +34,76 @@ class CardTableBarrierSet;
3434class DefNewGeneration ;
3535class KlassRemSet ;
3636
37- // Closure for iterating roots from a particular generation
38- // Note: all classes deriving from this MUST call this do_barrier
39- // method at the end of their own do_oop method!
40- // Note: no do_oop defined, this is an abstract class.
41-
42- class OopsInGenClosure : public OopIterateClosure {
43- private:
44- Generation* _orig_gen; // generation originally set in ctor
45- Generation* _gen; // generation being scanned
46-
47- protected:
48- // Some subtypes need access.
49- HeapWord* _gen_boundary; // start of generation
50- CardTableRS* _rs; // remembered set
51-
52- // For assertions
53- Generation* generation () { return _gen; }
54- CardTableRS* rs () { return _rs; }
37+ #if INCLUDE_SERIALGC
5538
56- // Derived classes that modify oops so that they might be old-to-young
57- // pointers must call the method below.
58- template <class T > void do_barrier (T* p);
39+ // Super closure class for scanning DefNewGeneration.
40+ //
41+ // - Derived: The derived type provides necessary barrier
42+ // after an oop has been updated.
43+ template <typename Derived>
44+ class FastScanClosure : public BasicOopIterateClosure {
45+ private:
46+ DefNewGeneration* _young_gen;
47+ HeapWord* _young_gen_end;
5948
60- public:
61- OopsInGenClosure (Generation* gen);
62- void set_generation (Generation* gen);
49+ template <typename T>
50+ void do_oop_work (T* p);
6351
64- void reset_generation () { _gen = _orig_gen; }
52+ protected:
53+ FastScanClosure (DefNewGeneration* g);
6554
66- HeapWord* gen_boundary () { return _gen_boundary; }
55+ public:
56+ virtual void do_oop (oop* p);
57+ virtual void do_oop (narrowOop* p);
6758};
6859
69- class BasicOopsInGenClosure : public OopsInGenClosure {
70- public:
71- BasicOopsInGenClosure (Generation* gen);
72-
73- virtual bool do_metadata () { return false ; }
74- virtual void do_klass (Klass* k) { ShouldNotReachHere (); }
75- virtual void do_cld (ClassLoaderData* cld) { ShouldNotReachHere (); }
60+ // Closure for scanning DefNewGeneration when iterating over the old generation.
61+ //
62+ // This closure performs barrier store calls on pointers into the DefNewGeneration.
63+ class DefNewYoungerGenClosure : public FastScanClosure <DefNewYoungerGenClosure> {
64+ private:
65+ Generation* _old_gen;
66+ HeapWord* _old_gen_start;
67+ CardTableRS* _rs;
68+
69+ public:
70+ DefNewYoungerGenClosure (DefNewGeneration* young_gen, Generation* old_gen);
71+
72+ template <typename T>
73+ void barrier (T* p);
7674};
7775
78- // Super class for scan closures. It contains code to dirty scanned class loader data.
79- class OopsInClassLoaderDataOrGenClosure : public BasicOopsInGenClosure {
76+ // Closure for scanning DefNewGeneration when *not* iterating over the old generation.
77+ //
78+ // This closures records changes to oops in CLDs.
79+ class DefNewScanClosure : public FastScanClosure <DefNewScanClosure> {
8080 ClassLoaderData* _scanned_cld;
81- public:
82- OopsInClassLoaderDataOrGenClosure (Generation* g) : BasicOopsInGenClosure(g), _scanned_cld(NULL ) {}
81+
82+ public:
83+ DefNewScanClosure (DefNewGeneration* g);
84+
8385 void set_scanned_cld (ClassLoaderData* cld) {
8486 assert (cld == NULL || _scanned_cld == NULL , " Must be"
8587 _scanned_cld = cld;
8688 }
87- bool is_scanning_a_cld () { return _scanned_cld != NULL ; }
88- void do_cld_barrier ();
89- };
90-
91- #if INCLUDE_SERIALGC
9289
93- // Closure for scanning DefNewGeneration.
94- //
95- // This closure only performs barrier store calls on
96- // pointers into the DefNewGeneration.
97- class FastScanClosure : public OopsInClassLoaderDataOrGenClosure {
98- protected:
99- DefNewGeneration* _g;
100- HeapWord* _boundary;
101- bool _gc_barrier;
102- template <class T > inline void do_oop_work (T* p);
103- public:
104- FastScanClosure (DefNewGeneration* g, bool gc_barrier);
105- virtual void do_oop (oop* p);
106- virtual void do_oop (narrowOop* p);
90+ template <typename T>
91+ void barrier (T* p);
10792};
10893
109- #endif // INCLUDE_SERIALGC
110-
11194class CLDScanClosure : public CLDClosure {
112- OopsInClassLoaderDataOrGenClosure* _scavenge_closure;
95+ DefNewScanClosure* _scavenge_closure;
11396 // true if the the modified oops state should be saved.
114- bool _accumulate_modified_oops;
97+ bool _accumulate_modified_oops;
11598 public:
116- CLDScanClosure (OopsInClassLoaderDataOrGenClosure * scavenge_closure,
99+ CLDScanClosure (DefNewScanClosure * scavenge_closure,
117100 bool accumulate_modified_oops) :
118101 _scavenge_closure (scavenge_closure), _accumulate_modified_oops(accumulate_modified_oops) {}
119102 void do_cld (ClassLoaderData* cld);
120103};
121104
105+ #endif // INCLUDE_SERIALGC
106+
122107class FilteringClosure : public OopIterateClosure {
123108 private:
124109 HeapWord* _boundary;
0 commit comments