src/hotspot/share/gc/g1/g1CollectedHeap.hpp

rev 59704 : imported patch 8236073-softmaxheapsize

@@ -564,11 +564,11 @@
   G1MonitoringSupport* g1mm() {
     assert(_g1mm != NULL, "should have been initialized");
     return _g1mm;
   }
 
-  void resize_heap_if_necessary();
+  void resize_heap_after_full_collection();
 
   G1NUMA* numa() const { return _numa; }
 
   // Expand the garbage-first heap by at least the given size (in bytes!).
   // Returns true if the heap was expanded by the requested amount;

@@ -787,11 +787,12 @@
   void pre_evacuate_collection_set(G1EvacuationInfo& evacuation_info, G1ParScanThreadStateSet* pss);
   void post_evacuate_collection_set(G1EvacuationInfo& evacuation_info,
                                     G1RedirtyCardsQueueSet* rdcqs,
                                     G1ParScanThreadStateSet* pss);
 
-  void expand_heap_after_young_collection();
+  void resize_heap_after_young_gc();
+
   // Update object copying statistics.
   void record_obj_copy_mem_stats();
 
   // The hot card cache for remembered set insertion optimization.
   G1HotCardCache* _hot_card_cache;

@@ -1084,11 +1085,11 @@
   inline void old_set_add(HeapRegion* hr);
   inline void old_set_remove(HeapRegion* hr);
 
   inline void archive_set_add(HeapRegion* hr);
 
-  size_t non_young_capacity_bytes() {
+  size_t non_young_capacity_bytes() const {
     return (old_regions_count() + _archive_set.length() + humongous_regions_count()) * HeapRegion::GrainBytes;
   }
 
   // Determine whether the given region is one that we are using as an
   // old GC alloc region.

@@ -1282,14 +1283,18 @@
   // requires.
   static size_t humongous_obj_size_in_regions(size_t word_size);
 
   // Print the maximum heap capacity.
   virtual size_t max_capacity() const;
+  virtual size_t min_capacity() const;
 
   // Return the size of reserved memory. Returns different value than max_capacity() when AllocateOldGenAt is used.
   virtual size_t max_reserved_capacity() const;
 
+  // Print the soft maximum heap capacity.
+  size_t soft_max_capacity() const;
+
   virtual jlong millis_since_last_gc();
 
 
   // Convenience function to be used in situations where the heap type can be
   // asserted to be this type.