Fixed deadlock on finalizer after shutdown

amos402 · amos402 · commit 1cb8e8cfcc1c · 2019-10-13T17:37:43.000+08:00
diff --git a/src/runtime/runtime.cs b/src/runtime/runtime.cs
@@ -193,6 +193,11 @@ internal static void Initialize(bool initSigs = false, bool softShutdown = false
                 }
                 MainManagedThreadId = Thread.CurrentThread.ManagedThreadId;
             }
+            else
+            {
+                PyGILState_Ensure();
+                MainManagedThreadId = Thread.CurrentThread.ManagedThreadId;
+            }
 
             IsFinalizing = false;
 
@@ -406,6 +411,16 @@ internal static void Shutdown(bool soft)
                 PyGC_Collect();
                 RuntimeState.Restore();
                 ResetPyMembers();
+                GC.Collect();
+                try
+                {
+                    GC.WaitForFullGCComplete();
+                }
+                catch (NotImplementedException)
+                {
+                    // Some clr runtime didn't implement GC.WaitForFullGCComplete yet.
+                }
+                PyEval_SaveThread();
                 return;
             }
             ResetPyMembers();
diff --git a/src/runtime/typemanager.cs b/src/runtime/typemanager.cs
@@ -1050,8 +1050,10 @@ private void ResetSlots()
                 return;
             }
             _alredyReset = true;
+#if DEBUG
             IntPtr tp_name = Marshal.ReadIntPtr(_type, TypeOffset.tp_name);
             string typeName = Marshal.PtrToStringAnsi(tp_name);
+#endif
             foreach (var offset in _slots.Keys)
             {
                 IntPtr ptr = GetDefaultSlot(offset);

Original file line number	Diff line number	Diff line change
`@@ -1050,8 +1050,10 @@ private void ResetSlots()`
`1050`	`1050`	`return;`
`1051`	`1051`	`}`
`1052`	`1052`	`_alredyReset = true;`
	`1053`	`+#if DEBUG`
`1053`	`1054`	`IntPtr tp_name = Marshal.ReadIntPtr(_type, TypeOffset.tp_name);`
`1054`	`1055`	`string typeName = Marshal.PtrToStringAnsi(tp_name);`
	`1056`	`+#endif`
`1055`	`1057`	`foreach (var offset in _slots.Keys)`
`1056`	`1058`	`{`
`1057`	`1059`	`IntPtr ptr = GetDefaultSlot(offset);`