WIP

losttech · lostmsu · Dec 9, 2021 · Oct 24, 2021 · Oct 28, 2021 · Oct 28, 2021
commit 7ed0c7aa260f7043163e49a8fb5e58fd2fcf897c
diff --git a/src/runtime/DefaultBaseTypeProvider.cs b/src/runtime/DefaultBaseTypeProvider.cs
@@ -24,7 +24,7 @@ static BorrowedReference GetBaseType(Type type)
                 return Exceptions.Exception;
 
             return type.BaseType is not null
-                ? ClassManager.GetClass(type.BaseType).ObjectReference
+                ? ClassManager.GetClass(type.BaseType)
                 : Runtime.PyBaseObjectType;
         }
 

diff --git a/src/runtime/ManagedTypes.cd b/src/runtime/ManagedTypes.cd
@@ -3,7 +3,7 @@
   <Class Name="Python.Runtime.ClassBase" Collapsed="true">
     <Position X="15" Y="1.75" Width="1.5" />
     <TypeIdentifier>
-      <HashCode>FAAAAgAIAAAEDAAAAAAAAEACIACJAAIAAAAAAAIAAAQ=</HashCode>
+      <HashCode>VAAAAgAIAAAEDAAAAAAAAEACIACLAAIAAAAAAAIAoBU=</HashCode>
       <FileName>classbase.cs</FileName>
     </TypeIdentifier>
   </Class>
@@ -17,7 +17,7 @@
   <Class Name="Python.Runtime.ArrayObject" Collapsed="true">
     <Position X="10.5" Y="3.25" Width="1.5" />
     <TypeIdentifier>
-      <HashCode>AAAAAAAAABAAAAAAAAAAACAAIAAJAAAAIAAAAACAAAI=</HashCode>
+      <HashCode>AAQAgAAAABAQAAAAAAAARGAAMgAJAAAAJAACACSABAI=</HashCode>
       <FileName>arrayobject.cs</FileName>
     </TypeIdentifier>
   </Class>
@@ -31,28 +31,28 @@
   <Class Name="Python.Runtime.BoundContructor" Collapsed="true">
     <Position X="29.5" Y="4.5" Width="1.5" />
     <TypeIdentifier>
-      <HashCode>AAAACAAAAAAABABAAAAACAAAABAJAEAAAAAAAAIAAAA=</HashCode>
+      <HashCode>AAAACAAAAAAAAABAAAAACAAAABAJAAAAAAAAAAJAAAA=</HashCode>
       <FileName>constructorbinding.cs</FileName>
     </TypeIdentifier>
   </Class>
   <Class Name="Python.Runtime.CLRObject" Collapsed="true">
     <Position X="18.25" Y="1.75" Width="1.5" />
     <TypeIdentifier>
-      <HashCode>EAAAAAAAAAAAAAAAAAACAAACBIAAAAJAAAAAAAAAAAA=</HashCode>
+      <HashCode>AAAAAAAAAAAAAAAAAAACAAACAIAAAAIAAAAAAAAAABA=</HashCode>
       <FileName>clrobject.cs</FileName>
     </TypeIdentifier>
   </Class>
   <Class Name="Python.Runtime.CLRModule" Collapsed="true">
     <Position X="25" Y="4.75" Width="1.5" />
     <TypeIdentifier>
-      <HashCode>AAAAAEAgIAQABAAAAABAAAAAIAIAAAAAAhAQAAAAKBA=</HashCode>
+      <HashCode>AAAAAEIgIAQABAAAAABAAAAAIAIAAAAgAhAQAAAAKBA=</HashCode>
       <FileName>moduleobject.cs</FileName>
     </TypeIdentifier>
   </Class>
   <Class Name="Python.Runtime.ConstructorBinding" Collapsed="true">
     <Position X="29.5" Y="3.25" Width="1.5" />
     <TypeIdentifier>
-      <HashCode>AAAACAAAAAAABAAAAAAACAAAABAJAEAAAAAAAAIAEAA=</HashCode>
+      <HashCode>AAAACAAAAAAAAAAAAAAACAAAABAJAAAAAAAAAAJAEAA=</HashCode>
       <FileName>constructorbinding.cs</FileName>
     </TypeIdentifier>
   </Class>
@@ -74,14 +74,14 @@
       </Path>
     </InheritanceLine>
     <TypeIdentifier>
