* Classify runtime data

amos402 · amos402 · commit 39f47c81bbba · 2020-02-24T13:02:08.000+08:00
* External interface for custom storing wrapper objects
diff --git a/src/runtime/classmanager.cs b/src/runtime/classmanager.cs
@@ -82,14 +82,14 @@ private static int OnVisit(IntPtr ob, IntPtr arg)
         }
 
 
-        internal static void StashPush(Stack stack)
+        internal static void StashPush(RuntimeDataStorage storage)
         {
-            stack.Push(cache);
+            storage.PushValue(cache);
         }
 
-        internal static void StashPop(Stack stack)
+        internal static void StashPop(RuntimeDataStorage storage)
         {
-            cache = (Dictionary<Type, ClassBase>)stack.Pop();
+            cache = storage.PopValue<Dictionary<Type, ClassBase>>();
         }
 
         /// <summary>
diff --git a/src/runtime/clrobject.cs b/src/runtime/clrobject.cs
@@ -35,6 +35,10 @@ internal CLRObject(object ob, IntPtr tp)
             Exceptions.SetArgsAndCause(py);
         }
 
+        protected CLRObject()
+        {
+        }
+
 
         internal static CLRObject GetInstance(object ob, IntPtr pyType)
         {
@@ -70,6 +74,18 @@ internal static IntPtr GetInstHandle(object ob)
             return co.pyHandle;
         }
 
+        internal static CLRObject Restore(object ob, IntPtr pyHandle)
+        {
+            CLRObject co = new CLRObject()
+            {
+                inst = ob,
+                pyHandle = pyHandle,
+                tpHandle = Runtime.PyObject_TYPE(pyHandle)
+            };
+            co.Load();
+            return co;
+        }
+
         protected override void OnSave()
         {
             base.OnSave();
diff --git a/src/runtime/interop.cs b/src/runtime/interop.cs
@@ -564,15 +564,15 @@ public ThunkInfo(Delegate target)
         }
     }
 
-    [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi)]
+    [StructLayout(LayoutKind.Sequential)]
     struct PyGC_Node
     {
         public IntPtr gc_next;
         public IntPtr gc_prev;
         public IntPtr gc_refs;
     }
 
-    [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi)]
+    [StructLayout(LayoutKind.Sequential)]
     struct PyGC_Head
     {
         public PyGC_Node gc;
diff --git a/src/runtime/metatype.cs b/src/runtime/metatype.cs
@@ -40,15 +40,15 @@ public static void Release()
             _metaSlotsHodler = null;
         }
 
-        internal static void StashPush(Stack stack)
+        internal static void StashPush(RuntimeDataStorage storage)
         {
             Runtime.XIncref(PyCLRMetaType);
-            stack.Push(PyCLRMetaType);
+            storage.PushValue(PyCLRMetaType);
         }
 
