Merge remote-tracking branch 'amos/soft-shutdown' into soft-shutdown-review-comments

BadSingleton · BadSingleton · commit 0af3504dc31b · 2020-08-27T09:55:42.000-04:00
diff --git a/src/runtime/classmanager.cs b/src/runtime/classmanager.cs
@@ -48,8 +48,11 @@ internal static void DisposePythonWrappersForClrTypes()
             {
                 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.
                     cls.CallTypeTraverse(TraverseTypeClear, visitedPtr);
-                    // XXX: Force release instance resources but not dealloc itself.
                     cls.CallTypeClear();
                     cls.DecrRefCount();
                 }

Original file line number	Diff line number	Diff line change
`@@ -48,8 +48,11 @@ internal static void DisposePythonWrappersForClrTypes()`
`48`	`48`	`{`
`49`	`49`	`foreach (var cls in cache.Values)`
`50`	`50`	`{`
	`51`	`+ // XXX: Force to release instance's managed resources`
	`52`	`+ // but not dealloc itself immediately.`
	`53`	`+ // These managed resources should preserve vacant shells`
	`54`	`+ // since others may still referencing it.`
`51`	`55`	`cls.CallTypeTraverse(TraverseTypeClear, visitedPtr);`
`52`		`- // XXX: Force release instance resources but not dealloc itself.`
`53`	`56`	`cls.CallTypeClear();`
`54`	`57`	`cls.DecrRefCount();`
`55`	`58`	`}`