Rename ClassManager.OnVisit

BadSingleton · BadSingleton · commit 883c4cebc5a8 · 2020-08-20T15:21:40.000-04:00
To `TraverseTypeClear` to emphasis it's used for type traversal (similar to tp_traverse) Addresses comment: #958
diff --git a/src/runtime/classmanager.cs b/src/runtime/classmanager.cs
@@ -48,7 +48,7 @@ internal static void DisposePythonWrappersForClrTypes()
             {
                 foreach (var cls in cache.Values)
                 {
-                    cls.CallTypeTraverse(OnVisit, visitedPtr);
+                    cls.CallTypeTraverse(TraverseTypeClear, visitedPtr);
                     // XXX: Force release instance resources but not dealloc itself.
                     cls.CallTypeClear();
                     cls.DecrRefCount();
@@ -61,7 +61,7 @@ internal static void DisposePythonWrappersForClrTypes()
             cache.Clear();
         }
 
-        private static int OnVisit(IntPtr ob, IntPtr arg)
+        private static int TraverseTypeClear(IntPtr ob, IntPtr arg)
         {
             var visited = (HashSet<IntPtr>)GCHandle.FromIntPtr(arg).Target;
             if (!visited.Add(ob))
@@ -71,7 +71,7 @@ private static int OnVisit(IntPtr ob, IntPtr arg)
             var clrObj = ManagedType.GetManagedObject(ob);
             if (clrObj != null)
             {
-                clrObj.CallTypeTraverse(OnVisit, arg);
+                clrObj.CallTypeTraverse(TraverseTypeClear, arg);
                 clrObj.CallTypeClear();
             }
             return 0;

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ internal static void DisposePythonWrappersForClrTypes()`
`48`	`48`	`{`
`49`	`49`	`foreach (var cls in cache.Values)`
`50`	`50`	`{`
`51`		`- cls.CallTypeTraverse(OnVisit, visitedPtr);`
	`51`	`+ cls.CallTypeTraverse(TraverseTypeClear, visitedPtr);`
`52`	`52`	`// XXX: Force release instance resources but not dealloc itself.`
`53`	`53`	`cls.CallTypeClear();`
`54`	`54`	`cls.DecrRefCount();`
`@@ -61,7 +61,7 @@ internal static void DisposePythonWrappersForClrTypes()`
`61`	`61`	`cache.Clear();`
`62`	`62`	`}`
`63`	`63`
`64`		`- private static int OnVisit(IntPtr ob, IntPtr arg)`
	`64`	`+ private static int TraverseTypeClear(IntPtr ob, IntPtr arg)`
`65`	`65`	`{`
`66`	`66`	`var visited = (HashSet<IntPtr>)GCHandle.FromIntPtr(arg).Target;`
`67`	`67`	`if (!visited.Add(ob))`
`@@ -71,7 +71,7 @@ private static int OnVisit(IntPtr ob, IntPtr arg)`
`71`	`71`	`var clrObj = ManagedType.GetManagedObject(ob);`
`72`	`72`	`if (clrObj != null)`
`73`	`73`	`{`
`74`		`- clrObj.CallTypeTraverse(OnVisit, arg);`
	`74`	`+ clrObj.CallTypeTraverse(TraverseTypeClear, arg);`
`75`	`75`	`clrObj.CallTypeClear();`
`76`	`76`	`}`
`77`	`77`	`return 0;`