[GR-23232] Support a little more of the gc module API

Author: timfel

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

@@ -29,6 +29,7 @@
 import java.lang.management.ManagementFactory;
 import java.util.List;
 
+import com.oracle.graal.python.PythonLanguage;
 import com.oracle.graal.python.builtins.Builtin;
 import com.oracle.graal.python.builtins.CoreFunctions;
 import com.oracle.graal.python.builtins.PythonBuiltins;
@@ -38,8 +39,12 @@
 import com.oracle.graal.python.builtins.objects.list.PList;
 import com.oracle.graal.python.builtins.objects.tuple.PTuple;
 import com.oracle.graal.python.nodes.function.PythonBuiltinNode;
+import com.oracle.graal.python.runtime.PythonContext;
+import com.oracle.graal.python.runtime.PythonCore;
+import com.oracle.graal.python.util.PythonUtils;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.dsl.Cached;
+import com.oracle.truffle.api.dsl.CachedContext;
 import com.oracle.truffle.api.dsl.Fallback;
 import com.oracle.truffle.api.dsl.GenerateNodeFactory;
 import com.oracle.truffle.api.dsl.Specialization;
@@ -54,48 +59,70 @@ protected List<com.oracle.truffle.api.dsl.NodeFactory<? extends PythonBuiltinNod
         return GcModuleBuiltinsFactory.getFactories();
     }
 
+    @Override
+    public void initialize(PythonCore core) {
+        builtinConstants.put("DEBUG_LEAK", 0);
+        super.initialize(core);
+    }
+
     @Builtin(name = "collect", minNumOfPositionalArgs = 0, maxNumOfPositionalArgs = 1)
     @GenerateNodeFactory
     abstract static class GcCollectNode extends PythonBuiltinNode {
         @Specialization
         int collect(VirtualFrame frame, @SuppressWarnings("unused") Object level,
                         @Cached BranchProfile asyncProfile) {
-            doGc();
+            PythonUtils.forceFullGC();
             // collect some weak references now
             getContext().triggerAsyncActions(frame, asyncProfile);
             return 0;
         }
-
-        @TruffleBoundary
-        private static void doGc() {
-            System.gc();
-        }
     }
 
     @Builtin(name = "isenabled", minNumOfPositionalArgs = 0)
     @GenerateNodeFactory
     abstract static class GcIsEnabledNode extends PythonBuiltinNode {
         @Specialization
-        boolean isenabled() {
-            return true;
+        boolean isenabled(@CachedContext(PythonLanguage.class) PythonContext ctx) {
+            return ctx.isGcEnabled();
         }
     }
 
-    abstract static class StubNode extends PythonBuiltinNode {
+    @Builtin(name = "disable", minNumOfPositionalArgs = 0)
+    @GenerateNodeFactory
+    abstract static class DisableNode extends PythonBuiltinNode {
         @Specialization
-        PNone disable() {
+        PNone disable(@CachedContext(PythonLanguage.class) PythonContext ctx) {
+            ctx.setGcEnabled(false);
             return PNone.NONE;
         }
     }
 
-    @Builtin(name = "disable", minNumOfPositionalArgs = 0)
+    @Builtin(name = "enable", minNumOfPositionalArgs = 0)
+    @GenerateNodeFactory
+    abstract static class EnableNode extends PythonBuiltinNode {
+        @Specialization
+        PNone enable(@CachedContext(PythonLanguage.class) PythonContext ctx) {
+            ctx.setGcEnabled(true);
+            return PNone.NONE;
+        }
+    }
+
+    @Builtin(name = "get_debug", minNumOfPositionalArgs = 0)
     @GenerateNodeFactory
-    abstract static class DisableNode extends StubNode {
+    abstract static class GetDebugNode extends PythonBuiltinNode {
+        @Specialization
+        int getDebug() {
+            return 0;
+        }
     }
 
-    @Builtin(name = "enable", minNumOfPositionalArgs = 0)
+    @Builtin(name = "set_debug", minNumOfPositionalArgs = 1)
     @GenerateNodeFactory
-    abstract static class EnableNode extends StubNode {
+    abstract static class SetDebugNode extends PythonBuiltinNode {
+        @Specialization
+        PNone setDebug(@SuppressWarnings("unused") Object ignored) {
+            return PNone.NONE;
+        }
     }
 
     @Builtin(name = "get_count", minNumOfPositionalArgs = 0)

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

@@ -66,6 +66,7 @@
 import com.oracle.graal.python.nodes.function.PythonBuiltinNode;
 import com.oracle.graal.python.nodes.object.IsBuiltinClassProfile;
 import com.oracle.graal.python.runtime.AsyncHandler;
+import com.oracle.graal.python.runtime.PythonContext;
 import com.oracle.graal.python.runtime.PythonCore;
 import com.oracle.graal.python.runtime.exception.PythonErrorType;
 import com.oracle.truffle.api.CompilerDirectives;
@@ -111,8 +112,11 @@ public void postInitialize(PythonCore core) {
         PythonModule weakrefModule = core.lookupBuiltinModule("_weakref");
         weakrefModule.setAttribute(weakRefQueueKey, weakRefQueue);
         core.lookupType(PythonBuiltinClassType.PReferenceType).setAttribute(weakRefQueueKey, weakRefQueue);
-
+        final PythonContext ctx = core.getContext();
         core.getContext().registerAsyncAction(() -> {
+            if (!ctx.isGcEnabled()) {
+                return null;
+            }
             Reference<? extends Object> reference = null;
             try {
                 reference = weakRefQueue.remove();

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

@@ -239,6 +239,9 @@ private static final class AtExitHook {
     private final PosixResources resources;
     private final AsyncHandler handler;
 
+    // decides if we run the async weakref callbacks and destructors
+    private boolean gcEnabled = true;
+
     // A thread-local to store the full path to the currently active import statement, for Jython
     // compat
     private final ThreadLocal<ArrayDeque<String>> currentImport = new ThreadLocal<>();
@@ -1048,4 +1051,12 @@ public GraalHPyContext getHPyContext() {
         assert hPyContext != null : "tried to get HPy context but was not created yet";
         return hPyContext;
     }
+
+    public boolean isGcEnabled() {
+        return gcEnabled;
+    }
+
+    public void setGcEnabled(boolean flag) {
+        gcEnabled = flag;
+    }
 }