Unfinished

Author: matthiasblaesing

build.xml

@@ -1240,6 +1240,7 @@ cd ..
       <!-- enable JNI on JDK 24+ -->
       <jvmarg value="--enable-native-access=ALL-UNNAMED" />
       <jvmarg if:set="test.jdwp" value="${test.jdwp}" />
+      <jvmarg value="-Xmx64m" />
       <!-- optionally run headless -->
       <syspropertyset refid="headless"/>
       <!-- avoid VM conflicts with JNA protected mode -->

lib/native/linux-x86-64.jar

@@ -85,6 +85,7 @@ public Cleanable register(Object obj, Runnable cleanupTask) {
     }
 
     private CleanerRef add(CleanerRef ref) {
+        runCleanup();
         map.put(ref, ref);
         cleanerThreadLock.readLock().lock();
         try {
@@ -109,6 +110,16 @@ private CleanerRef add(CleanerRef ref) {
         return ref;
     }
 
+    private void runCleanup() {
+        if (Boolean.valueOf(System.getProperty("jna.inlinecleanup", "false"))) {
+            for (Reference<? extends Object> cref = referenceQueue.poll(); cref != null; cref = referenceQueue.poll()) {
+                if (cref instanceof CleanerRef) {
+                    ((CleanerRef) cref).clean();
+                }
+            }
+        }
+    }
+
     private void remove(CleanerRef ref) {
         map.remove(ref);
         cleanerThreadLock.readLock().lock();

src/com/sun/jna/internal/Cleaner.java

@@ -0,0 +1,47 @@
+package com.sun.jna.different_package;
+
+import com.sun.jna.Structure;
+import junit.framework.TestCase;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class CleanerTest extends TestCase {
+    private static final int NUM_THREADS = 16;
+    private static final long ITERATIONS = 10000;
+
+    @Structure.FieldOrder({"bytes"})
+    public static class Dummy extends Structure {
+        public byte[] bytes;
+
+        public Dummy() {}
+
+        public Dummy(byte[] what) { bytes = what; }
+    }
+
+    private static class Allocator implements Runnable {
+        @Override
+        public void run() {
+            for (long i = 0; i < ITERATIONS; ++i) {
+                Dummy d = new Dummy(new byte[1024]);
+                d.write();
+            }
+        }
+    }
+
+    public void testOOM() {
+        List<Thread> threads = new ArrayList<>(NUM_THREADS);
+        for (int i = 0; i < NUM_THREADS; ++i) {
+            Thread t = new Thread(new Allocator());
+            t.start();
+            threads.add(t);
+        }
+        for (Thread t : threads) {
+            while (t.isAlive()) {
+                try {
+                    t.join();
+                } catch (InterruptedException ignore) {}
+            }
+        }
+    }
+}