DynamoDS
diff --git a/‎src/Engine/ProtoCore/Lang/CallSite.cs
Copy file name to clipboard
+26-15Lines changed: 26 additions & 15 deletions b/‎src/Engine/ProtoCore/Lang/CallSite.cs
Copy file name to clipboard
+26-15Lines changed: 26 additions & 15 deletions
diff --git a/‎src/Engine/ProtoCore/RuntimeCore.cs
Copy file name to clipboard
+6Lines changed: 6 additions & 0 deletions b/‎src/Engine/ProtoCore/RuntimeCore.cs
Copy file name to clipboard
+6Lines changed: 6 additions & 0 deletions
diff --git a/‎src/Engine/ProtoCore/RuntimeData.cs
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion b/‎src/Engine/ProtoCore/RuntimeData.cs
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎test/DynamoCoreTests/CallsiteTests.cs
Copy file name to clipboard
+113-1Lines changed: 113 additions & 1 deletion b/‎test/DynamoCoreTests/CallsiteTests.cs
Copy file name to clipboard
+113-1Lines changed: 113 additions & 1 deletion
diff --git a/‎test/DynamoCoreTests/SerializationTests.cs
Copy file name to clipboard
+1Lines changed: 1 addition & 0 deletions b/‎test/DynamoCoreTests/SerializationTests.cs
Copy file name to clipboard
+1Lines changed: 1 addition & 0 deletions
diff --git a/‎test/Engine/FFITarget/ManagedElementExample.cs
Copy file name to clipboard
+5Lines changed: 5 additions & 0 deletions b/‎test/Engine/FFITarget/ManagedElementExample.cs
Copy file name to clipboard
+5Lines changed: 5 additions & 0 deletions
@@ -76,7 +76,7 @@ public bool HasAnyNestedData
 
                     if (HasData)
                         return true;
-                    
+
                     //Not empty, and doesn't have data so test recursive
                     Validity.Assert(NestedData != null,
                         "Invalid recursion logic, this is a VM bug, please report to the Dynamo Team");
@@ -245,10 +245,10 @@ public override System.Type BindToType(string assemblyName, string typeName)
                 var assemblyNameObj = new AssemblyName(assemblyName);
                 //find matching assemblies by name, version is not used.
                 var matchingAssembly = assemblies.FirstOrDefault(x => x.GetName().Name == assemblyNameObj.Name);
