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

rev 10540 : [backport] CollectedHeap::max_tlab_size is measured in words
rev 10587 : [backport] Refactor gc+init logging

*** 189,207 ****
--- 189,209 ----
  
    RegionState state()              const { return _state; }
    int  state_ordinal()             const { return region_state_to_ordinal(_state); }
  
  private:
+   static size_t RegionCount;
    static size_t RegionSizeBytes;
    static size_t RegionSizeWords;
    static size_t RegionSizeBytesShift;
    static size_t RegionSizeWordsShift;
    static size_t RegionSizeBytesMask;
    static size_t RegionSizeWordsMask;
    static size_t HumongousThresholdBytes;
    static size_t HumongousThresholdWords;
    static size_t MaxTLABSizeBytes;
+   static size_t MaxTLABSizeWords;
  
  private:
    ShenandoahHeap* _heap;
    size_t _region_number;
    volatile jint _live_data;
*** 221,240 ****
    ShenandoahPacer* _pacer;
  
  public:
    ShenandoahHeapRegion(ShenandoahHeap* heap, HeapWord* start, size_t size_words, size_t index, bool committed);
  
!   static void setup_heap_region_size(size_t initial_heap_size, size_t max_heap_size);
  
    double empty_time() {
      return _empty_time;
    }
  
    inline static size_t required_regions(size_t bytes) {
      return (bytes + ShenandoahHeapRegion::region_size_bytes() - 1) >> ShenandoahHeapRegion::region_size_bytes_shift();
    }
  
    inline static size_t region_size_bytes() {
      return ShenandoahHeapRegion::RegionSizeBytes;
    }
  
    inline static size_t region_size_words() {
--- 223,246 ----
    ShenandoahPacer* _pacer;
  
  public:
    ShenandoahHeapRegion(ShenandoahHeap* heap, HeapWord* start, size_t size_words, size_t index, bool committed);
  
!   static void setup_sizes(size_t initial_heap_size, size_t max_heap_size);
  
    double empty_time() {
      return _empty_time;
    }
  
    inline static size_t required_regions(size_t bytes) {
      return (bytes + ShenandoahHeapRegion::region_size_bytes() - 1) >> ShenandoahHeapRegion::region_size_bytes_shift();
    }
  
+   inline static size_t region_count() {
+     return ShenandoahHeapRegion::RegionCount;
+   }
+ 
    inline static size_t region_size_bytes() {
      return ShenandoahHeapRegion::RegionSizeBytes;
    }
  
    inline static size_t region_size_words() {
*** 291,300 ****
--- 297,310 ----
  
    inline static size_t max_tlab_size_bytes() {
      return ShenandoahHeapRegion::MaxTLABSizeBytes;
    }
  
+   inline static size_t max_tlab_size_words() {
+     return ShenandoahHeapRegion::MaxTLABSizeWords;
+   }
+ 
    size_t region_number() const;
  
    // Allocation (return NULL if full)
    inline HeapWord* allocate(size_t word_size, ShenandoahHeap::AllocType type);
    HeapWord* allocate(size_t word_size) {