Skip to content

Make finalizer use a task #852

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 4 commits into from
Apr 30, 2019
Merged

Make finalizer use a task #852

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f956f1f
Fix memory leak - finalizer
Martin-Molinero Apr 23, 2019
582fe80
Fix unit test - Refactor
Martin-Molinero Apr 23, 2019
b950c67
Merge branch 'master' into fix-memory-leak-finalizer-use-task
filmor Apr 27, 2019
cf17b3c
Fix deadlock when shuting down
Martin-Molinero Apr 29, 2019
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
Fix unit test - Refactor
  • Loading branch information
@Martin-Molinero
Martin-Molinero committed Apr 23, 2019
commit 582fe80b62fbee868f57d0f6e6bc2221c3b43833
8 changes: 4 additions & 4 deletions src/embed_tests/TestFinalizer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,9 @@ public void CollectBasicObject()
called = true;
};

Assert.IsFalse(called);
Finalizer.Instance.CollectOnce += handler;

WeakReference shortWeak;
WeakReference longWeak;
{
Expand All @@ -60,12 +63,9 @@ public void CollectBasicObject()
Assert.NotZero(garbage.Count);
Assert.IsTrue(garbage.Any(T => ReferenceEquals(T.Target, longWeak.Target)));
}

Assert.IsFalse(called);
Finalizer.Instance.CollectOnce += handler;
try
{
Finalizer.Instance.CallPendingFinalizers();
Finalizer.Instance.Collect(forceDispose: false);
}
finally
{
Expand Down
24 changes: 9 additions & 15 deletions src/runtime/finalizer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,22 +75,19 @@ private Finalizer()
Threshold = 200;
}

public bool CallPendingFinalizers()
public void Collect(bool forceDispose = true)
{
if (Instance._finalizerTask != null
&& !Instance._finalizerTask.IsCompleted)
{
var ts = PythonEngine.BeginAllowThreads();
Instance._finalizerTask.Wait();
PythonEngine.EndAllowThreads(ts);
return true;
using (Py.GIL())
{
var ts = PythonEngine.BeginAllowThreads();
Instance._finalizerTask.Wait();
PythonEngine.EndAllowThreads(ts);
}
}
return false;
}

public void Collect()
{
if (!Instance.CallPendingFinalizers())
else if (forceDispose)
{
Instance.DisposeAll();
}
Expand Down Expand Up @@ -133,10 +130,7 @@ internal static void Shutdown()
Instance._objQueue = new ConcurrentQueue<IPyDisposable>();
return;
}
if(!Instance.CallPendingFinalizers())
{
Instance.DisposeAll();
}
Instance.Collect(forceDispose: true);
}

private void AddPendingCollect()
Expand Down