-      <HashCode>AAAAAAAAAAAADAAAIAAAEABAAAAAAAACAAAAAAIAAAQ=</HashCode>
+      <HashCode>AAAAAAAAAAAACAAAIAAAEABAAAAAAAACAAAAAAJAAAA=</HashCode>
       <FileName>eventbinding.cs</FileName>
     </TypeIdentifier>
   </Class>
   <Class Name="Python.Runtime.EventObject" Collapsed="true">
     <Position X="22.75" Y="3.25" Width="1.5" />
     <TypeIdentifier>
-      <HashCode>AAACAAAAAAAAAAAAAAIAAIAAAAAEAAAAQABAAAIBEAQ=</HashCode>
+      <HashCode>AAACAAAAAAAAAAAAAAIAAIAAAAAEAAAAQABAAAJBEAA=</HashCode>
       <FileName>eventobject.cs</FileName>
     </TypeIdentifier>
   </Class>
@@ -95,7 +95,7 @@
   <Class Name="Python.Runtime.ExtensionType" Collapsed="true">
     <Position X="27.5" Y="1.75" Width="1.5" />
     <TypeIdentifier>
-      <HashCode>AAAAAAAAAAAAAAAAAAAAAAACAAAAAEEBAAAAAAABAAQ=</HashCode>
+      <HashCode>AAAAAAAAAAAABAAAAAAAAAgCAAAAAEEBAAAAAABAABQ=</HashCode>
       <FileName>extensiontype.cs</FileName>
     </TypeIdentifier>
   </Class>
@@ -116,14 +116,14 @@
   <Class Name="Python.Runtime.ManagedType" Collapsed="true">
     <Position X="25" Y="0.5" Width="1.5" />
     <TypeIdentifier>
-      <HashCode>UCBBgoBAIUgAAAEAACAAsAACAgAIABIAQYAAACIYIBA=</HashCode>
+      <HashCode>UCBBgIAAAUgAAAAAASAAMACCAAAIABIAAZAAAAIYABA=</HashCode>
       <FileName>managedtype.cs</FileName>
     </TypeIdentifier>
   </Class>
   <Class Name="Python.Runtime.MetaType" Collapsed="true">
     <Position X="20.5" Y="1.75" Width="1.5" />
     <TypeIdentifier>
-      <HashCode>AQAAAAAICBAAAQBAAAABAAIAAgABAAABAAAAUBCAAAQ=</HashCode>
+      <HashCode>AQAAAAAICBAAAQBAAAABAAIAAgABAAABAAAAUBCAABQ=</HashCode>
       <FileName>metatype.cs</FileName>
     </TypeIdentifier>
   </Class>
@@ -138,14 +138,14 @@
       </Path>
     </InheritanceLine>
     <TypeIdentifier>
-      <HashCode>EAAAAAAAAIAADABAIAAAAAAAAAgBAAAAUgAAAAIAAAQ=</HashCode>
+      <HashCode>AAAAAAAAAIAACABAIAAAAAAAAAABAAAAUgAAAAJAAAE=</HashCode>
       <FileName>methodbinding.cs</FileName>
     </TypeIdentifier>
   </Class>
   <Class Name="Python.Runtime.MethodObject" Collapsed="true">
     <Position X="33.75" Y="3.25" Width="1.5" />
     <TypeIdentifier>
-      <HashCode>FIADAAAAAAAIBAAAIAAIAAAIAAgFAAAAUAAgAAIAEAQ=</HashCode>
+      <HashCode>BIADAAAAAAAIAAAAIAAIAAAIAAAFAAAAUAAgAAJAFAA=</HashCode>
       <FileName>methodobject.cs</FileName>
     </TypeIdentifier>
   </Class>
@@ -159,7 +159,7 @@
   <Class Name="Python.Runtime.ModuleObject" Collapsed="true">
     <Position X="25" Y="3.25" Width="1.5" />
     <TypeIdentifier>
-      <HashCode>ECCCCkAAAAAABAAAAAABAAACAAAIAIIAEAAAAAIACAQ=</HashCode>
+      <HashCode>ECCCCkAAgAAAAAAAAAABAAgCAABIAAIBEAAAAAJACAA=</HashCode>
       <FileName>moduleobject.cs</FileName>
     </TypeIdentifier>
   </Class>
