回收逻辑

Author: chexiongsheng

unity/Assets/core/upm/Runtime/Src/IL2Cpp/Native/NativeAPI.cs

@@ -731,7 +731,7 @@ public static void SetLogCallback(LogCallback log, LogCallback logWarning, LogCa
 #if UNITY_EDITOR_WIN || UNITY_STANDALONE_WIN || PUERTS_GENERAL || (UNITY_WSA && !UNITY_EDITOR)
     [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
 #endif
-    public delegate IntPtr pesapi_get_ref_internal_fields_func(IntPtr value_ref, ref uint pinternal_field_count);
+    public delegate IntPtr pesapi_get_ref_internal_fields_func(IntPtr value_ref, out uint pinternal_field_count);
 
 #if UNITY_EDITOR_WIN || UNITY_STANDALONE_WIN || PUERTS_GENERAL || (UNITY_WSA && !UNITY_EDITOR)
     [UnmanagedFunctionPointer(CallingConvention.Cdecl)]

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

@@ -54,7 +54,6 @@ 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))
             {

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

@@ -379,12 +379,17 @@ public void UsingFunc<T1, T2, T3, T4, TResult>()
 #endif
         }
 
+        public Action TickHandler;
+
         public void Tick()
         {
 #if THREAD_SAFE
             lock(this) {
 #endif
-            // TODO
+            cleanupPendingKillScriptObjects();
+            PuertsDLL.InspectorTick(isolate);
+            PuertsDLL.LogicTick(isolate);
+            if (TickHandler != null) TickHandler();
 #if THREAD_SAFE
             }
 #endif
@@ -447,11 +452,12 @@ public static void LogErrorCallback(string msg)
 
         List<IntPtr> pendingKillScriptObjectRefs = new List<IntPtr>();
 
-        internal void addPendingKillScriptObjects(IntPtr envRef)
+        internal void addPendingKillScriptObjects(IntPtr objRef)
         {
             lock (pendingKillScriptObjectRefs)
             {
-                pendingKillScriptObjectRefs.Add(envRef);
+                pendingKillScriptObjectRefs.Add(objRef);
+                //UnityEngine.Debug.Log($"addPendingKillScriptObjects {objRef}");
             }
         }
 
@@ -470,6 +476,26 @@ internal void cleanupPendingKillScriptObjects()
                         var objRef = pendingKillScriptObjectRefs[lastIndex];
                         pendingKillScriptObjectRefs.RemoveAt(lastIndex);
 
+                        uint internal_field_count = 0;
+                        IntPtr weakHandlePtr = apis.get_ref_internal_fields(objRef, out internal_field_count);
+                        if (internal_field_count != 1)
+                        {
+                            throw new InvalidProgramException($"invalud internal fields count {internal_field_count}!");
+                        }
+
+                        IntPtr weakHandle = Marshal.PtrToStructure<IntPtr>(weakHandlePtr);
+
+                        if (weakHandle != IntPtr.Zero)
+                        {
+                            var handle = GCHandle.FromIntPtr(weakHandle);
+                            if (handle.Target == null)
+                            {
+                                var obj = apis.get_value_from_ref(env, objRef);
+                                apis.set_private(env, obj, IntPtr.Zero);
+                                //UnityEngine.Debug.Log($"cleanupPendingKillScriptObjects {objRef}");
+                                apis.release_value_ref(objRef);
+                            }
+                        }
                     }
                 }
                 finally