Generate only one heap dump on OOME

oracle · Jul 26, 2023 · 9a8c441 · 9a8c441
1 parent 3731936
commit 9a8c441
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/...atevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/GCImpl.java b/...atevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/GCImpl.java
@@ -29,6 +29,7 @@
 
 import java.lang.ref.Reference;
 
+import com.oracle.svm.core.jdk.UninterruptibleUtils.AtomicBoolean;
 import org.graalvm.compiler.api.replacements.Fold;
 import org.graalvm.nativeimage.CurrentIsolate;
 import org.graalvm.nativeimage.IsolateThread;
@@ -117,6 +118,8 @@ public final class GCImpl implements GC {
     private UnsignedWord collectionEpoch = WordFactory.zero();
     private long lastWholeHeapExaminedTimeMillis = -1;
 
+    private final AtomicBoolean outOfMemoryReported = new AtomicBoolean(false);
+
     @Platforms(Platform.HOSTED_ONLY.class)
     GCImpl() {
         this.policy = CollectionPolicy.getInitialPolicy();
@@ -151,15 +154,15 @@ public void maybeCollectOnAllocation() {
             outOfMemory = collectWithoutAllocating(GenScavengeGCCause.OnAllocation, false);
         }
         if (outOfMemory) {
-            heapSizeExceeded();
+            reportJavaOutOfMemory();
+            throw OutOfMemoryUtil.heapSizeExceeded();
         }
     }
 
-    private static void heapSizeExceeded() {
-        if (SubstrateOptions.isHeapDumpOnOutOfMemoryError()) {
+    private void reportJavaOutOfMemory() {
+        if (SubstrateOptions.isHeapDumpOnOutOfMemoryError() && outOfMemoryReported.compareAndSet(false, true)) {
             VMRuntime.dumpHeapOnOutOfMemoryError();
         }
-        throw OutOfMemoryUtil.heapSizeExceeded();
     }
 
     @Override
@@ -173,7 +176,8 @@ private void collect(GCCause cause, boolean forceFullGC) {
         if (!hasNeverCollectPolicy()) {
             boolean outOfMemory = collectWithoutAllocating(cause, forceFullGC);
             if (outOfMemory) {
-                heapSizeExceeded();
+                reportJavaOutOfMemory();
+                throw OutOfMemoryUtil.heapSizeExceeded();
             }
         }
     }