-        internal static IntPtr StashPop(Stack stack)
+        internal static IntPtr StashPop(RuntimeDataStorage storage)
         {
-            PyCLRMetaType = (IntPtr)stack.Pop();
+            PyCLRMetaType = storage.PopValue<IntPtr>();
             _metaSlotsHodler = new SlotsHolder(PyCLRMetaType);
             TypeManager.InitializeSlots(PyCLRMetaType, typeof(MetaType), _metaSlotsHodler);
 
diff --git a/src/runtime/runtime.cs b/src/runtime/runtime.cs
@@ -206,7 +206,10 @@ internal static void Initialize(bool initSigs = false, ShutdownMode mode = Shutd
             string rtdir = RuntimeEnvironment.GetRuntimeDirectory();
             IntPtr path = PySys_GetObject("path");
             IntPtr item = PyString_FromString(rtdir);
-            PyList_Append(path, item);
+            if (PySequence_Contains(path, item) == 0)
+            {
+                PyList_Append(path, item);
+            }
             XDecref(item);
             AssemblyManager.UpdatePath();
         }
@@ -364,12 +367,7 @@ internal static void Shutdown()
             AssemblyManager.Shutdown();
             ImportHook.Shutdown();
 
-#if !NETSTANDARD
-            if (mode != ShutdownMode.Reload)
-            {
-                ClearClrModules();
-            }
-#endif
+            ClearClrModules();
             RemoveClrRootModule();
 
             MoveClrInstancesOnwershipToPython();
@@ -454,8 +452,7 @@ private static void ClearClrModules()
                 var item = PyList_GetItem(items, i);
                 var name = PyTuple_GetItem(item, 0);
                 var module = PyTuple_GetItem(item, 1);
-                var clrModule = ManagedType.GetManagedObject(module);
-                if (clrModule != null)
+                if (ManagedType.IsManagedType(module))
                 {
                     PyDict_DelItem(modules, name);
                 }
@@ -486,8 +483,8 @@ private static void PyDictTryDelItem(IntPtr dict, string key)
 
         private static void MoveClrInstancesOnwershipToPython()
         {
-            var copyObjs = ManagedType.GetManagedObjects().ToArray();
             var objs = ManagedType.GetManagedObjects();
+            var copyObjs = objs.ToArray();
             foreach (var entry in copyObjs)
             {
                 ManagedType obj = entry.Key;
diff --git a/src/runtime/runtime_data.cs b/src/runtime/runtime_data.cs
diff --git a/src/runtime/typemanager.cs b/src/runtime/typemanager.cs

Original file line number	Diff line number	Diff line change
`@@ -82,14 +82,14 @@ private static int OnVisit(IntPtr ob, IntPtr arg)`
`82`	`82`	`}`
`83`	`83`
`84`	`84`
`85`		`- internal static void StashPush(Stack stack)`
	`85`	`+ internal static void StashPush(RuntimeDataStorage storage)`
`86`	`86`	`{`
`87`		`- stack.Push(cache);`
	`87`	`+ storage.PushValue(cache);`
`88`	`88`	`}`
`89`	`89`
`90`		`- internal static void StashPop(Stack stack)`
	`90`	`+ internal static void StashPop(RuntimeDataStorage storage)`
`91`	`91`	`{`
`92`		`- cache = (Dictionary<Type, ClassBase>)stack.Pop();`
	`92`	`+ cache = storage.PopValue<Dictionary<Type, ClassBase>>();`
`93`	`93`	`}`
`94`	`94`
`95`	`95`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -564,15 +564,15 @@ public ThunkInfo(Delegate target)`
`564`	`564`	`}`
`565`	`565`	`}`
`566`	`566`
`567`		`- [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi)]`
	`567`	`+ [StructLayout(LayoutKind.Sequential)]`
`568`	`568`	`struct PyGC_Node`
`569`	`569`	`{`
`570`	`570`	`public IntPtr gc_next;`
`571`	`571`	`public IntPtr gc_prev;`
`572`	`572`	`public IntPtr gc_refs;`
`573`	`573`	`}`
`574`	`574`
`575`		`- [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi)]`
	`575`	`+ [StructLayout(LayoutKind.Sequential)]`
`576`	`576`	`struct PyGC_Head`
`577`	`577`	`{`
`578`	`578`	`public PyGC_Node gc;`
Original file line number	Diff line number	Diff line change
`@@ -40,15 +40,15 @@ public static void Release()`
`40`	`40`	`_metaSlotsHodler = null;`
`41`	`41`	`}`
`42`	`42`
`43`		`- internal static void StashPush(Stack stack)`
	`43`	`+ internal static void StashPush(RuntimeDataStorage storage)`
`44`	`44`	`{`
`45`	`45`	`Runtime.XIncref(PyCLRMetaType);`
`46`		`- stack.Push(PyCLRMetaType);`
	`46`	`+ storage.PushValue(PyCLRMetaType);`
`47`	`47`	`}`
`48`	`48`
`49`		`- internal static IntPtr StashPop(Stack stack)`
	`49`	`+ internal static IntPtr StashPop(RuntimeDataStorage storage)`
`50`	`50`	`{`
`51`		`- PyCLRMetaType = (IntPtr)stack.Pop();`
	`51`	`+ PyCLRMetaType = storage.PopValue<IntPtr>();`
`52`	`52`	`_metaSlotsHodler = new SlotsHolder(PyCLRMetaType);`
`53`	`53`	`TypeManager.InitializeSlots(PyCLRMetaType, typeof(MetaType), _metaSlotsHodler);`
`54`	`54`