Disable reference queue polling during Python GC

Author: fangerer

graalpython/com.oracle.graal.python.cext/src/gcmodule.c

@@ -1585,6 +1585,11 @@ gc_collect_main(PyThreadState *tstate, int generation,
     _PyTime_t t1 = 0;   /* initialize to prevent a compiler warning */
     GCState *gcstate = graalpy_get_gc_state(tstate); // GraalPy change
 
+    if (GraalPyTruffle_DisableReferneceQueuePolling()) {
+        // reference queue polling is currently active; cannot proceed
+        return m + n;
+    }
+
     // gc_collect_main() must not be called before _PyGC_Init
     // or after _PyGC_Fini()
     assert(gcstate->garbage != NULL);
@@ -1737,6 +1742,8 @@ gc_collect_main(PyThreadState *tstate, int generation,
         PyDTrace_GC_DONE(n + m);
     }
 
+    GraalPyTruffle_EnableReferneceQueuePolling();
+
     assert(!_PyErr_Occurred(tstate));
     return n + m;
 }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/cext/PythonCextBuiltins.java

@@ -130,6 +130,7 @@
 import com.oracle.graal.python.builtins.objects.cext.capi.transitions.CApiTiming;
 import com.oracle.graal.python.builtins.objects.cext.capi.transitions.CApiTransitions;
 import com.oracle.graal.python.builtins.objects.cext.capi.transitions.CApiTransitions.GcNativePtrToPythonNode;
+import com.oracle.graal.python.builtins.objects.cext.capi.transitions.CApiTransitions.HandleContext;
 import com.oracle.graal.python.builtins.objects.cext.capi.transitions.CApiTransitions.HandlePointerConverter;
 import com.oracle.graal.python.builtins.objects.cext.capi.transitions.CApiTransitions.NativePtrToPythonWrapperNode;
 import com.oracle.graal.python.builtins.objects.cext.capi.transitions.CApiTransitions.UpdateRefNode;
@@ -1676,6 +1677,27 @@ static Object doManaged(@SuppressWarnings("unused") Object pointer) {
         }
     }
 
+    @CApiBuiltin(ret = Void, call = Ignored)
+    abstract static class PyTruffle_EnableReferneceQueuePolling extends CApiNullaryBuiltinNode {
+        @Specialization
+        static Object doGeneric(@Bind("this") Node inliningTarget) {
+            assert PythonContext.get(inliningTarget).getOption(PythonOptions.PythonGC);
+            HandleContext handleContext = PythonContext.get(inliningTarget).nativeContext;
+            CApiTransitions.enableReferenceQueuePolling(handleContext);
+            return PNone.NO_VALUE;
+        }
+    }
+
+    @CApiBuiltin(ret = Int, call = Ignored)
+    abstract static class PyTruffle_DisableReferneceQueuePolling extends CApiNullaryBuiltinNode {
+        @Specialization
+        static int doGeneric(@Bind("this") Node inliningTarget) {
+            assert PythonContext.get(inliningTarget).getOption(PythonOptions.PythonGC);
+            HandleContext handleContext = PythonContext.get(inliningTarget).nativeContext;
+            return PInt.intValue(CApiTransitions.disableReferenceQueuePolling(handleContext));
+        }
+    }
+
     private static final int TRACE_MEM = 0x1;
     private static final int LOG_INFO = 0x2;
     private static final int LOG_CONFIG = 0x4;

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/transitions/CApiTransitions.java

@@ -601,8 +601,16 @@ public static void freeClassReplacements(HandleContext handleContext) {
         handleContext.nativeLookup.clear();
     }
 
-    public static void disableReferenceQueuePolling(HandleContext handleContext) {
-        handleContext.referenceQueuePollActive = true;
+    public static boolean disableReferenceQueuePolling(HandleContext handleContext) {
+        if (!handleContext.referenceQueuePollActive) {
+            handleContext.referenceQueuePollActive = true;
+            return false;
+        }
+        return true;
+    }
+
+    public static void enableReferenceQueuePolling(HandleContext handleContext) {
+        handleContext.referenceQueuePollActive = false;
     }
 
     private static void freeNativeStub(PythonObjectReference ref) {