bulk close only every so often

Author: timfel

graalpython/com.oracle.graal.python.jni/src/hpy_jni.c

@@ -71,6 +71,7 @@ static JNIEnv* jniEnv;
     UPCALL(TypeGenericNew, SIG_HPY, SIG_HPY) \
     UPCALL(AsStruct, SIG_HPY, SIG_PTR) \
     UPCALL(Close, SIG_HPY, SIG_VOID) \
+    UPCALL(BulkClose, SIG_PTR SIG_INT, SIG_VOID)        \
     UPCALL(FloatFromDouble, SIG_DOUBLE, SIG_HPY) \
     UPCALL(FloatAsDouble, SIG_HPY, SIG_DOUBLE) \
     UPCALL(LongAsLong, SIG_HPY, SIG_LONG) \
@@ -322,12 +323,25 @@ static HPy augment_LongFromLong(HPyContext *ctx, long l) {
     }
 }
 
+#define MAX_UNCLOSED_HANDLES 32
+static int32_t unclosedHandleTop = 0;
+static uint64_t unclosedHandles[MAX_UNCLOSED_HANDLES] = { 0 };
+
 static void augment_Close(HPyContext *ctx, HPy h) {
     uint64_t bits = toBits(h);
     if (!bits) {
         return;
     } else if (isBoxedHandle(bits)) {
-        return original_Close(ctx, h);
+        if (bits < IMMUTABLE_HANDLES) {
+            return;
+        }
+        if (unclosedHandleTop < MAX_UNCLOSED_HANDLES) {
+            unclosedHandles[unclosedHandleTop++] = bits;
+        } else {
+            DO_UPCALL_VOID(CONTEXT_INSTANCE(ctx), BulkClose, unclosedHandles, unclosedHandleTop);
+            memset(unclosedHandles, 0, sizeof(uint64_t) * unclosedHandleTop);
+            unclosedHandleTop = 0;
+        }
     }
 }
 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/hpy/GraalHPyContext.java

@@ -1373,6 +1373,7 @@ public enum Counter {
         UpcallTrackerClose,
         UpcallTrackerAdd,
         UpcallClose,
+        UpcallBulkClose,
         UpcallTrackerNew,
         UpcallGetItemI,
         UpcallSetItem,
@@ -1571,6 +1572,17 @@ public final void ctxClose(long handle) {
         closeNativeHandle(handle);
     }
 
+    public final void ctxBulkClose(long unclosedHandlePtr, int size) {
+        Counter.UpcallBulkClose.increment();
+        for (int i = 0; i < size; i++) {
+            long handle = unsafe.getLong(unclosedHandlePtr);
+            unclosedHandlePtr += 8;
+            assert GraalHPyBoxing.isBoxedHandle(handle);
+            assert handle >= IMMUTABLE_HANDLE_COUNT;
+            getObjectForHPyHandle(GraalHPyBoxing.unboxHandle(handle)).closeAndInvalidate(this);
+        }
+    }
+
     public final long ctxDup(long handle) {
         Counter.UpcallDup.increment();
         if (GraalHPyBoxing.isBoxedHandle(handle)) {

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/resources/jni-config.json

@@ -13,6 +13,7 @@
     {"name":"ctxSetItemi","parameterTypes":["long","long","long"] }, 
     {"name":"ctxLength","parameterTypes":["long"] }, 
     {"name":"ctxListCheck","parameterTypes":["long"] }, 
+    {"name":"ctxBulkClose","parameterTypes":["long","int"] },
     {"name":"ctxListNew","parameterTypes":["long"] },
     {"name":"ctxLongAsLong","parameterTypes":["long"] },
     {"name":"ctxLongAsDouble","parameterTypes":["long"] },