removed DisposePythonWrappersForClrTypes

lostmsu · lostmsu · commit d5f1c48f2e47 · 2021-10-29T19:04:26.000-07:00
they are no longer needed as ClassBase instances no longer hold Python references to themselves
diff --git a/src/runtime/classmanager.cs b/src/runtime/classmanager.cs
@@ -54,28 +54,8 @@ public static void Reset()
             cache.Clear();
         }
 
-        internal static void DisposePythonWrappersForClrTypes()
+        internal static void RemoveClasses()
         {
-            var visited = new HashSet<IntPtr>();
-            var visitedHandle = GCHandle.Alloc(visited);
-            var visitedPtr = (IntPtr)visitedHandle;
-            try
-            {
-                foreach (var cls in cache.Values)
-                {
-                    // XXX: Force to release instance's managed resources
-                    // but not dealloc itself immediately.
-                    // These managed resources should preserve vacant shells
-                    // since others may still referencing it.
-                    BorrowedReference meta = Runtime.PyObject_TYPE(cls);
-                    ManagedType.CallTypeTraverse(cls, meta, TraverseTypeClear, visitedPtr);
-                    ManagedType.CallTypeClear(cls, meta);
-                }
-            }
-            finally
-            {
-                visitedHandle.Free();
-            }
             cache.Clear();
         }
 
diff --git a/src/runtime/runtime.cs b/src/runtime/runtime.cs
@@ -284,7 +284,7 @@ internal static void Shutdown(ShutdownMode mode)
             RemoveClrRootModule();
 
             MoveClrInstancesOnwershipToPython();
-            ClassManager.DisposePythonWrappersForClrTypes();
+            ClassManager.RemoveClasses();
             TypeManager.RemoveTypes();
 
             Finalizer.Shutdown();
@@ -486,7 +486,7 @@ private static void MoveClrInstancesOnwershipToPython()
                 handle?.Free();
                 if (handle is not null)
                 {
-                ManagedType.SetGCHandle(@ref, default);
+                    ManagedType.SetGCHandle(@ref, default);
                 }
             }
 

Original file line number	Diff line number	Diff line change
`@@ -284,7 +284,7 @@ internal static void Shutdown(ShutdownMode mode)`
`284`	`284`	`RemoveClrRootModule();`
`285`	`285`
`286`	`286`	`MoveClrInstancesOnwershipToPython();`
`287`		`- ClassManager.DisposePythonWrappersForClrTypes();`
	`287`	`+ ClassManager.RemoveClasses();`
`288`	`288`	`TypeManager.RemoveTypes();`
`289`	`289`
`290`	`290`	`Finalizer.Shutdown();`
`@@ -486,7 +486,7 @@ private static void MoveClrInstancesOnwershipToPython()`
`486`	`486`	`handle?.Free();`
`487`	`487`	`if (handle is not null)`
`488`	`488`	`{`
`489`		`- ManagedType.SetGCHandle(@ref, default);`
	`489`	`+ ManagedType.SetGCHandle(@ref, default);`
`490`	`490`	`}`
`491`	`491`	`}`
`492`	`492`