< prev index next >

src/hotspot/share/gc/cms/concurrentMarkSweepGeneration.hpp

Print this page

        

@@ -539,12 +539,12 @@
   // Manipulated with CAS in the parallel/multi-threaded case.
   oopDesc* volatile _overflow_list;
   // The following array-pair keeps track of mark words
   // displaced for accommodating overflow list above.
   // This code will likely be revisited under RFE#4922830.
-  Stack<oop, mtGC>      _preserved_oop_stack;
-  Stack<markWord, mtGC> _preserved_mark_stack;
+  Stack<oop, mtGC>     _preserved_oop_stack;
+  Stack<markOop, mtGC> _preserved_mark_stack;
 
   // In support of multi-threaded concurrent phases
   YieldingFlexibleWorkGang* _conc_workers;
 
   // Performance Counters

@@ -740,11 +740,11 @@
   // The following is, obviously, not, in general, "MT-stable"
   bool overflow_list_is_empty() const;
 
   void preserve_mark_if_necessary(oop p);
   void par_preserve_mark_if_necessary(oop p);
-  void preserve_mark_work(oop p, markWord m);
+  void preserve_mark_work(oop p, markOop m);
   void restore_preserved_marks_if_any();
   NOT_PRODUCT(bool no_preserved_marks() const;)
   // In support of testing overflow code
   NOT_PRODUCT(int _overflow_counter;)
   NOT_PRODUCT(bool simulate_overflow();)       // Sequential

@@ -1110,11 +1110,10 @@
 
   // Space enquiries
   double occupancy() const { return ((double)used())/((double)capacity()); }
   size_t contiguous_available() const;
   size_t unsafe_max_alloc_nogc() const;
-  size_t used_stable() const;
 
   // over-rides
   MemRegion used_region_at_save_marks() const;
 
   // Adjust quantities in the generation affected by

@@ -1135,11 +1134,11 @@
   size_t direct_allocated_words() const { return _direct_allocated_words; }
   void reset_direct_allocated_words()   { _direct_allocated_words = 0; }
 
   // Overrides for parallel promotion.
   virtual oop par_promote(int thread_num,
-                          oop obj, markWord m, size_t word_sz);
+                          oop obj, markOop m, size_t word_sz);
   virtual void par_promote_alloc_done(int thread_num);
   virtual void par_oop_since_save_marks_iterate_done(int thread_num);
 
   virtual bool promotion_attempt_is_safe(size_t promotion_in_bytes) const;
 
< prev index next >