DYN-4229 GraphicDataProvider optimization for repeated calls to get s…

…imilar object types for tessellation (#11920) * 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 <[email protected]>
DynamoDS · May 23, 2022 · 473582b · 473582b
1 parent 6901cb0
commit 473582b
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 2 deletions.
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)