- Notifications
You must be signed in to change notification settings - Fork750
Weakref support#1267
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.
By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.
Already on GitHub?Sign in to your account
Closed
Uh oh!
There was an error while loading.Please reload this page.
Closed
Weakref support#1267
Changes fromall commits
Commits
Show all changes
13 commits Select commitHold shift + click to select a range
d6c9716 Support weakref for CLR types
amos4025d57e5a Merge branch 'master' into weakref-support
amos402f08813c Apply unified mechanism for `GetManagedObjectType`
amos402b014ce1 Merge branch 'master' into weakref-support
filmore7f97a9 Merge branch 'master' into weakref-support
amos402b68f0a4 * Remove magic offset
amos402b4b1cff Merge branch 'master' into weakref-support
amos402ff35e6d Merge branch 'master' into weakref-support
amos402ea3d47a Merge branch 'master' into weakref-support
amos402958a8eb Fix Shutdown crash
amos40253ad8d9 Use PyTypeType.tp_basicsize as size of PyHeapTypeObject directly inst…
amos402647bc8a Merge branch 'master' into weakref-support
amos402f474039 * Use C# 9.0 for Python.EmbeddingTest.csproj
amos402File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Jump to
Jump to file
Failed to load files.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Diff view
Diff view
There are no files selected for viewing
2 changes: 1 addition & 1 deletionpythonnet/__init__.py
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
1 change: 1 addition & 0 deletionssrc/embed_tests/Python.EmbeddingTest.csproj
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
78 changes: 78 additions & 0 deletionssrc/embed_tests/TestClass.cs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,78 @@ | ||
| using System; | ||
| using System.Runtime.InteropServices; | ||
| using NUnit.Framework; | ||
| using Python.Runtime; | ||
| using PyRuntime = Python.Runtime.Runtime; | ||
| namespace Python.EmbeddingTest | ||
| { | ||
| public class TestClass | ||
| { | ||
| public class MyClass | ||
| { | ||
| } | ||
| [OneTimeSetUp] | ||
| public void SetUp() | ||
| { | ||
| PythonEngine.Initialize(); | ||
| } | ||
| [OneTimeTearDown] | ||
| public void Dispose() | ||
| { | ||
| PythonEngine.Shutdown(); | ||
| } | ||
| [Test] | ||
| public void WeakRefForClrObject() | ||
| { | ||
| var obj = new MyClass(); | ||
| using var scope = Py.CreateScope(); | ||
| scope.Set("clr_obj", obj); | ||
| scope.Exec(@" | ||
| import weakref | ||
| ref = weakref.ref(clr_obj) | ||
| "); | ||
| using PyObject pyobj = scope.Get("clr_obj"); | ||
| ValidateAttachedGCHandle(obj, pyobj.Handle); | ||
| } | ||
| [Test] | ||
| public void WeakRefForSubClass() | ||
| { | ||
| using (var scope = Py.CreateScope()) | ||
| { | ||
| scope.Exec(@" | ||
| from Python.EmbeddingTest import TestClass | ||
| import weakref | ||
| class Sub(TestClass.MyClass): | ||
| pass | ||
| obj = Sub() | ||
| ref = weakref.ref(obj) | ||
| "); | ||
| using (PyObject pyobj = scope.Get("obj")) | ||
| { | ||
| IntPtr op = pyobj.Handle; | ||
| IntPtr type = PyRuntime.PyObject_TYPE(op); | ||
| IntPtr clrHandle = Marshal.ReadIntPtr(op, ObjectOffset.magic(type)); | ||
| var clobj = (CLRObject)GCHandle.FromIntPtr(clrHandle).Target; | ||
| Assert.IsTrue(clobj.inst is MyClass); | ||
| } | ||
| } | ||
| } | ||
| private static void ValidateAttachedGCHandle(object obj, IntPtr op) | ||
| { | ||
| IntPtr type = PyRuntime.PyObject_TYPE(op); | ||
| IntPtr clrHandle = Marshal.ReadIntPtr(op, ObjectOffset.magic(type)); | ||
| var clobj = (CLRObject)GCHandle.FromIntPtr(clrHandle).Target; | ||
| Assert.True(ReferenceEquals(clobj.inst, obj)); | ||
| } | ||
| } | ||
| } |
39 changes: 16 additions & 23 deletionssrc/runtime/classbase.cs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,7 @@ | ||
| using System; | ||
| using System.Collections; | ||
| using System.Collections.Generic; | ||
| using System.Runtime.InteropServices; | ||
| namespace Python.Runtime | ||
| { | ||
| @@ -354,44 +352,39 @@ public static IntPtr tp_repr(IntPtr ob) | ||
| public static void tp_dealloc(IntPtr ob) | ||
| { | ||
| ManagedType self = GetManagedObject(ob); | ||
| if (Runtime.PyType_SUPPORTS_WEAKREFS(Runtime.PyObject_TYPE(ob))) | ||
lostmsu marked this conversation as resolved. Show resolvedHide resolvedUh oh!There was an error while loading.Please reload this page. | ||
| { | ||
| Runtime.PyObject_ClearWeakRefs(ob); | ||
| } | ||
| RemoveObjectDict(ob); | ||
| Runtime.Py_CLEAR(ref self.tpHandle); | ||
| Runtime.PyObject_GC_UnTrack(ob); | ||
| Runtime.PyObject_GC_Del(ob); | ||
| self.FreeGCHandle(); | ||
| } | ||
| public static int tp_clear(IntPtr ob) | ||
| { | ||
| ClearObjectDict(ob); | ||
| return 0; | ||
| } | ||
| protected override void OnSave(InterDomainContext context) | ||
| { | ||
| base.OnSave(context); | ||
| IntPtr dict = GetObjectDict(pyHandle); | ||
| Runtime.XIncref(dict); | ||
| Runtime.XIncref(tpHandle); | ||
lostmsu marked this conversation as resolved. Show resolvedHide resolvedUh oh!There was an error while loading.Please reload this page. | ||
| context.Storage.AddValue("dict", dict); | ||
| } | ||
| protected override void OnLoad(InterDomainContext context) | ||
| { | ||
| base.OnLoad(context); | ||
| IntPtr dict = context.Storage.GetValue<IntPtr>("dict"); | ||
| SetObjectDict(pyHandle, dict); | ||
| gcHandle = AllocGCHandle(); | ||
| Marshal.WriteIntPtr(pyHandle,ObjectOffset.magic(tpHandle), (IntPtr)gcHandle); | ||
| } | ||
3 changes: 2 additions & 1 deletionsrc/runtime/classmanager.cs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
8 changes: 2 additions & 6 deletionssrc/runtime/clrobject.cs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
26 changes: 20 additions & 6 deletionssrc/runtime/exceptions.cs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -85,6 +85,13 @@ internal static Exception ToException(IntPtr ob) | ||
| } | ||
| return Runtime.PyUnicode_FromString(message); | ||
| } | ||
| public static int tp_init(IntPtr ob, IntPtr args, IntPtr kwds) | ||
| { | ||
| Exceptions.SetArgsAndCause(ob); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others.Learn more. Please, move the original comment here. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others.Learn more. What comment? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others.Learn more. NIT: You seem to have moved this from There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others.Learn more. The comment on | ||
| return 0; | ||
| } | ||
| } | ||
| /// <summary> | ||
| @@ -180,16 +187,23 @@ internal static void SetArgsAndCause(IntPtr ob) | ||
| args = Runtime.PyTuple_New(0); | ||
| } | ||
| int baseOffset = OriginalObjectOffsets.Size; | ||
| Runtime.Py_SETREF(ob, baseOffset + ExceptionOffset.args, args); | ||
| if (e.InnerException != null) | ||
| { | ||
| IntPtr cause = GetExceptHandle(e.InnerException); | ||
| Runtime.Py_SETREF(ob, baseOffset + ExceptionOffset.cause, cause); | ||
| } | ||
| } | ||
| internal static IntPtr GetExceptHandle(Exception e) | ||
| { | ||
| IntPtr op = CLRObject.GetInstHandle(e); | ||
| SetArgsAndCause(op); | ||
| return op; | ||
| } | ||
| /// <summary> | ||
| /// Shortcut for (pointer == NULL) -> throw PythonException | ||
| /// </summary> | ||
| @@ -289,7 +303,7 @@ public static void SetError(Exception e) | ||
| return; | ||
| } | ||
| IntPtr op =GetExceptHandle(e); | ||
| IntPtr etype = Runtime.PyObject_GetAttr(op, PyIdentifier.__class__); | ||
| Runtime.PyErr_SetObject(new BorrowedReference(etype), new BorrowedReference(op)); | ||
| Runtime.XDecref(etype); | ||
2 changes: 1 addition & 1 deletionsrc/runtime/extensiontype.cs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
Oops, something went wrong.
Uh oh!
There was an error while loading.Please reload this page.
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.