Add CLRObject cache

amos402 · amos402 · commit db6c99a8e6ff · 2018-08-22T11:09:47.000+08:00
diff --git a/src/runtime/classbase.cs b/src/runtime/classbase.cs
@@ -276,6 +276,11 @@ public static void tp_dealloc(IntPtr ob)
             {
                 Runtime.XDecref(dict);
             }
+            var clrObj = self as CLRObject;
+            if (clrObj != null)
+            {
+                CLRObject.ObjDict.Remove(clrObj.inst);
+            }
             Runtime.PyObject_GC_UnTrack(self.pyHandle);
             Runtime.PyObject_GC_Del(self.pyHandle);
             Runtime.XDecref(self.tpHandle);
diff --git a/src/runtime/clrobject.cs b/src/runtime/clrobject.cs
@@ -1,12 +1,14 @@
-﻿using System;
+using System;
+using System.Collections.Generic;
 using System.Runtime.InteropServices;
 
 namespace Python.Runtime
 {
     internal class CLRObject : ManagedType
     {
         internal object inst;
-
+        internal static Dictionary<object, CLRObject> ObjDict { get; private set; } = new Dictionary<object, CLRObject>();
+        
         internal CLRObject(object ob, IntPtr tp)
         {
             IntPtr py = Runtime.PyType_GenericAlloc(tp, 0);
@@ -37,7 +39,15 @@ internal CLRObject(object ob, IntPtr tp)
 
         internal static CLRObject GetInstance(object ob, IntPtr pyType)
         {
-            return new CLRObject(ob, pyType);
+            CLRObject clrObj;
+            if (ObjDict.TryGetValue(ob, out clrObj))
+            {
+                Runtime.XIncref(clrObj.pyHandle);
+                return clrObj;
+            }
+            clrObj = new CLRObject(ob, pyType);
+            ObjDict.Add(ob, clrObj);
+            return clrObj;
         }
 
 
@@ -57,6 +67,12 @@ internal static IntPtr GetInstHandle(object ob, IntPtr pyType)
 
         internal static IntPtr GetInstHandle(object ob, Type type)
         {
+            CLRObject clrObj;
+            if (ObjDict.TryGetValue(ob, out clrObj))
+            {
+                Runtime.XIncref(clrObj.pyHandle);
+                return clrObj.pyHandle;
+            }
             ClassBase cc = ClassManager.GetClass(type);
             CLRObject co = GetInstance(ob, cc.tpHandle);
             return co.pyHandle;
diff --git a/src/runtime/converter.cs b/src/runtime/converter.cs
@@ -1390,7 +1390,9 @@ static IntPtr DefaultConverter(T value)
                     IntPtr pyValue = PyValueConverterHelper.Convert(item);
                     Runtime.PyList_Append(list, pyValue);
                     Runtime.XDecref(pyValue);
+                    return list;
                 }
+                return list;
             }
             return value.ToPythonPtr();
             //return CLRObject.GetInstHandle(value);

Original file line number	Diff line number	Diff line change
`@@ -276,6 +276,11 @@ public static void tp_dealloc(IntPtr ob)`
`276`	`276`	`{`
`277`	`277`	`Runtime.XDecref(dict);`
`278`	`278`	`}`
	`279`	`+ var clrObj = self as CLRObject;`
	`280`	`+ if (clrObj != null)`
	`281`	`+ {`
	`282`	`+ CLRObject.ObjDict.Remove(clrObj.inst);`
	`283`	`+ }`
`279`	`284`	`Runtime.PyObject_GC_UnTrack(self.pyHandle);`
`280`	`285`	`Runtime.PyObject_GC_Del(self.pyHandle);`
`281`	`286`	`Runtime.XDecref(self.tpHandle);`
Original file line number	Diff line number	Diff line change
`@@ -1390,7 +1390,9 @@ static IntPtr DefaultConverter(T value)`
`1390`	`1390`	`IntPtr pyValue = PyValueConverterHelper.Convert(item);`
`1391`	`1391`	`Runtime.PyList_Append(list, pyValue);`
`1392`	`1392`	`Runtime.XDecref(pyValue);`
	`1393`	`+ return list;`
`1393`	`1394`	`}`
	`1395`	`+ return list;`
`1394`	`1396`	`}`
`1395`	`1397`	`return value.ToPythonPtr();`
`1396`	`1398`	`//return CLRObject.GetInstHandle(value);`