Add atexit testing utilities

Author: msimacek

graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_atexit.txt

@@ -1,3 +1,9 @@
+*graalpython.lib-python.3.test.test_atexit.GeneralTest.test_badargs
+*graalpython.lib-python.3.test.test_atexit.GeneralTest.test_bound_methods
+*graalpython.lib-python.3.test.test_atexit.GeneralTest.test_clear
+*graalpython.lib-python.3.test.test_atexit.GeneralTest.test_exit
+*graalpython.lib-python.3.test.test_atexit.GeneralTest.test_order
+*graalpython.lib-python.3.test.test_atexit.GeneralTest.test_unregister
 *graalpython.lib-python.3.test.test_atexit.SubinterpreterTest.test_callback_on_subinterpreter_teardown
 *graalpython.lib-python.3.test.test_atexit.SubinterpreterTest.test_callbacks_leak
 *graalpython.lib-python.3.test.test_atexit.SubinterpreterTest.test_callbacks_leak_refcycle

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/AtexitModuleBuiltins.java

@@ -51,6 +51,7 @@
 import com.oracle.graal.python.builtins.objects.function.PKeyword;
 import com.oracle.graal.python.nodes.call.CallNode;
 import com.oracle.graal.python.nodes.function.PythonBuiltinBaseNode;
+import com.oracle.graal.python.nodes.function.PythonBuiltinNode;
 import com.oracle.graal.python.nodes.function.builtins.PythonUnaryBuiltinNode;
 import com.oracle.graal.python.nodes.function.builtins.PythonVarargsBuiltinNode;
 import com.oracle.graal.python.runtime.PythonContext;
@@ -110,7 +111,7 @@ public Object execute(VirtualFrame frame) {
         Object register(Object callable, Object[] arguments, PKeyword[] keywords) {
             CompilerDirectives.transferToInterpreter();
             AtExitCallTarget atExitCallTarget = new AtExitCallTarget(getContext().getLanguage());
-            getContext().registerShutdownHook(callable, arguments, keywords, PythonUtils.getOrCreateCallTarget(atExitCallTarget));
+            getContext().registerAtexitHook(callable, arguments, keywords, PythonUtils.getOrCreateCallTarget(atExitCallTarget));
             return callable;
         }
     }
@@ -120,7 +121,37 @@ Object register(Object callable, Object[] arguments, PKeyword[] keywords) {
     abstract static class UnregisterNode extends PythonUnaryBuiltinNode {
         @Specialization
         Object register(Object callable) {
-            getContext().deregisterShutdownHook(callable);
+            getContext().deregisterAtexitHook(callable);
+            return PNone.NONE;
+        }
+    }
+
+    @Builtin(name = "_clear")
+    @GenerateNodeFactory
+    abstract static class ClearNode extends PythonBuiltinNode {
+        @Specialization
+        Object clear() {
+            getContext().clearAtexitHooks();
+            return PNone.NONE;
+        }
+    }
+
+    @Builtin(name = "_ncallbacks")
+    @GenerateNodeFactory
+    abstract static class NCallbacksNode extends PythonBuiltinNode {
+        @Specialization
+        int get() {
+            return getContext().getAtexitHookCount();
+        }
+    }
+
+    @Builtin(name = "_run_exitfuncs")
+    @GenerateNodeFactory
+    abstract static class RunExitfuncsNode extends PythonBuiltinNode {
+        @Specialization
+        Object run() {
+            getContext().runAtexitHooks();
+            getContext().clearAtexitHooks();
             return PNone.NONE;
         }
     }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/PosixModuleBuiltins.java

@@ -953,7 +953,7 @@ private Object doOpenFile(String pathname, Set<StandardOpenOption> options, File
                 options.remove(StandardOpenOption.CREATE_NEW);
                 options.remove(StandardOpenOption.DELETE_ON_CLOSE);
                 options.add(StandardOpenOption.CREATE);
-                getContext().registerShutdownHook(new FileDeleteShutdownHook(truffleFile));
+                getContext().registerAtexitHook(new FileDeleteShutdownHook(truffleFile));
             }
 
             fc = truffleFile.newByteChannel(options, attributes);

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

@@ -709,20 +709,25 @@ private static void writeWarning(String warning) {
     }
 
     @TruffleBoundary
-    public void registerShutdownHook(ShutdownHook shutdownHook) {
+    public void registerAtexitHook(ShutdownHook shutdownHook) {
         shutdownHooks.add(shutdownHook);
     }
 
     @TruffleBoundary
-    public void registerShutdownHook(Object callable, Object[] arguments, PKeyword[] keywords, CallTarget ct) {
+    public void registerAtexitHook(Object callable, Object[] arguments, PKeyword[] keywords, CallTarget ct) {
         atExitHooks.put(callable, new AtExitHook(arguments, keywords, ct));
     }
 
     @TruffleBoundary
-    public void deregisterShutdownHook(Object callable) {
+    public void deregisterAtexitHook(Object callable) {
         atExitHooks.removeKey(callable);
     }
 
+    @TruffleBoundary
+    public void clearAtexitHooks() {
+        atExitHooks.clear();
+    }
+
     @TruffleBoundary
     public void finalizeContext() {
         finalizing = true;
@@ -731,9 +736,12 @@ public void finalizeContext() {
     }
 
     @TruffleBoundary
-    private void runShutdownHooks() {
-        handler.shutdown();
-        // run atExitHooks in reverse order they were registered
+    public int getAtexitHookCount() {
+        return atExitHooks.size();
+    }
+
+    @TruffleBoundary
+    public void runAtexitHooks() {
         MapCursor<Object, AtExitHook> cursor = atExitHooks.getEntries();
         AtExitHook[] hooks = new AtExitHook[atExitHooks.size()];
         Object[] callables = new Object[atExitHooks.size()];
@@ -745,6 +753,13 @@ private void runShutdownHooks() {
         for (int i = hooks.length - 1; i >= 0; i--) {
             hooks[i].ct.call(callables[i], hooks[i].arguments, hooks[i].keywords);
         }
+    }
+
+    @TruffleBoundary
+    public void runShutdownHooks() {
+        handler.shutdown();
+        // run atExitHooks in reverse order they were registered
+        runAtexitHooks();
         for (ShutdownHook h : shutdownHooks) {
             h.call(this);
         }