@@ -188,7 +188,7 @@
       </Path>
     </InheritanceLine>
     <TypeIdentifier>
-      <HashCode>AAAAAAAAAAAAAAAAIAAAAAAAAAABAAAAAgAAAAIAAAQ=</HashCode>
+      <HashCode>AAAAAAAAAAAAAAAAIAAAAAAAAAABAAAAAgAAAAJAAAA=</HashCode>
       <FileName>overload.cs</FileName>
     </TypeIdentifier>
   </Class>

diff --git a/src/runtime/StateSerialization/CLRMappedItem.cs b/src/runtime/StateSerialization/CLRMappedItem.cs
@@ -0,0 +1,20 @@
+using System.Collections.Generic;
+
+namespace Python.Runtime;
+
+public class CLRMappedItem
+{
+    public object Instance { get; private set; }
+    public List<PyObject> PyRefs { get; set; } = new List<PyObject>();
+    public bool Stored { get; set; }
+
+    public CLRMappedItem(object instance)
+    {
+        Instance = instance;
+    }
+
+    internal void AddRef(PyObject pyRef)
+    {
+        this.PyRefs.Add(pyRef);
+    }
+}
diff --git a/src/runtime/StateSerialization/CLRWrapperCollection.cs b/src/runtime/StateSerialization/CLRWrapperCollection.cs
@@ -0,0 +1,21 @@
+using System.Collections.ObjectModel;
+
+namespace Python.Runtime;
+
+public class CLRWrapperCollection : KeyedCollection<object, CLRMappedItem>
+{
+    public bool TryGetValue(object key, out CLRMappedItem value)
+    {
+        if (Dictionary == null)
+        {
+            value = null;
+            return false;
+        }
+        return Dictionary.TryGetValue(key, out value);
+    }
+
+    protected override object GetKeyForItem(CLRMappedItem item)
+    {
+        return item.Instance;
+    }
+}
diff --git a/src/runtime/StateSerialization/ClassManagerState.cs b/src/runtime/StateSerialization/ClassManagerState.cs
@@ -7,5 +7,5 @@ namespace Python.Runtime.StateSerialization;
 internal class ClassManagerState
 {
     public Dictionary<PyType, InterDomainContext> Contexts { get; set; }
-    public Dictionary<MaybeType, ClassBase> Cache { get; set; }
+    public Dictionary<MaybeType, PyType> Cache { get; set; }
 }
diff --git a/src/runtime/StateSerialization/ICLRObjectStorer.cs b/src/runtime/StateSerialization/ICLRObjectStorer.cs
@@ -0,0 +1,9 @@
+using System.Collections.Generic;
+
+namespace Python.Runtime;
+
+public interface ICLRObjectStorer
+{
+    ICollection<CLRMappedItem> Store(CLRWrapperCollection wrappers, RuntimeDataStorage storage);
+    CLRWrapperCollection Restore(RuntimeDataStorage storage);
+}
diff --git a/src/runtime/StateSerialization/SharedObjectsState.cs b/src/runtime/StateSerialization/SharedObjectsState.cs
@@ -6,8 +6,8 @@ namespace Python.Runtime.StateSerialization;
 [Serializable]
 internal class SharedObjectsState
 {
-    public List<CLRObject> InternalStores { get; set; }
-    public List<ManagedType> Extensions { get; set; }
+    public Dictionary<PyObject, CLRObject> InternalStores { get; set; }
+    public Dictionary<PyObject, ExtensionType> Extensions { get; set; }
     public RuntimeDataStorage Wrappers { get; set; }
     public Dictionary<PyObject, InterDomainContext> Contexts { get; set; }
 }
diff --git a/src/runtime/arrayobject.cs b/src/runtime/arrayobject.cs
@@ -11,7 +11,7 @@ namespace Python.Runtime
     /// to support natural array usage (indexing) from Python.
     /// </summary>
     [Serializable]
