Restrict first garbage collection

Frawak · Frawak · commit 6f0f6713e8f5 · 2024-05-13T22:38:59.000+02:00
Otherwise, collecting all at this earlier point results in corrupt memory for derived types.
diff --git a/src/runtime/Finalizer.cs b/src/runtime/Finalizer.cs
@@ -191,7 +191,7 @@ internal static void Shutdown()
             Instance.started = false;
         }
 
-        internal nint DisposeAll()
+        internal nint DisposeAll(bool disposeObj = true, bool disposeDerived = true, bool disposeBuffer = true)
         {
             if (_objQueue.IsEmpty && _derivedQueue.IsEmpty && _bufferQueue.IsEmpty)
                 return 0;
@@ -216,7 +216,7 @@ internal nint DisposeAll()
 
                 try
                 {
-                    while (!_objQueue.IsEmpty)
+                    if (disposeObj) while (!_objQueue.IsEmpty)
                     {
                         if (!_objQueue.TryDequeue(out var obj))
                             continue;
@@ -240,7 +240,7 @@ internal nint DisposeAll()
                         }
                     }
 
-                    while (!_derivedQueue.IsEmpty)
+                    if (disposeDerived) while (!_derivedQueue.IsEmpty)
                     {
                         if (!_derivedQueue.TryDequeue(out var derived))
                             continue;
@@ -258,7 +258,7 @@ internal nint DisposeAll()
                         collected++;
                     }
 
-                    while (!_bufferQueue.IsEmpty)
+                    if (disposeBuffer) while (!_bufferQueue.IsEmpty)
                     {
                         if (!_bufferQueue.TryDequeue(out var buffer))
                             continue;
diff --git a/src/runtime/Runtime.cs b/src/runtime/Runtime.cs
@@ -278,7 +278,8 @@ internal static void Shutdown()
             ClearClrModules();
             RemoveClrRootModule();
 
-            TryCollectingGarbage(MaxCollectRetriesOnShutdown, forceBreakLoops: true);
+            TryCollectingGarbage(MaxCollectRetriesOnShutdown, forceBreakLoops: true,
+                                 obj: true, derived: false, buffer: false);
 
             NullGCHandles(ExtensionType.loadedExtensions);
             ClassManager.RemoveClasses();
@@ -329,7 +330,8 @@ internal static void Shutdown()
 
         const int MaxCollectRetriesOnShutdown = 20;
         internal static int _collected;
-        static bool TryCollectingGarbage(int runs, bool forceBreakLoops)
+        static bool TryCollectingGarbage(int runs, bool forceBreakLoops,
+                                         bool obj = true, bool derived = true, bool buffer = true)
         {
             if (runs <= 0) throw new ArgumentOutOfRangeException(nameof(runs));
 
@@ -342,7 +344,9 @@ static bool TryCollectingGarbage(int runs, bool forceBreakLoops)
                     GC.Collect();
                     GC.WaitForPendingFinalizers();
                     pyCollected += PyGC_Collect();
-                    pyCollected += Finalizer.Instance.DisposeAll();
+                    pyCollected += Finalizer.Instance.DisposeAll(disposeObj: obj,
+                                                                 disposeDerived: derived,
+                                                                 disposeBuffer: buffer);
                 }
                 if (Volatile.Read(ref _collected) == 0 && pyCollected == 0)
                 {

Original file line number	Diff line number	Diff line change
`@@ -191,7 +191,7 @@ internal static void Shutdown()`
`191`	`191`	`Instance.started = false;`
`192`	`192`	`}`
`193`	`193`
`194`		`- internal nint DisposeAll()`
	`194`	`+ internal nint DisposeAll(bool disposeObj = true, bool disposeDerived = true, bool disposeBuffer = true)`
`195`	`195`	`{`
`196`	`196`	`if (_objQueue.IsEmpty && _derivedQueue.IsEmpty && _bufferQueue.IsEmpty)`
`197`	`197`	`return 0;`
`@@ -216,7 +216,7 @@ internal nint DisposeAll()`
`216`	`216`
`217`	`217`	`try`
`218`	`218`	`{`
`219`		`- while (!_objQueue.IsEmpty)`
	`219`	`+ if (disposeObj) while (!_objQueue.IsEmpty)`
`220`	`220`	`{`
`221`	`221`	`if (!_objQueue.TryDequeue(out var obj))`
`222`	`222`	`continue;`
`@@ -240,7 +240,7 @@ internal nint DisposeAll()`
`240`	`240`	`}`
`241`	`241`	`}`
`242`	`242`
`243`		`- while (!_derivedQueue.IsEmpty)`
	`243`	`+ if (disposeDerived) while (!_derivedQueue.IsEmpty)`
`244`	`244`	`{`
`245`	`245`	`if (!_derivedQueue.TryDequeue(out var derived))`
`246`	`246`	`continue;`
`@@ -258,7 +258,7 @@ internal nint DisposeAll()`
`258`	`258`	`collected++;`
`259`	`259`	`}`
`260`	`260`
`261`		`- while (!_bufferQueue.IsEmpty)`
	`261`	`+ if (disposeBuffer) while (!_bufferQueue.IsEmpty)`
`262`	`262`	`{`
`263`	`263`	`if (!_bufferQueue.TryDequeue(out var buffer))`
`264`	`264`	`continue;`