DYN-4229 GraphicDataProvider optimization for repeated calls to get similar object types for tessellation (#11920)

saintentropy · web-flow · commit 473582ba5c8b · 2022-05-23T15:12:43.000-04:00
* Add short circuit to prevent re-alocation of objects for repeated calls to the GetCLRObject

* Update comment

* Do not cache stackvalue.  Does not effect Marshaller object

* Add clear method

Co-authored-by: Craig Long &lt;craig.long@autodesk.com&gt;
diff --git a/src/Engine/ProtoCore/Reflection/GraphicDataProvider.cs b/src/Engine/ProtoCore/Reflection/GraphicDataProvider.cs
@@ -141,8 +141,17 @@ internal List<IGraphicItem> GetGraphicItems(DSASM.StackValue svData, RuntimeCore
             return null;
         }
 
+        //Store marshaller for repeated calls to GetCLRObject.  Used for short-circuit of re-allocation of marshaller / interpreter object.
+        private static Interpreter interpreter;
+        private static ProtoFFI.FFIObjectMarshaler marshaler;
+        
         internal object GetCLRObject(StackValue svData, RuntimeCore runtimeCore)
         {
+            if (marshaler != null)
+            {
+                return marshaler.UnMarshal(svData, null, interpreter, typeof(object));
+            }
+            
             if (null == runtimeCore.DSExecutable.classTable)
                 return null;
 
@@ -156,16 +165,23 @@ internal object GetCLRObject(StackValue svData, RuntimeCore runtimeCore)
 
             try
             {
-                ProtoCore.DSASM.Interpreter interpreter = new ProtoCore.DSASM.Interpreter(runtimeCore, false);
+                interpreter = new ProtoCore.DSASM.Interpreter(runtimeCore, false);
                 var helper = ProtoFFI.DLLFFIHandler.GetModuleHelper(ProtoFFI.FFILanguage.CSharp);
-                var marshaler = helper.GetMarshaler(runtimeCore);
+                marshaler = helper.GetMarshaler(runtimeCore);
                 return marshaler.UnMarshal(svData, null, interpreter, typeof(object));
             }
             catch (System.Exception)
             {
+                marshaler = null;
                 return null;
             }
         }
+
+        internal static void ClearMarshaller()
+        {
+            interpreter = null;
+            marshaler = null;
+        }
     }
 
     /// <summary>
diff --git a/src/Engine/ProtoCore/RuntimeCore.cs b/src/Engine/ProtoCore/RuntimeCore.cs
@@ -6,6 +6,7 @@
 using ProtoCore.DSASM;
 using ProtoCore.Lang;
 using ProtoCore.Lang.Replication;
+using ProtoCore.Mirror;
 using ProtoCore.Runtime;
 using ProtoCore.Utils;
 using ProtoFFI;
@@ -271,6 +272,7 @@ public void Cleanup()
         {
             OnDispose();
             CLRModuleType.ClearTypes();
+            GraphicDataProvider.ClearMarshaller();
         }
 
         public void NotifyExecutionEvent(ExecutionStateEventArgs.State state)

Original file line number	Diff line number	Diff line change
`@@ -141,8 +141,17 @@ internal List<IGraphicItem> GetGraphicItems(DSASM.StackValue svData, RuntimeCore`
`141`	`141`	`return null;`
`142`	`142`	`}`
`143`	`143`
	`144`	`+ //Store marshaller for repeated calls to GetCLRObject. Used for short-circuit of re-allocation of marshaller / interpreter object.`
	`145`	`+ private static Interpreter interpreter;`
	`146`	`+ private static ProtoFFI.FFIObjectMarshaler marshaler;`
	`147`	`+`
`144`	`148`	`internal object GetCLRObject(StackValue svData, RuntimeCore runtimeCore)`
`145`	`149`	`{`
	`150`	`+ if (marshaler != null)`
	`151`	`+ {`
	`152`	`+ return marshaler.UnMarshal(svData, null, interpreter, typeof(object));`
	`153`	`+ }`
	`154`	`+`
`146`	`155`	`if (null == runtimeCore.DSExecutable.classTable)`
`147`	`156`	`return null;`
`148`	`157`
`@@ -156,16 +165,23 @@ internal object GetCLRObject(StackValue svData, RuntimeCore runtimeCore)`
`156`	`165`
`157`	`166`	`try`
`158`	`167`	`{`
`159`		`- ProtoCore.DSASM.Interpreter interpreter = new ProtoCore.DSASM.Interpreter(runtimeCore, false);`
	`168`	`+ interpreter = new ProtoCore.DSASM.Interpreter(runtimeCore, false);`
`160`	`169`	`var helper = ProtoFFI.DLLFFIHandler.GetModuleHelper(ProtoFFI.FFILanguage.CSharp);`
`161`		`- var marshaler = helper.GetMarshaler(runtimeCore);`
	`170`	`+ marshaler = helper.GetMarshaler(runtimeCore);`
`162`	`171`	`return marshaler.UnMarshal(svData, null, interpreter, typeof(object));`
`163`	`172`	`}`
`164`	`173`	`catch (System.Exception)`
`165`	`174`	`{`
	`175`	`+ marshaler = null;`
`166`	`176`	`return null;`
`167`	`177`	`}`
`168`	`178`	`}`
	`179`	`+`
	`180`	`+ internal static void ClearMarshaller()`
	`181`	`+ {`
	`182`	`+ interpreter = null;`
	`183`	`+ marshaler = null;`
	`184`	`+ }`
`169`	`185`	`}`
`170`	`186`
`171`	`187`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@`
`6`	`6`	`using ProtoCore.DSASM;`
`7`	`7`	`using ProtoCore.Lang;`
`8`	`8`	`using ProtoCore.Lang.Replication;`
	`9`	`+using ProtoCore.Mirror;`
`9`	`10`	`using ProtoCore.Runtime;`
`10`	`11`	`using ProtoCore.Utils;`
`11`	`12`	`using ProtoFFI;`
`@@ -271,6 +272,7 @@ public void Cleanup()`
`271`	`272`	`{`
`272`	`273`	`OnDispose();`
`273`	`274`	`CLRModuleType.ClearTypes();`
	`275`	`+ GraphicDataProvider.ClearMarshaller();`
`274`	`276`	`}`
`275`	`277`
`276`	`278`	`public void NotifyExecutionEvent(ExecutionStateEventArgs.State state)`