Visitar URL original
On shutdown from Python release all slot holders by filmor · Pull Request #1720 · pythonnet/pythonnet · GitHub
Skip to content

On shutdown from Python release all slot holders #1720

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

Closed
filmor wants to merge 7 commits into from
Closed

On shutdown from Python release all slot holders #1720

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5e041af
on runtime shutdown from Python release all slot holders, not only th…
lostmsu Mar 4, 2022
39db9f4
Ensure that shutdown is called from Python
filmor Mar 10, 2022
958c321
Use Py.GIL directly, now that it doesn't try to init anymore
filmor Mar 10, 2022
37e6280
Attempt to make shutdowns not crash
filmor Mar 29, 2022
5af8785
Modernise syntax a bit
filmor Mar 30, 2022
cf6e064
Fix Py.SetArgv for systems that don't support GetCommandLineArgs
filmor Mar 30, 2022
01f473f
Modernise syntax in ClassDerived
filmor Mar 30, 2022
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
Next Next commit
on runtime shutdown from Python release all slot holders, not only th… 
…e ones, that belong to managed types
  • Loading branch information
@lostmsu
lostmsu committed Mar 4, 2022
commit 5e041afadbb119bd2816bd483adf62a347b9c639
16 changes: 10 additions & 6 deletions src/runtime/TypeManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,18 +51,21 @@ internal static void Initialize()

internal static void RemoveTypes()
{
foreach (var type in cache.Values)
if (Runtime.HostedInPython)
{
if (Runtime.HostedInPython
&& _slotsHolders.TryGetValue(type, out var holder))
foreach (var holder in _slotsHolders)
{
// If refcount > 1, it needs to reset the managed slot,
// otherwise it can dealloc without any trick.
if (Runtime.Refcount(type) > 1)
if (holder.Key.Refcount > 1)
{
holder.ResetSlots();
holder.Value.ResetSlots();
}
}
}

foreach (var type in cache.Values)
{
type.Dispose();
}
cache.Clear();
Expand Down Expand Up @@ -507,7 +510,7 @@ internal static PyType CreateMetaType(Type impl, out SlotsHolder slotsHolder)
{
throw PythonException.ThrowLastAsClrException();
}

BorrowedReference dict = Util.ReadRef(type, TypeOffset.tp_dict);
using (var mod = Runtime.PyString_FromString("clr._internal"))
Runtime.PyDict_SetItemString(dict, "__module__", mod.Borrow());
Expand Down Expand Up @@ -726,6 +729,7 @@ internal static void CopySlot(BorrowedReference from, BorrowedReference to, int

internal static SlotsHolder CreateSlotsHolder(PyType type)
{
type = new PyType(type);
var holder = new SlotsHolder(type);
_slotsHolders.Add(type, holder);
return holder;
Expand Down
1 change: 0 additions & 1 deletion src/runtime/Types/ModuleObject.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -542,7 +542,6 @@ public static Assembly AddReference(string name)
/// <returns>The Type object</returns>

[ModuleFunction]
[ForbidPythonThreads]
public static Type GetClrType(Type type)
{
return type;
Expand Down
4 changes: 4 additions & 0 deletions tests/test_engine.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,3 +41,7 @@ def test_run_string():
assert sys.multiline_worked == 1

PythonEngine.ReleaseLock()

def test_leak_type():
import clr
sys._leaked_intptr = clr.GetClrType(System.IntPtr)