[GR-7165] [hotfix] Let the async handler threads shut down if the context closes

PullRequest: graalpython/396

Author: ansalond

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/AsyncHandler.java

@@ -44,6 +44,7 @@
 import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
@@ -91,7 +92,13 @@ default int frameIndex() {
         }
     }
 
-    private final ScheduledExecutorService executorService = Executors.newScheduledThreadPool(2);
+    private final ScheduledExecutorService executorService = Executors.newScheduledThreadPool(2, new ThreadFactory() {
+        public Thread newThread(Runnable r) {
+            Thread t = Executors.defaultThreadFactory().newThread(r);
+            t.setDaemon(true);
+            return t;
+        }
+    });
     private final ConcurrentLinkedQueue<AsyncAction> scheduledActions = new ConcurrentLinkedQueue<>();
     private boolean hasScheduledAction = false;
     private final Lock executingScheduledActions = new ReentrantLock();
@@ -224,4 +231,8 @@ private void processAsyncActions() {
             }
         }
     }
+
+    public void shutdown() {
+        executorService.shutdownNow();
+    }
 }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/PythonContext.java

@@ -288,6 +288,7 @@ public void deregisterShutdownHook(Object callable) {
 
     @TruffleBoundary
     public void runShutdownHooks() {
+        handler.shutdown();
         for (CallTarget f : atExitHooks.values()) {
             f.call();
         }