Update heap sizes after a relevant runtime option value changes.

Author: peter-hofer

substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/CollectionPolicy.java

@@ -102,9 +102,9 @@ static boolean shouldCollectYoungGenSeparately(boolean defaultValue) {
 
     /**
      * (Re)computes minimum/maximum/initial sizes of space based on the available
-     * {@linkplain PhysicalMemory physical memory} and current runtime option values. This method is
-     * called after slow-path allocation (of a TLAB or a large object) and so allocation is allowed,
-     * but can trigger a collection.
+     * {@linkplain PhysicalMemory physical memory} and current runtime option values. This method
+     * can be called directly or after a slow-path allocation (of a TLAB or a large object) and so
+     * allocation is allowed, but may trigger a collection.
      */
     void updateSizeParameters();
 

substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/HeapImpl.java

@@ -638,6 +638,11 @@ public boolean printLocationInfo(Log log, UnsignedWord value, boolean allowJavaH
         return false;
     }
 
+    @Override
+    public void updateSizeParameters() {
+        GCImpl.getPolicy().updateSizeParameters();
+    }
+
     static Pointer getImageHeapStart() {
         int imageHeapOffsetInAddressSpace = Heap.getHeap().getImageHeapOffsetInAddressSpace();
         if (imageHeapOffsetInAddressSpace > 0) {
@@ -846,7 +851,7 @@ private long totalMemory() {
     @Substitute
     private long maxMemory() {
         PhysicalMemory.size(); // ensure physical memory size is set correctly and not estimated
-        GCImpl.getPolicy().updateSizeParameters();
+        Heap.getHeap().updateSizeParameters();
         return GCImpl.getPolicy().getMaximumHeapSize().rawValue();
     }
 

substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/HeapParameters.java

@@ -39,6 +39,7 @@
 import com.oracle.svm.core.SubstrateGCOptions;
 import com.oracle.svm.core.SubstrateUtil;
 import com.oracle.svm.core.annotate.Uninterruptible;
+import com.oracle.svm.core.heap.Heap;
 import com.oracle.svm.core.option.HostedOptionKey;
 import com.oracle.svm.core.option.RuntimeOptionKey;
 import com.oracle.svm.core.option.RuntimeOptionValues;
@@ -48,11 +49,24 @@
 /** Constants and variables for the size and layout of the heap and behavior of the collector. */
 public final class HeapParameters {
     public static final class Options {
+        static final class HeapSizeOptionKey<T> extends RuntimeOptionKey<T> {
+            HeapSizeOptionKey(T defaultValue) {
+                super(defaultValue);
+            }
+
+            @Override
+            protected void onValueUpdate(EconomicMap<OptionKey<?>, Object> values, T oldValue, T newValue) {
+                if (!SubstrateUtil.HOSTED) {
+                    Heap.getHeap().updateSizeParameters();
+                }
+            }
+        }
+
         @Option(help = "The maximum heap size as percent of physical memory") //
-        public static final RuntimeOptionKey<Integer> MaximumHeapSizePercent = new RuntimeOptionKey<>(80);
+        public static final RuntimeOptionKey<Integer> MaximumHeapSizePercent = new HeapSizeOptionKey<>(80);
 
         @Option(help = "The maximum size of the young generation as a percentage of the maximum heap size") //
-        public static final RuntimeOptionKey<Integer> MaximumYoungGenerationSizePercent = new RuntimeOptionKey<>(10);
+        public static final RuntimeOptionKey<Integer> MaximumYoungGenerationSizePercent = new HeapSizeOptionKey<>(10);
 
         @Option(help = "The size of an aligned chunk.") //
         public static final HostedOptionKey<Long> AlignedHeapChunkSize = new HostedOptionKey<Long>(1L * 1024L * 1024L) {

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/SubstrateGCOptions.java

@@ -30,6 +30,7 @@
 import org.graalvm.compiler.options.OptionType;
 import org.graalvm.word.WordFactory;
 
+import com.oracle.svm.core.heap.Heap;
 import com.oracle.svm.core.heap.HeapSizeVerifier;
 import com.oracle.svm.core.option.HostedOptionKey;
 import com.oracle.svm.core.option.RuntimeOptionKey;
@@ -59,6 +60,7 @@ public class SubstrateGCOptions {
         protected void onValueUpdate(EconomicMap<OptionKey<?>, Object> values, Long oldValue, Long newValue) {
             if (!SubstrateUtil.HOSTED) {
                 HeapSizeVerifier.verifyMinHeapSizeAgainstAddressSpace(WordFactory.unsigned(newValue));
+                Heap.getHeap().updateSizeParameters();
             }
         }
     };
@@ -69,6 +71,7 @@ protected void onValueUpdate(EconomicMap<OptionKey<?>, Object> values, Long oldV
         protected void onValueUpdate(EconomicMap<OptionKey<?>, Object> values, Long oldValue, Long newValue) {
             if (!SubstrateUtil.HOSTED) {
                 HeapSizeVerifier.verifyMaxHeapSizeAgainstAddressSpace(WordFactory.unsigned(newValue));
+                Heap.getHeap().updateSizeParameters();
             }
         }
     };
@@ -79,6 +82,7 @@ protected void onValueUpdate(EconomicMap<OptionKey<?>, Object> values, Long oldV
         protected void onValueUpdate(EconomicMap<OptionKey<?>, Object> values, Long oldValue, Long newValue) {
             if (!SubstrateUtil.HOSTED) {
                 HeapSizeVerifier.verifyMaxNewSizeAgainstAddressSpace(WordFactory.unsigned(newValue));
+                Heap.getHeap().updateSizeParameters();
             }
         }
     };

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/Heap.java

@@ -217,4 +217,10 @@ public List<Class<?>> getLoadedClasses() {
      * value and returns true. Otherwise, the method returns false.
      */
     public abstract boolean printLocationInfo(Log log, UnsignedWord value, boolean allowJavaHeapAccess, boolean allowUnsafeOperations);
+
+    /**
+     * (Re)computes minimum/maximum/initial sizes of space based on the available
+     * {@linkplain PhysicalMemory physical memory} and current runtime option values.
+     */
+    public abstract void updateSizeParameters();
 }