src/share/vm/gc/shenandoah/shenandoahHeapRegion.hpp

rev 12551 : Refactor/consolidate/cleanup

*** 38,59 ****
  public:
    static size_t RegionSizeBytes;
    static size_t RegionSizeShift;
  
  private:
    size_t _region_number;
    volatile size_t _live_data;
    MemRegion reserved;
-   bool _is_in_collection_set;
  
    bool _humongous_start;
    bool _humongous_continuation;
  
-   HeapWord* _top_at_mark_start;
-   HeapWord* _top_at_prev_mark_start;
-   HeapWord* _top_prev_mark_bitmap;
- 
    HeapWord* _new_top;
  
    volatile jint _critical_pins;
  
  #ifdef ASSERT
--- 38,55 ----
  public:
    static size_t RegionSizeBytes;
    static size_t RegionSizeShift;
  
  private:
+   ShenandoahHeap* _heap;
    size_t _region_number;
    volatile size_t _live_data;
    MemRegion reserved;
  
    bool _humongous_start;
    bool _humongous_continuation;
  
    HeapWord* _new_top;
  
    volatile jint _critical_pins;
  
  #ifdef ASSERT
*** 61,71 ****
  #endif
  
  public:
    static void setup_heap_region_size(size_t initial_heap_size, size_t max_heap_size);
  
!   jint initialize_heap_region(HeapWord* start, size_t regionSize, size_t index);
  
  
    size_t region_number() const;
  
    // Roll back the previous allocation of an object with specified size.
--- 57,67 ----
  #endif
  
  public:
    static void setup_heap_region_size(size_t initial_heap_size, size_t max_heap_size);
  
!   jint initialize_heap_region(ShenandoahHeap* heap, HeapWord* start, size_t regionSize, size_t index);
  
  
    size_t region_number() const;
  
    // Roll back the previous allocation of an object with specified size.
*** 81,106 ****
    void print_on(outputStream* st) const;
  
    size_t garbage() const;
  
    void recycle();
-   void reset();
- 
-   void oop_iterate_skip_unreachable(ExtendedOopClosure* cl, bool skip_unreachable_objects);
  
    void object_iterate_interruptible(ObjectClosure* blk, bool allow_cancel);
  
    HeapWord* object_iterate_careful(ObjectClosureCareful* cl);
  
    HeapWord* block_start_const(const void* p) const;
  
    // Just before GC we need to fill the current region.
    void fill_region();
  
!   bool is_in_collection_set() const;
  
!   void set_is_in_collection_set(bool b);
  
    void set_humongous_start(bool start);
    void set_humongous_continuation(bool continuation);
  
    bool is_humongous() const;
--- 77,99 ----
    void print_on(outputStream* st) const;
  
    size_t garbage() const;
  
    void recycle();
  
    void object_iterate_interruptible(ObjectClosure* blk, bool allow_cancel);
  
    HeapWord* object_iterate_careful(ObjectClosureCareful* cl);
  
    HeapWord* block_start_const(const void* p) const;
  
    // Just before GC we need to fill the current region.
    void fill_region();
  
!   bool in_collection_set() const;
  
!   void set_in_collection_set(bool b);
  
    void set_humongous_start(bool start);
    void set_humongous_continuation(bool continuation);
  
    bool is_humongous() const;
*** 110,120 ****
  #ifdef ASSERT
    void memProtectionOn();
    void memProtectionOff();
  #endif
  
-   static ByteSize is_in_collection_set_offset();
    // The following are for humongous regions.  We need to save the
    markOop saved_mark_word;
    void save_mark_word(oop obj) {saved_mark_word = obj->mark();}
    markOop mark_word() {return saved_mark_word;}
  
--- 103,112 ----
*** 123,154 ****
    // Override for scan_and_forward support.
    void prepare_for_compaction(CompactPoint* cp);
    void adjust_pointers();
    void compact();
  
-   void init_top_at_mark_start();
-   void set_top_at_mark_start(HeapWord* top);
-   HeapWord* top_at_mark_start();
-   void reset_top_at_prev_mark_start();
-   HeapWord* top_at_prev_mark_start();
-   HeapWord* top_prev_mark_bitmap();
- 
-   void set_top_prev_mark_bitmap(HeapWord* top);
-   void swap_top_at_mark_start();
- 
-   inline bool allocated_after_mark_start(HeapWord* addr);
-   bool allocated_after_prev_mark_start(HeapWord* addr) const;
- 
    void set_new_top(HeapWord* new_top) { _new_top = new_top; }
    HeapWord* new_top() const { return _new_top; }
  
    void pin();
    void unpin();
  
    bool is_pinned();
  
- private:
-   void do_reset();
- 
  };
  
  #endif // SHARE_VM_GC_SHENANDOAH_SHENANDOAHHEAPREGION_HPP
--- 115,130 ----