🌐 AI搜索 & 代理 主页
Skip to content

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.

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
amos402 wants to merge 13 commits into from
Closed

Weakref support #1267

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
d6c9716
Support weakref for CLR types
amos402 Sep 24, 2020
5d57e5a
Merge branch 'master' into weakref-support
amos402 Oct 22, 2020
f08813c
Apply unified mechanism for `GetManagedObjectType`
amos402 Oct 22, 2020
b014ce1
Merge branch 'master' into weakref-support
filmor Dec 10, 2020
e7f97a9
Merge branch 'master' into weakref-support
amos402 Dec 21, 2020
b68f0a4
* Remove magic offset
amos402 Dec 21, 2020
b4b1cff
Merge branch 'master' into weakref-support
amos402 Dec 21, 2020
ff35e6d
Merge branch 'master' into weakref-support
amos402 Feb 10, 2021
ea3d47a
Merge branch 'master' into weakref-support
amos402 Feb 19, 2021
958a8eb
Fix Shutdown crash
amos402 Feb 19, 2021
53ad8d9
Use PyTypeType.tp_basicsize as size of PyHeapTypeObject directly inst…
amos402 Feb 19, 2021
647bc8a
Merge branch 'master' into weakref-support
amos402 Feb 21, 2021
f474039
* Use C# 9.0 for Python.EmbeddingTest.csproj
amos402 Feb 21, 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
Apply unified mechanism for GetManagedObjectType
  • Loading branch information
@amos402
amos402 committed Oct 22, 2020
commit f08813c7dc013bc104be6848609bb7d2279580fb
14 changes: 4 additions & 10 deletions src/runtime/managedtype.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,18 +108,12 @@ internal static ManagedType GetManagedObject(IntPtr ob)
/// </summary>
internal static ManagedType GetManagedObjectType(IntPtr ob)
{
if (ob != IntPtr.Zero)
if (ob == IntPtr.Zero)
{
IntPtr tp = Runtime.PyObject_TYPE(ob);
var flags = Util.ReadCLong(tp, TypeOffset.tp_flags);
if ((flags & TypeFlags.Managed) != 0)
{
tp = Marshal.ReadIntPtr(tp, TypeOffset.magic());
var gc = (GCHandle)tp;
return (ManagedType)gc.Target;
}
return null;
}
return null;
IntPtr tp = Runtime.PyObject_TYPE(ob);
return GetManagedObject(tp);
Copy link
Member

@lostmsu lostmsu Nov 18, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this code is not equivalent to the original code. The original code did ob.type.tp_flags.HasFlag(Managed), and the new code only does ob.type.type.tp_flags.HasFlag(Managed).
I believe the old check might also need to be necessary.

Copy link
Member Author

@amos402 amos402 Dec 21, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, it's not equivalent. It becomes simple and faster since the memory model been unified.
You can treat the old code was a trick: ob may be a type or an object. You can also see I removed the code on the bellow

        public bool IsTypeObject()
        {
            return pyHandle == tpHandle;
        }

For now, if the type of ob is managed, then the ob must be a managed object, it's obvious on the logic.

}


Expand Down