make confined arena threadsafe

Author: madsodgaard

Samples/SwiftAndJavaJarSampleLib/Package.swift

@@ -63,7 +63,7 @@ let package = Package(
     .target(
       name: "MySwiftLibrary",
       dependencies: [
-        .product(name: "SwiftKitSwift", package: "swift-java"),
+        .product(name: "SwiftJavaRuntimeSupport", package: "swift-java"),
       ],
       exclude: [
         "swift-java.config",

Samples/SwiftJavaExtractFFMSampleApp/Package.swift

@@ -65,7 +65,7 @@ let package = Package(
       dependencies: [
         .product(name: "SwiftJava", package: "swift-java"),
         .product(name: "CSwiftJavaJNI", package: "swift-java"),
-        .product(name: "SwiftKitSwift", package: "swift-java"),
+        .product(name: "SwiftJavaRuntimeSupport", package: "swift-java"),
       ],
       exclude: [
         "swift-java.config",

Samples/SwiftJavaExtractJNISampleApp/Package.swift

@@ -62,7 +62,7 @@ let package = Package(
       dependencies: [
         .product(name: "SwiftJava", package: "swift-java"),
         .product(name: "CSwiftJavaJNI", package: "swift-java"),
-        .product(name: "SwiftKitSwift", package: "swift-java"),
+        .product(name: "SwiftJavaRuntimeSupport", package: "swift-java"),
       ],
       exclude: [
         "swift-java.config"

Sources/JExtractSwiftLib/JNI/JNISwift2JavaGenerator+NativeTranslation.swift

@@ -851,7 +851,7 @@ extension JNISwift2JavaGenerator {
         return unwrappedName
 
       case .asyncBlocking(let inner, let isThrowing, let swiftFunctionResultType):
-        printer.print("let _semaphore$ = SwiftJava._Semaphore(value: 0)")
+        printer.print("let _semaphore$ = _Semaphore(value: 0)")
         let resultType = isThrowing ? "Result<\(swiftFunctionResultType), any Error>" : swiftFunctionResultType.description
         printer.print("var swiftResult$: \(resultType)!")
 

SwiftKitCore/src/main/java/org/swift/swiftkit/core/ConfinedSwiftMemorySession.java

@@ -16,28 +16,26 @@
 
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Queue;
+import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.concurrent.atomic.AtomicInteger;
 
 public class ConfinedSwiftMemorySession implements ClosableSwiftArena {
 
     final static int CLOSED = 0;
     final static int ACTIVE = 1;
 
-    final Thread owner;
     final AtomicInteger state;
 
     final ConfinedResourceList resources;
 
-    public ConfinedSwiftMemorySession(Thread owner) {
-        this.owner = owner;
+    public ConfinedSwiftMemorySession() {
         this.state = new AtomicInteger(ACTIVE);
         this.resources = new ConfinedResourceList();
     }
 
     void checkValid() throws RuntimeException {
-        if (this.owner != null && this.owner != Thread.currentThread()) {
-            throw new WrongThreadException(String.format("ConfinedSwift arena is confined to %s but was closed from %s!", this.owner, Thread.currentThread()));
-        } else if (this.state.get() < ACTIVE) {
+        if (this.state.get() < ACTIVE) {
             throw new RuntimeException("SwiftArena is already closed!");
         }
     }
@@ -61,8 +59,7 @@ public void register(SwiftInstance instance) {
     }
 
     static final class ConfinedResourceList implements SwiftResourceList {
-        // TODO: Could use intrusive linked list to avoid one indirection here
-        final List<SwiftInstanceCleanup> resourceCleanups = new LinkedList<>();
+        final Queue<SwiftInstanceCleanup> resourceCleanups = new ConcurrentLinkedQueue<>();
 
         void add(SwiftInstanceCleanup cleanup) {
             resourceCleanups.add(cleanup);

SwiftKitCore/src/main/java/org/swift/swiftkit/core/SwiftArena.java

@@ -31,7 +31,7 @@ public interface SwiftArena {
     void register(SwiftInstance instance);
 
     static ClosableSwiftArena ofConfined() {
-        return new ConfinedSwiftMemorySession(Thread.currentThread());
+        return new ConfinedSwiftMemorySession();
     }
 
     static SwiftArena ofAuto() {

SwiftKitFFM/src/main/java/org/swift/swiftkit/ffm/AllocatingSwiftArena.java

@@ -24,7 +24,7 @@ public interface AllocatingSwiftArena extends SwiftArena, SegmentAllocator {
     MemorySegment allocate(long byteSize, long byteAlignment);
 
     static ClosableAllocatingSwiftArena ofConfined() {
-        return new FFMConfinedSwiftMemorySession(Thread.currentThread());
+        return new FFMConfinedSwiftMemorySession();
     }
 
     static AllocatingSwiftArena ofAuto() {

SwiftKitFFM/src/main/java/org/swift/swiftkit/ffm/FFMConfinedSwiftMemorySession.java

@@ -22,8 +22,8 @@
 final class FFMConfinedSwiftMemorySession extends ConfinedSwiftMemorySession implements AllocatingSwiftArena, ClosableAllocatingSwiftArena {
     final Arena arena;
 
-    public FFMConfinedSwiftMemorySession(Thread owner) {
-        super(owner);
+    public FFMConfinedSwiftMemorySession() {
+        super();
         this.arena = Arena.ofConfined();
     }