Add timeout detection to SharedEngineMultithreadingTestBase

Author: steve-s

graalpython/com.oracle.graal.python.test.integration/src/com/oracle/graal/python/test/integration/Utils.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0
@@ -40,8 +40,29 @@
  */
 package com.oracle.graal.python.test.integration;
 
+import java.lang.management.ManagementFactory;
+import java.lang.management.ThreadInfo;
+import java.lang.management.ThreadMXBean;
 import java.util.Locale;
 
 public class Utils {
     public static final boolean IS_WINDOWS = System.getProperty("os.name").toLowerCase(Locale.ROOT).contains("windows");
+
+    public static String getThreadDump() {
+        ThreadMXBean threadMXBean = ManagementFactory.getThreadMXBean();
+        ThreadInfo[] threads = threadMXBean.getThreadInfo(threadMXBean.getAllThreadIds(), 100);
+        final String line = "=====================================\n";
+        StringBuilder sb = new StringBuilder(line);
+        for (ThreadInfo thread : threads) {
+            if (thread != null) {
+                sb.append("-------\n");
+                sb.append(thread.getThreadName()).append('\n');
+                sb.append("Thread state:").append(thread.getThreadState()).append('\n');
+                for (StackTraceElement element : thread.getStackTrace()) {
+                    sb.append("    ").append(element).append('\n');
+                }
+            }
+        }
+        return sb.append(line).toString();
+    }
 }

graalpython/com.oracle.graal.python.test.integration/src/com/oracle/graal/python/test/integration/engine/SharedEngineMultithreadingTestBase.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0
@@ -50,6 +50,7 @@
 import java.util.concurrent.Future;
 import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
 import java.util.function.Consumer;
 
 import org.graalvm.polyglot.Context;
@@ -58,6 +59,7 @@
 
 import com.oracle.graal.python.test.integration.CleanupRule;
 import com.oracle.graal.python.test.integration.PythonTests;
+import com.oracle.graal.python.test.integration.Utils;
 
 /**
  * Base class for tests that run in multiple context with a shared engine and in parallel.
@@ -112,8 +114,17 @@ protected static void submitAndWaitAll(ExecutorService service, Task[] tasks) th
                 }
             });
         }
+        boolean wasTimeout = false;
         for (Future<?> future : futures) {
-            future.get();
+            try {
+                future.get(2, TimeUnit.MINUTES);
+            } catch (TimeoutException e) {
+                wasTimeout = true;
+            }
+        }
+        if (wasTimeout) {
+            System.err.println(Utils.getThreadDump());
+            throw new AssertionError("One of the tasks did not finish in 2 minutes");
         }
         log("All %d futures finished...", tasks.length);
     }

graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/test/advanced/LeakTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0
@@ -43,8 +43,6 @@
 import java.io.IOException;
 import java.io.OutputStream;
 import java.lang.management.ManagementFactory;
-import java.lang.management.ThreadInfo;
-import java.lang.management.ThreadMXBean;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.ArrayList;
@@ -69,6 +67,7 @@
 import org.netbeans.lib.profiler.heap.Instance;
 import org.netbeans.lib.profiler.heap.JavaClass;
 
+import com.oracle.graal.python.test.integration.Utils;
 import com.sun.management.HotSpotDiagnosticMXBean;
 
 public class LeakTest extends AbstractLanguageLauncher {
@@ -127,7 +126,7 @@ private void dumpAndAnalyze() {
             }
 
             MBeanServer server = doFullGC();
-            String threadDump = getThreadDump();
+            String threadDump = Utils.getThreadDump();
             Path dumpFile = dumpHeap(server, keepDump);
             boolean fail = checkForLeaks(dumpFile);
             if (fail) {
@@ -138,24 +137,6 @@ private void dumpAndAnalyze() {
             }
         }
 
-        private String getThreadDump() {
-            ThreadMXBean threadMXBean = ManagementFactory.getThreadMXBean();
-            ThreadInfo[] threads = threadMXBean.getThreadInfo(threadMXBean.getAllThreadIds(), 100);
-            final String line = "=====================================\n";
-            StringBuilder sb = new StringBuilder(line);
-            for (ThreadInfo thread : threads) {
-                if (thread != null) {
-                    sb.append("-------\n");
-                    sb.append(thread.getThreadName()).append('\n');
-                    sb.append("Thread state:").append(thread.getThreadState()).append('\n');
-                    for (StackTraceElement element : thread.getStackTrace()) {
-                        sb.append("    ").append(element).append('\n');
-                    }
-                }
-            }
-            return sb.append(line).toString();
-        }
-
         private boolean checkForLeaks(Path dumpFile) {
             boolean fail = false;
             try {