-    internal class ArrayObject : ClassBase
+    internal sealed class ArrayObject : ClassBase
     {
         internal ArrayObject(Type tp) : base(tp)
         {

diff --git a/src/runtime/classbase.cs b/src/runtime/classbase.cs
@@ -4,6 +4,7 @@
 using System.Diagnostics;
 using System.Linq;
 using System.Reflection;
+using System.Runtime.InteropServices;
 
 namespace Python.Runtime
 {
@@ -24,12 +25,6 @@ internal class ClassBase : ManagedType
         internal readonly Dictionary<int, MethodObject> richcompare = new();
         internal MaybeType type;
 
-        internal new PyType pyHandle
-        {
-            get => (PyType)base.pyHandle;
-            set => base.pyHandle = value;
-        }
-
         internal ClassBase(Type tp)
         {
             if (tp is null) throw new ArgumentNullException(nameof(type));
@@ -83,8 +78,8 @@ public virtual NewReference type_subscript(BorrowedReference idx)
                 {
                     return Exceptions.RaiseTypeError(e.Message);
                 }
-                ManagedType c = ClassManager.GetClass(t);
-                return new NewReference(c.ObjectReference);
+                var c = ClassManager.GetClass(t);
+                return new NewReference(c);
             }
 
             return Exceptions.RaiseTypeError($"{type.Value.Namespace}.{type.Name} does not accept {types.Length} generic parameters");
@@ -254,7 +249,7 @@ public static NewReference tp_iter(BorrowedReference ob)
                 }
             }
 
-            return new NewReference(new Iterator(o, elemType).ObjectReference);
+            return new Iterator(o, elemType).Alloc();
         }
 
 
@@ -339,11 +334,16 @@ public static NewReference tp_repr(BorrowedReference ob)
         /// </summary>
         public static void tp_dealloc(NewReference lastRef)
         {
-            ManagedType self = GetManagedObject(lastRef.Borrow())!;
+            var self = (CLRObject)GetManagedObject(lastRef.Borrow())!;
+            GCHandle gcHandle = GetGCHandle(lastRef.Borrow());
             tp_clear(lastRef.Borrow());
             Runtime.PyObject_GC_UnTrack(lastRef.Borrow());
             Runtime.PyObject_GC_Del(lastRef.Steal());
-            self?.FreeGCHandle();
+
+            bool deleted = CLRObject.reflectedObjects.Remove(lastRef.DangerousGetAddress());
+            Debug.Assert(deleted);
+
+            gcHandle.Free();
         }
 
         public static int tp_clear(BorrowedReference ob)
@@ -399,26 +399,17 @@ static unsafe int BaseUnmanagedClear(BorrowedReference ob)
             return clear(ob);
         }
 
-        protected override void OnSave(InterDomainContext context)
+        protected override void OnSave(BorrowedReference ob, InterDomainContext context)
         {
-            base.OnSave(context);
-            if (!this.IsClrMetaTypeInstance())
-            {
-                BorrowedReference dict = GetObjectDict(ObjectReference);
-                context.Storage.AddValue("dict", PyObject.FromNullableReference(dict));
-            }
+            base.OnSave(ob, context);
+            context.Storage.AddValue("impl", this);
         }
 
-        protected override void OnLoad(InterDomainContext context)
+        protected override void OnLoad(BorrowedReference ob, InterDomainContext context)
         {
-            base.OnLoad(context);
-            if (!this.IsClrMetaTypeInstance())
-            {
-                var dict = context.Storage.GetValue<PyObject>("dict");
-                SetObjectDict(ObjectReference, dict.NewReferenceOrNull().StealNullable());
-            }
-            gcHandle = AllocGCHandle();
-            SetGCHandle(ObjectReference, gcHandle);
+            base.OnLoad(ob, context);
+            var gcHandle = GCHandle.Alloc(this);
+            SetGCHandle(ob, gcHandle);
         }
 
 
@@ -539,14 +530,14 @@ static IEnumerable<MethodInfo> GetCallImplementations(Type type)
             => type.GetMethods(BindingFlags.Public | BindingFlags.Instance)
                 .Where(m => m.Name == "__call__");
 
-        public virtual void InitializeSlots(SlotsHolder slotsHolder)
+        public virtual void InitializeSlots(BorrowedReference pyType, SlotsHolder slotsHolder)
         {
             if (!this.type.Valid) return;
 
             if (GetCallImplementations(this.type.Value).Any()
                 && !slotsHolder.IsHolding(TypeOffset.tp_call))
             {
-                TypeManager.InitializeSlot(ObjectReference, TypeOffset.tp_call, new Interop.BBB_N(tp_call_impl), slotsHolder);
+                TypeManager.InitializeSlot(pyType, TypeOffset.tp_call, new Interop.BBB_N(tp_call_impl), slotsHolder);
             }
         }
     }