-                if(matchingAssembly!= null)
+                if (matchingAssembly != null)
                 {
-                   var matchingType = matchingAssembly.GetType(typeName);
-                    if(matchingType != null)
+                    var matchingType = matchingAssembly.GetType(typeName);
+                    if (matchingType != null)
                     {
                         return matchingType;
                     }
@@ -373,7 +373,7 @@ internal static TraceSerialiserHelper FromCallSiteData(string callSiteData)
         private int classScope;
         private string methodName;
         private readonly FunctionTable globalFunctionTable;
-        private int invokeCount; //Number of times the callsite has been executed within this run
+        internal int invokeCount; //Number of times the callsite has been executed within this run
         private List<ISerializable> beforeFirstRunSerializables = new List<ISerializable>();
 
         //TODO(Luke): This should be loaded from the attribute
@@ -710,7 +710,10 @@ private static void ArgumentSanityCheck(List<StackValue> arguments)
         /// <param name="core"></param>
         private void UpdateCallsiteExecutionState(Object callsiteData, RuntimeCore runtimeCore)
         {
+        
+            Debug.WriteLine($"resetting callsite invoke count for {this.methodName}");
             invokeCount = 0;
+            
 
             /*
             if (core.EnableCallsiteExecutionState)
@@ -907,7 +910,7 @@ private void ComputeFeps(
                             if (replicationInstructions == null ||
                                 IsSimilarOptionButOfHigherRank(replicationInstructions, replicationOption))
                             {
-                                resolvedFeps = new List<FunctionEndPoint>() {compliantTarget};
+                                resolvedFeps = new List<FunctionEndPoint>() { compliantTarget };
                                 replicationInstructions = replicationOption;
                                 matchFound = true;
                             }
@@ -948,7 +951,7 @@ private void ComputeFeps(
                         if (replicationInstructions == null ||
                             IsSimilarOptionButOfHigherRank(replicationInstructions, replicationOption))
                         {
-                            resolvedFeps = new List<FunctionEndPoint>() {compliantTarget};
+                            resolvedFeps = new List<FunctionEndPoint>() { compliantTarget };
                             replicationInstructions = replicationOption;
                             matchFound = true;
                         }
@@ -1418,10 +1421,18 @@ private StackValue DispatchNew(
             DominantListStructure domintListStructure,
             StackFrame stackFrame, RuntimeCore runtimeCore)
         {
-            // Update the CallsiteExecutionState with 
-            // TODO: Replace this with the real data
-            UpdateCallsiteExecutionState(null, runtimeCore);
+           
+            // if the last dispatched callsite is this callsite then we are repeatedly making calls
+            // to this same callsite (for example replicating over an outer function that contains this callsite)
+            // and should not reset the invoke count.
+            if (runtimeCore.LastDispatchedCallSite != this)
+            {
+                UpdateCallsiteExecutionState(null, runtimeCore);
+            }
+            runtimeCore.LastDispatchedCallSite = this;
+
 
+            //TODO reuse this when we have time to profile it.
             Stopwatch sw = new Stopwatch();
             sw.Start();
 
@@ -1715,7 +1726,7 @@ private StackValue ExecWithRISlowPath(
                         }
                     }
 
-                    List<ReplicationInstruction> newRIs = replicationInstructions.GetRange(1, replicationInstructions.Count-1);
+                    List<ReplicationInstruction> newRIs = replicationInstructions.GetRange(1, replicationInstructions.Count - 1);
 
                     SingleRunTraceData cleanRetTrace = new SingleRunTraceData();
 
@@ -1788,7 +1799,7 @@ private StackValue ExecWithRISlowPath(
 
                 if (supressArray)
                 {
-                    List<ReplicationInstruction> newRIs = replicationInstructions.GetRange(1, replicationInstructions.Count-1);
+                    List<ReplicationInstruction> newRIs = replicationInstructions.GetRange(1, replicationInstructions.Count - 1);
 
                     List<StackValue> newFormalParams = formalParameters.ToList();
 
@@ -1807,7 +1818,7 @@ private StackValue ExecWithRISlowPath(
                         newFormalParams[cartIndex] = parameters[i];
                     }
 
-                    List<ReplicationInstruction> newRIs = replicationInstructions.GetRange(1, replicationInstructions.Count-1);
+                    List<ReplicationInstruction> newRIs = replicationInstructions.GetRange(1, replicationInstructions.Count - 1);
 
                     SingleRunTraceData lastExecTrace;
 
@@ -1944,7 +1955,7 @@ private static Tuple<bool, List<StackValue>> AreParametersHomogeneousTypes(List<
             var finalFormalParameters = new List<StackValue>();
 
             foreach (var formalParameter in formalParameters)
-            { 
+            {
                 //expand array if required to compare inputs
                 if (formalParameter.IsArray)
                 {
@@ -1955,7 +1966,7 @@ private static Tuple<bool, List<StackValue>> AreParametersHomogeneousTypes(List<
                     {
                         case 0:
                             //set function result false and exit due to empty list
-                            return new Tuple<bool, List<StackValue>> (false, null);
+                            return new Tuple<bool, List<StackValue>>(false, null);
                         case 1:
                             //Add single sample parameter to pass for evaluation in SelectFinalFep
                             finalFormalParameters.Add(flatParameters[0]);
 
@@ -112,6 +112,7 @@ public void SetupForExecution(ProtoCore.Core compileCore, int globalStackFrameSi
             SetProperties(compileCore.Options, compileCore.DSExecutable, compileCore.DebuggerProperties, null, compileCore.ExprInterpreterExe);
             RegisterDllTypes(compileCore.DllTypesToLoad);
             NotifyExecutionEvent(ProtoCore.ExecutionStateEventArgs.State.ExecutionBegin);
+            LastDispatchedCallSite = null;
         }
 
         public void SetProperties(Options runtimeOptions, Executable executable, DebugProperties debugProps = null, ProtoCore.Runtime.Context context = null, Executable exprInterpreterExe = null)
@@ -223,6 +224,11 @@ public bool CancellationPending
 #endregion 
 
         private Dictionary<Guid, List<StackValue>> callsiteGCRoots = new Dictionary<Guid, List<StackValue>>();
+        /// <summary>
+        /// This field is used to keep track of the last dispatched callsite 
+        /// to detect when a different callsite is dispatched to.
+        /// </summary>
+        internal CallSite LastDispatchedCallSite;
 
         public IEnumerable<StackValue> CallSiteGCRoots
         {
 
@@ -147,7 +147,7 @@ public CallSite GetCallSite(int classScope, string methodName, Executable execut
 
         /// <summary>
         /// This API is used by host integrations such as for Revit and C3D.
-        /// It is used to gets the trace data list for all nodes binding to elements in the host.
+        /// It is used to get the trace data list for all nodes binding to elements in the host.
         /// </summary>
         /// <param name="nodeGuids"></param>
         /// <param name="executable"></param>
 
@@ -5,11 +5,13 @@
 using System.Linq;
 using System.Reflection;
 using System.Runtime.Serialization;
+using CoreNodeModels.Input;
 using Dynamo.Engine;
 using Dynamo.Graph.Nodes;
 using Dynamo.Graph.Nodes.CustomNodes;
 using Dynamo.Graph.Nodes.ZeroTouch;
 using Dynamo.Graph.Workspaces;
+using FFITarget;
 using NUnit.Framework;
 using static ProtoCore.CallSite;
 
@@ -122,7 +124,7 @@ public void Callsite_DeleteNodeBeforeRun()
 
             CurrentDynamoModel.TraceReconciliationProcessor = new TestTraceReconciliationProcessor(3);
 
-            var traceNode = ws.Nodes.Where(n=>n is DSFunction).FirstOrDefault(f=>f.Name == "TraceExampleWrapper.ByString");
+            var traceNode = ws.Nodes.Where(n => n is DSFunction).FirstOrDefault(f => f.Name == "TraceExampleWrapper.ByString");
             Assert.NotNull(traceNode);
 
             ws.RemoveAndDisposeNode(traceNode);
@@ -205,6 +207,116 @@ public void Callsite_ElementBinding_CustomNodes_multiple()
             AssertPreviewValue("08448232ee094aad8280e9a99ed44f46", 444444);
         }
 
+        [Test]
+        public void Callsite_ElementBinding_CustomNodes_ShouldReturnUniqueIds()
+        {
+            WrapperObject.ResetNextID();
+            var ws = Open<HomeWorkspaceModel>(TestDirectory, callsiteDir, "element_binding_customNodes_replication.dyn");
+            BeginRun();
+            AssertPreviewValue("3cab31e7c7e646cfb11f6145edf1d8c3", Enumerable.Range(1, 6).ToList());
+        }
+
+        [Test]
+        public void Single_CallSite_Should_Rebind()
+        {
+
+            WrapperObject.ResetNextID();
+            var ws = Open<HomeWorkspaceModel>(TestDirectory, callsiteDir, "single_callsite.dyn");
+            //assert there is only one callsite
+            Assert.AreEqual(1, this.CurrentDynamoModel.EngineController.LiveRunnerRuntimeCore.RuntimeData.CallsiteCache.Keys.Count);
+            var callsite = this.CurrentDynamoModel.EngineController.LiveRunnerRuntimeCore.RuntimeData.CallsiteCache.FirstOrDefault().Value;
+            Assert.AreEqual(1, callsite.invokeCount);
+            var traceid = Guid.Parse("08278f9e8ae64c72b86313e04cdde709");
+            var traceNode = CurrentDynamoModel.CurrentWorkspace.Nodes.Where(x => x.GUID == traceid).FirstOrDefault();
+            var firstresult = (traceNode.CachedValue.Data as WrapperObject).ID;
+
+            //run the graph again.
+            ws.Nodes.OfType<CodeBlockNodeModel>().First().SetCodeContent("2", ws.ElementResolver);
+            Assert.AreEqual(1, this.CurrentDynamoModel.EngineController.LiveRunnerRuntimeCore.RuntimeData.CallsiteCache.Keys.Count);
+            Assert.AreEqual(1, callsite.invokeCount);
+            var secondResult = (traceNode.CachedValue.Data as WrapperObject).ID;
+            Assert.AreEqual(firstresult,secondResult);
+
+        }
+
+        [Test]
+        public void Callsite_ElementBinding_CustomNodes2dReplication_ShouldReturnUniqueIds()
+        {
+            WrapperObject.ResetNextID();
+            var ws = Open<HomeWorkspaceModel>(TestDirectory, callsiteDir, "element_binding_customNodes_replication2d.dyn");
+            BeginRun();
+            AssertPreviewValue("3cab31e7c7e646cfb11f6145edf1d8c3", new int[][] {
+               new int[] {1},
+               new int[] {2,3 },
+               new int[]{4,5,6 },
+               new int[]{7,8,9,10 },
+               new int[]{11,12,13,14,15 },
+               new int[]{16,17,18,19,20,21 }
+            });
+        }
+
+        [Test]
+        public void Callsite_ElementBinding_CustomNodes_MultipleRunsShouldResetInvocationCount()
+        {
+            WrapperObject.ResetNextID();
+            var ws = Open<HomeWorkspaceModel>(TestDirectory, callsiteDir, "element_binding_customNodes_replication.dyn");
+            BeginRun();
+            AssertPreviewValue("3cab31e7c7e646cfb11f6145edf1d8c3", Enumerable.Range(1, 6).ToList());
+            
+            //grab the inner callsite inside the custom node
+            var callsite = this.CurrentDynamoModel.EngineController.LiveRunnerRuntimeCore.RuntimeData.CallsiteCache.
+                Where(kv => kv.Key.Contains("WrapperObject")).FirstOrDefault().Value;
+            //should have executed 6 times
+            Assert.AreEqual(callsite.invokeCount, 6);
+
+            //force a re execution and if binding succeeds then data should be unchanged.
+            ws.Nodes.OfType<CodeBlockNodeModel>().First().SetCodeContent("5..10", ws.ElementResolver);
+            AssertPreviewValue("3cab31e7c7e646cfb11f6145edf1d8c3", Enumerable.Range(1, 6).ToList());
+            //count should have been reset and invoked 6 more times
+            Assert.AreEqual(callsite.invokeCount,6);
+        }
+
+        [Test]
+        [Category("TechDebt")]
+        public void Callsite_ElementBinding_Functions_UniqueIds_ForReplicationOfInnerAndOuterFunction()
+        {
+            WrapperObject.ResetNextID();
+            var ws = Open<HomeWorkspaceModel>(TestDirectory, callsiteDir, "func_nested_replication.dyn");
+            BeginRun();
+            AssertPreviewValue("22e0f3229b314aa48914e8f6b925872c", Enumerable.Range(1, 3).ToList());
+            // this node currently rebinds to its inner callsites so there are repeated values being returned.
+            // it's not clear this behavior is correct, but it matches expected results with zeroTouch nodes nested in
+            // other zero touch nodes which access trace. This test is created to note the current behavior and to 
+            // alert us if it changes.
+            AssertPreviewValue("74cd0ca6d4964ec2b500fbe96139d28c", new int[][] {
+               new int[] {4},
+               new int[] {4,5 },
+               new int[]{4,5,6 },
+               new int[]{4,5,6,7 }
+            });
+            /*
+            AssertPreviewValue("74cd0ca6d4964ec2b500fbe96139d28c", new int[][] {
+               new int[] {4},
+               new int[] {5,6 },
+               new int[]{7,8,9 },
+               new int[]{10,11,12,13 }
+            });
+            */
+        }
+
+        //TODO add previous test with multiple executions
+
+       
+
+        [Test]
+        public void Callsite_ElementBinding_ShouldReturnUniqueIds()
+        {
+            WrapperObject.ResetNextID();
+            var ws = Open<HomeWorkspaceModel>(TestDirectory, callsiteDir, "nonNestedWorking_replication.dyn");
+            BeginRun();
+            AssertPreviewValue("a74679f905fc4883bb017851d94ac074", Enumerable.Range(1, 6).ToList());
+        }
+
         [Test]
         public void Callsite_ElementBinding_Timing()
         {
 
@@ -779,6 +779,7 @@ public object[] FindWorkspaces()
         [Test, TestCaseSource("FindWorkspaces"), Category("JsonTestExclude")]
         public void SerializationTest(string filePath)
         {
+            modelsGuidToIdMap.Clear();
             DoWorkspaceOpenAndCompare(filePath, jsonFolderName, ConvertCurrentWorkspaceToJsonAndSave,
                 serializationTestUtils.CompareWorkspaceModels,
                 serializationTestUtils.SaveWorkspaceComparisonData);
 
@@ -182,6 +182,11 @@ public int ID {
 
         private const string __TEMP_REVIT_TRACE_ID = "{0459D869-0C72-447F-96D8-08A7FB92214B}-REVIT";
 
+        public static void ResetNextID()
+        {
+            nextID = 0;
+        }
+
         public WrapperObject(int x)
         {
             WrapperGuid = Guid.NewGuid();
Original file line number	Diff line number	Diff line change
`@@ -779,6 +779,7 @@ public object[] FindWorkspaces()`
`779`	`779`	`[Test, TestCaseSource("FindWorkspaces"), Category("JsonTestExclude")]`
`780`	`780`	`public void SerializationTest(string filePath)`
`781`	`781`	`{`
	`782`	`+ modelsGuidToIdMap.Clear();`
`782`	`783`	`DoWorkspaceOpenAndCompare(filePath, jsonFolderName, ConvertCurrentWorkspaceToJsonAndSave,`
`783`	`784`	`serializationTestUtils.CompareWorkspaceModels,`
`784`	`785`	`serializationTestUtils.SaveWorkspaceComparisonData);`