JSObject异步垃圾回收部分逻辑

Author: chexiongsheng

unity/Assets/core/upm/Runtime/Src/PInvoke/JSType/JSObject.cs

@@ -30,6 +30,10 @@ internal JSObject(IntPtr apis, IntPtr valueRef)
         public T Get<T>(string key) 
         {
             var envRef = NativeAPI.pesapi_get_ref_associated_env(apis, objRef);
+            if (!NativeAPI.pesapi_env_ref_is_valid(apis, envRef))
+            {
+                throw new InvalidOperationException("associated script env has disposed!");
+            }
             var scope = NativeAPI.pesapi_open_scope(apis, envRef);
             var env = NativeAPI.pesapi_get_env_from_ref(apis, envRef);
             var obj = NativeAPI.pesapi_get_value_from_ref(apis, env, objRef);
@@ -50,7 +54,26 @@ public T Get<T>(string key)
             lock(jsEnv) 
             {
 #endif
-            
+            UnityEngine.Debug.Log("~JSObject~JSObject~JSObject");
+            var envRef = NativeAPI.pesapi_get_ref_associated_env(apis, objRef);
+            if (!NativeAPI.pesapi_env_ref_is_valid(apis, envRef))
+            {
+                NativeAPI.pesapi_release_env_ref(apis, envRef);
+            }
+            else
+            {
+                var scope = NativeAPI.pesapi_open_scope(apis, envRef);
+                try
+                {
+                    var env = NativeAPI.pesapi_get_env_from_ref(apis, envRef);
+                    var envIdx = NativeAPI.pesapi_get_env_private(apis, env).ToInt32();
+                    JsEnv.jsEnvs[envIdx].addPendingKillScriptObjects(objRef);
+                } 
+                finally
+                {
+                    NativeAPI.pesapi_close_scope(apis, scope);
+                }
+            }
 #if THREAD_SAFE
             }
 #endif

unity/Assets/core/upm/Runtime/Src/PInvoke/JsEnv.cs

@@ -445,6 +445,40 @@ public static void LogErrorCallback(string msg)
 #endif
         }
 
+        List<IntPtr> pendingKillScriptObjectRefs = new List<IntPtr>();
+
+        internal void addPendingKillScriptObjects(IntPtr envRef)
+        {
+            lock (pendingKillScriptObjectRefs)
+            {
+                pendingKillScriptObjectRefs.Add(envRef);
+            }
+        }
+
+        internal void cleanupPendingKillScriptObjects()
+        {
+            lock (pendingKillScriptObjectRefs)
+            {
+                if (pendingKillScriptObjectRefs.Count == 0) return;
+                var scope = apis.open_scope(envRef);
+                try
+                {
+                    var env = apis.get_env_from_ref(envRef);
+                    while (pendingKillScriptObjectRefs.Count > 0)
+                    {
+                        var lastIndex = pendingKillScriptObjectRefs.Count - 1;
+                        var objRef = pendingKillScriptObjectRefs[lastIndex];
+                        pendingKillScriptObjectRefs.RemoveAt(lastIndex);
+
+                    }
+                }
+                finally
+                {
+                    apis.close_scope(scope);
+                }
+            }
+        }
+
         ~JsEnv()
         {
 #if THREAD_SAFE

unity/Assets/core/upm/Runtime/Src/PInvoke/Wrapper/ExpressionsWrap.cs

@@ -311,7 +311,7 @@ public static JSObject ScriptToNative_ScriptObject(IntPtr apis, IntPtr env, IntP
                 if (ret == null)
                 {
                     ret = new JSObject(apis, valueRef);
-                    weakHandle = GCHandle.ToIntPtr(GCHandle.Alloc(ret));
+                    weakHandle = GCHandle.ToIntPtr(GCHandle.Alloc(ret, GCHandleType.Weak));
                     Marshal.StructureToPtr(weakHandle, weakHandlePtr, false);
                 }
                 return ret;