Implementing destructors for Kotlin callbacks (#682)

rust-diplomat · Sep 11, 2024 · 63f8cf5 · 63f8cf5
1 parent b375b3e
commit 63f8cf5
Show file tree

Hide file tree

Showing 11 changed files with 283 additions and 17 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/example/kotlin/somelib/src/main/kotlin/dev/diplomattest/somelib/Lib.kt b/example/kotlin/somelib/src/main/kotlin/dev/diplomattest/somelib/Lib.kt
@@ -1,11 +1,13 @@
 package dev.diplomattest.somelib;
 
+import com.sun.jna.JNIEnv
 import com.sun.jna.Library
 import com.sun.jna.Memory
 import com.sun.jna.Native
 import com.sun.jna.Pointer
 import com.sun.jna.Structure
 import com.sun.jna.Union
+import java.util.Collections
 
 
 // We spawn a cleaner for the library which is responsible for cleaning opaque types.
@@ -39,6 +41,26 @@ object DW {
     }
 }
 
+internal interface DiplomatJVMRuntimeLib: Library {
+    fun create_rust_jvm_cookie(env: JNIEnv, obj: Object): Pointer
+    fun destroy_rust_jvm_cookie(obj_pointer: Pointer): Unit
+}
+
+internal class DiplomatJVMRuntime {
+    companion object {
+        val libClass: Class<DiplomatJVMRuntimeLib> = DiplomatJVMRuntimeLib::class.java
+        val lib: DiplomatJVMRuntimeLib = Native.load("somelib", libClass, Collections.singletonMap(Library.OPTION_ALLOW_OBJECTS, true))
+
+        fun buildRustCookie(obj: Object): Pointer {
+            return lib.create_rust_jvm_cookie(JNIEnv.CURRENT, obj);
+        }
+
+        fun dropRustCookie(obj_pointer: Pointer): Unit {
+            lib.destroy_rust_jvm_cookie(obj_pointer);
+        }
+    }
+}
+
 
 internal object PrimitiveArrayTools {
 

diff --git a/feature_tests/Cargo.toml b/feature_tests/Cargo.toml
@@ -14,5 +14,5 @@ crate-type = ["staticlib", "rlib", "cdylib"]
 
 [dependencies]
 diplomat = { path = "../macro" }
-diplomat-runtime = { path = "../runtime", feature = ["log"] }
+diplomat-runtime = { path = "../runtime", feature = ["log", "jvm-callback-support"] }
 log = { version = "0.4" }