finalizer does not attempt to finalize objects when runtime is shut down

lostmsu · lostmsu · commit b0c25c17798d · 2021-10-29T19:04:26.000-07:00
diff --git a/src/runtime/finalizer.cs b/src/runtime/finalizer.cs
@@ -34,6 +34,8 @@ public ErrorArgs(Exception error)
         [DefaultValue(DefaultThreshold)]
         public int Threshold { get; set; } = DefaultThreshold;
 
+        bool started;
+
         [DefaultValue(true)]
         public bool Enable { get; set; } = true;
 
@@ -105,7 +107,7 @@ internal IncorrectRefCountException(IntPtr ptr)
         internal void ThrottledCollect()
         {
             _throttled = unchecked(this._throttled + 1);
-            if (!Enable || _throttled < Threshold) return;
+            if (!started || !Enable || _throttled < Threshold) return;
             _throttled = 0;
             this.Collect();
         }
@@ -131,9 +133,15 @@ internal void AddFinalizedObject(ref IntPtr obj)
             obj = IntPtr.Zero;
         }
 
+        internal static void Initialize()
+        {
+            Instance.started = true;
+        }
+
         internal static void Shutdown()
         {
             Instance.DisposeAll();
+            Instance.started = false;
         }
 
         private void DisposeAll()
diff --git a/src/runtime/runtime.cs b/src/runtime/runtime.cs
@@ -149,9 +149,10 @@ internal static void Initialize(bool initSigs = false, ShutdownMode mode = Shutd
             }
             else
             {
-                PyCLRMetaType = MetaType.Initialize(); // Steal a reference
+                PyCLRMetaType = MetaType.Initialize();
                 ImportHook.Initialize();
             }
+            Finalizer.Initialize();
             Exceptions.Initialize();
 
             // Need to add the runtime directory to sys.path so that we
@@ -286,12 +287,13 @@ internal static void Shutdown(ShutdownMode mode)
             ClassManager.DisposePythonWrappersForClrTypes();
             TypeManager.RemoveTypes();
 
+            Finalizer.Shutdown();
+
             MetaType.Release();
             PyCLRMetaType.Dispose();
             PyCLRMetaType = null!;
 
             Exceptions.Shutdown();
-            Finalizer.Shutdown();
             InternString.Shutdown();
 
             if (mode != ShutdownMode.Normal && mode != ShutdownMode.Extension)

Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,8 @@ public ErrorArgs(Exception error)`
`34`	`34`	`[DefaultValue(DefaultThreshold)]`
`35`	`35`	`public int Threshold { get; set; } = DefaultThreshold;`
`36`	`36`
	`37`	`+ bool started;`
	`38`	`+`
`37`	`39`	`[DefaultValue(true)]`
`38`	`40`	`public bool Enable { get; set; } = true;`
`39`	`41`
`@@ -105,7 +107,7 @@ internal IncorrectRefCountException(IntPtr ptr)`
`105`	`107`	`internal void ThrottledCollect()`
`106`	`108`	`{`
`107`	`109`	`_throttled = unchecked(this._throttled + 1);`
`108`		`- if (!Enable \|\| _throttled < Threshold) return;`
	`110`	`+ if (!started \|\| !Enable \|\| _throttled < Threshold) return;`
`109`	`111`	`_throttled = 0;`
`110`	`112`	`this.Collect();`
`111`	`113`	`}`
`@@ -131,9 +133,15 @@ internal void AddFinalizedObject(ref IntPtr obj)`
`131`	`133`	`obj = IntPtr.Zero;`
`132`	`134`	`}`
`133`	`135`
	`136`	`+ internal static void Initialize()`
	`137`	`+ {`
	`138`	`+ Instance.started = true;`
	`139`	`+ }`
	`140`	`+`
`134`	`141`	`internal static void Shutdown()`
`135`	`142`	`{`
`136`	`143`	`Instance.DisposeAll();`
	`144`	`+ Instance.started = false;`
`137`	`145`	`}`
`138`	`146`
`139`	`147`	`private void DisposeAll()`