Skip to content

Track Runtime run number #1074

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Nov 23, 2021
Merged

Track Runtime run number #1074

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
4f657d4
Track Runtime run number. Assert, that PyObjects are only disposed in…
lostmsu Mar 3, 2020
62e2fb4
dispose registered codecs and interop configuration during shutdown
lostmsu Nov 12, 2021
1897d1b
Finalizer raises FinalizationException when it sees an object from pr…
lostmsu Nov 12, 2021
3909639
allow tests to pass when objects are leaking due to being GCed after …
lostmsu Nov 12, 2021
60d90c6
removed code testing possiblity to dispose objects after domain restart
lostmsu Nov 12, 2021
9e815a6
allow leaking PyObject instances when CLR is stared from Python
lostmsu Nov 12, 2021
8611dde
WaitForFullGCComplete was never needed, and was used incorrectly
lostmsu Nov 12, 2021
6383a28
remove finalizer assert for raw pointer value; skip collection assert…
lostmsu Nov 22, 2021
47b3913
renamed run system property to __pythonnet_run__ to be consistent wit…
lostmsu Nov 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
remove finalizer assert for raw pointer value; skip collection assert… 
… on shutdown when loaded from Python
  • Loading branch information
@lostmsu
lostmsu committed Nov 22, 2021
commit 6383a28b55e2b96f93cc4b4cd0b7ee466d67b75a
2 changes: 0 additions & 2 deletions src/runtime/pyobject.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,8 +96,6 @@ internal PyObject(in StolenReference reference)
// when the managed wrapper is garbage-collected.
~PyObject()
{
Debug.Assert(obj != IntPtr.Zero || this.GetType() != typeof(PyObject));

if (obj != IntPtr.Zero)
{

Expand Down
10 changes: 7 additions & 3 deletions src/runtime/runtime.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -379,14 +379,18 @@ internal static void Shutdown(ShutdownMode mode)
DisposeLazyModule(inspect);
PyObjectConversions.Reset();

bool everythingSeemsCollected = TryCollectingGarbage();
Debug.Assert(everythingSeemsCollected);
if (mode != ShutdownMode.Extension)
{
PyGC_Collect();
bool everythingSeemsCollected = TryCollectingGarbage();
Debug.Assert(everythingSeemsCollected);
}

Finalizer.Shutdown();
InternString.Shutdown();

if (mode != ShutdownMode.Normal && mode != ShutdownMode.Extension)
{
PyGC_Collect();
if (mode == ShutdownMode.Soft)
{
RuntimeState.Restore();
Expand Down