perf: Adjust Grid, StoryBoard and VisualStatGroup enumerations

jeromelaban · jeromelaban · commit 5b112e96d95d · 2021-09-13T09:47:40.000-04:00
diff --git a/src/Uno.UI/UI/Xaml/Controls/Grid/Grid.cs b/src/Uno.UI/UI/Xaml/Controls/Grid/Grid.cs
@@ -192,9 +192,12 @@ void ValidateDefinitions(
 			bool treatStarAsAuto)
 		{
 			//for (auto & cdo : definitions)
-			foreach(DefinitionBase def in definitions.GetItems())
+			var itemsEnumerator = definitions.GetItems().GetEnumerator();
+
+			while(itemsEnumerator.MoveNext())
 			{
-				//var def = (DefinitionBase)(cdo);
+				var def = itemsEnumerator.Current;
+
 				bool useLayoutRounding = GetUseLayoutRounding();
 				var userSize = double.PositiveInfinity;
 				var userMinSize = useLayoutRounding
@@ -1066,10 +1069,12 @@ private XSIZEF InnerMeasureOverride(XSIZEF availableSize)
 				var children = (GetChildren());
 				if (children is { })
 				{
-					//for (auto & cdo : (children))
-					foreach (var currentChild in children)
+					// This block is a manual enumeration to avoid the foreach pattern
+					// See https://github.com/dotnet/runtime/issues/56309 for details
+					var childrenEnumerator = children.GetEnumerator();
+					while (childrenEnumerator.MoveNext())
 					{
-						//var currentChild = (UIElement)(cdo);
+						var currentChild = childrenEnumerator.Current;
 						ASSERT(currentChild is { });
 
 						//currentChild.Measure(innerAvailableSize);
@@ -1357,10 +1362,12 @@ private XSIZEF InnerArrangeOverride(XSIZEF finalSize)
 				var children = GetChildren();
 				if (children is { })
 				{
-					//for (auto & cdo : (children))
-					foreach (var cdo in children)
+					// This block is a manual enumeration to avoid the foreach pattern
+					// See https://github.com/dotnet/runtime/issues/56309 for details
+					var childrenEnumerator = children.GetEnumerator();
+					while (childrenEnumerator.MoveNext())
 					{
-						var currentChild = (UIElement)(cdo);
+						var currentChild = childrenEnumerator.Current;
 						ASSERT(currentChild is { });
 
 						//currentChild.EnsureLayoutStorage();
diff --git a/src/Uno.UI/UI/Xaml/Media/Animation/Storyboard.cs b/src/Uno.UI/UI/Xaml/Media/Animation/Storyboard.cs
@@ -120,8 +120,10 @@ private void Play()
 		{
 			if (Children != null && Children.Count > 0)
 			{
-				foreach (ITimeline child in Children)
+				for (int i = 0; i < Children.Count; i++)
 				{
+					ITimeline child = Children[i];
+
 					DisposeChildRegistrations(child);
 
 					_runningChildren++;
@@ -167,8 +169,10 @@ public void Stop()
 
 			if (Children != null)
 			{
-				foreach (ITimeline child in Children)
+				for (int i = 0; i < Children.Count; i++)
 				{
+					ITimeline child = Children[i];
+
 					child.Stop();
 					DisposeChildRegistrations(child);
 				}
@@ -192,8 +196,10 @@ public void Resume()
 			{
 				State = TimelineState.Active;
 
-				foreach (ITimeline child in Children)
+				for (int i = 0; i < Children.Count; i++)
 				{
+					ITimeline child = Children[i];
+
 					child.Resume();
 				}
 			}
@@ -215,8 +221,10 @@ public void Pause()
 
 			if (Children != null)
 			{
-				foreach (ITimeline child in Children)
+				for (int i = 0; i < Children.Count; i++)
 				{
+					ITimeline child = Children[i];
+
 					child.Pause();
 				}
 			}
@@ -226,8 +234,10 @@ public void Seek(TimeSpan offset)
 		{
 			if (Children != null)
 			{
-				foreach (ITimeline child in Children)
+				for (int i = 0; i < Children.Count; i++)
 				{
+					ITimeline child = Children[i];
+
 					child.Seek(offset);
 				}
 			}
@@ -237,8 +247,10 @@ public void SeekAlignedToLastTick(TimeSpan offset)
 		{
 			if (Children != null)
 			{
-				foreach (ITimeline child in Children)
+				for (int i = 0; i < Children.Count; i++)
 				{
+					ITimeline child = Children[i];
+
 					child.SeekAlignedToLastTick(offset);
 				}
 			}
@@ -247,8 +259,10 @@ public void SkipToFill()
 		{
 			if (Children != null)
 			{
-				foreach (ITimeline child in Children)
+				for (int i = 0; i < Children.Count; i++)
 				{
+					ITimeline child = Children[i];
+
 					child.SkipToFill();
 				}
 			}
@@ -261,8 +275,10 @@ internal void Deactivate()
 
 			if (Children != null)
 			{
-				foreach (ITimeline child in Children)
+				for (int i = 0; i < Children.Count; i++)
 				{
+					ITimeline child = Children[i];
+
 					child.Deactivate();
 					DisposeChildRegistrations(child);
 				}
@@ -275,8 +291,10 @@ internal void TurnOverAnimationsTo(Storyboard storyboard)
 		{
 			var affectedProperties = storyboard.Children.TargetedProperties;
 
-			foreach (var child in Children)
+			for (int i = 0; i < Children.Count; i++)
 			{
+				var child = Children[i];
+
 				var id = child.GetTimelineTargetFullName();
 
 				if (affectedProperties.Contains(id))
@@ -361,9 +379,9 @@ protected override void Dispose(bool disposing)
 
 			if (Children != null)
 			{
-				foreach (var child in Children)
+				for (int i = 0; i < Children.Count; i++)
 				{
-					child.Dispose();
+					Children[i].Dispose();
 				}
 			}
 		}
diff --git a/src/Uno.UI/UI/Xaml/UIElementCollection.cs b/src/Uno.UI/UI/Xaml/UIElementCollection.cs
@@ -70,8 +70,13 @@ public void Clear()
 		{
 			var items = ClearCore();
 
-			foreach (var item in items)
+			// This block is a manual enumeration to avoid the foreach pattern
+			// See https://github.com/dotnet/runtime/issues/56309 for details
+			var itemsEnumerator = items.GetEnumerator();
+			while (itemsEnumerator.MoveNext())
 			{
+				var item = itemsEnumerator.Current;
+
 				if (item is IDependencyObjectStoreProvider provider)
 				{
 					item.SetParent(null);
diff --git a/src/Uno.UI/UI/Xaml/VisualStateGroup.cs b/src/Uno.UI/UI/Xaml/VisualStateGroup.cs
@@ -240,8 +240,13 @@ internal void GoToState(
 			//		  the value is applied only at the end of the transition
 			if (current.setters is { } currentSetters)
 			{
-				foreach (var setter in currentSetters.OfType<Setter>())
+				// This block is a manual enumeration to avoid the foreach pattern
+				// See https://github.com/dotnet/runtime/issues/56309 for details
+				var settersEnumerator = currentSetters.OfType<Setter>().GetEnumerator();
+				while(settersEnumerator.MoveNext())
 				{
+					var setter = settersEnumerator.Current;
+
 					if (element != null && (target.setters?.OfType<Setter>().Any(o => o.HasSameTarget(setter, DependencyPropertyValuePrecedences.Animations, element)) ?? false))
 					{
 						// We clear the value of the current setter only if there isn't any setter in the target state
@@ -333,9 +338,13 @@ void ApplyTargetStateSetters()
 					// We need to invoke them using the right resource context.
 					ResourceResolver.PushNewScope(_xamlScope);
 
-					foreach (var setter in target.setters.OfType<Setter>())
+					// This block is a manual enumeration to avoid the foreach pattern
+					// See https://github.com/dotnet/runtime/issues/56309 for details
+					var settersEnumerator = target.setters.OfType<Setter>().GetEnumerator();
+
+					while(settersEnumerator.MoveNext())
 					{
-						setter.ApplyValue(DependencyPropertyValuePrecedences.Animations, element);
+						settersEnumerator.Current.ApplyValue(DependencyPropertyValuePrecedences.Animations, element);
 					}
 				}
 #if !HAS_EXPENSIVE_TRYFINALLY

Original file line number	Diff line number	Diff line change
`@@ -120,8 +120,10 @@ private void Play()`
`120`	`120`	`{`
`121`	`121`	`if (Children != null && Children.Count > 0)`
`122`	`122`	`{`
`123`		`- foreach (ITimeline child in Children)`
	`123`	`+ for (int i = 0; i < Children.Count; i++)`
`124`	`124`	`{`
	`125`	`+ ITimeline child = Children[i];`
	`126`	`+`
`125`	`127`	`DisposeChildRegistrations(child);`
`126`	`128`
`127`	`129`	`_runningChildren++;`
`@@ -167,8 +169,10 @@ public void Stop()`
`167`	`169`
`168`	`170`	`if (Children != null)`
`169`	`171`	`{`
`170`		`- foreach (ITimeline child in Children)`
	`172`	`+ for (int i = 0; i < Children.Count; i++)`
`171`	`173`	`{`
	`174`	`+ ITimeline child = Children[i];`
	`175`	`+`
`172`	`176`	`child.Stop();`
`173`	`177`	`DisposeChildRegistrations(child);`
`174`	`178`	`}`
`@@ -192,8 +196,10 @@ public void Resume()`
`192`	`196`	`{`
`193`	`197`	`State = TimelineState.Active;`
`194`	`198`
`195`		`- foreach (ITimeline child in Children)`
	`199`	`+ for (int i = 0; i < Children.Count; i++)`
`196`	`200`	`{`
	`201`	`+ ITimeline child = Children[i];`
	`202`	`+`
`197`	`203`	`child.Resume();`
`198`	`204`	`}`
`199`	`205`	`}`
`@@ -215,8 +221,10 @@ public void Pause()`
`215`	`221`
`216`	`222`	`if (Children != null)`
`217`	`223`	`{`
`218`		`- foreach (ITimeline child in Children)`
	`224`	`+ for (int i = 0; i < Children.Count; i++)`
`219`	`225`	`{`
	`226`	`+ ITimeline child = Children[i];`
	`227`	`+`
`220`	`228`	`child.Pause();`
`221`	`229`	`}`
`222`	`230`	`}`
`@@ -226,8 +234,10 @@ public void Seek(TimeSpan offset)`
`226`	`234`	`{`
`227`	`235`	`if (Children != null)`
`228`	`236`	`{`
`229`		`- foreach (ITimeline child in Children)`
	`237`	`+ for (int i = 0; i < Children.Count; i++)`
`230`	`238`	`{`
	`239`	`+ ITimeline child = Children[i];`
	`240`	`+`
`231`	`241`	`child.Seek(offset);`
`232`	`242`	`}`
`233`	`243`	`}`
`@@ -237,8 +247,10 @@ public void SeekAlignedToLastTick(TimeSpan offset)`
`237`	`247`	`{`
`238`	`248`	`if (Children != null)`
`239`	`249`	`{`
`240`		`- foreach (ITimeline child in Children)`
	`250`	`+ for (int i = 0; i < Children.Count; i++)`
`241`	`251`	`{`
	`252`	`+ ITimeline child = Children[i];`
	`253`	`+`
`242`	`254`	`child.SeekAlignedToLastTick(offset);`
`243`	`255`	`}`
`244`	`256`	`}`
`@@ -247,8 +259,10 @@ public void SkipToFill()`
`247`	`259`	`{`
`248`	`260`	`if (Children != null)`
`249`	`261`	`{`
`250`		`- foreach (ITimeline child in Children)`
	`262`	`+ for (int i = 0; i < Children.Count; i++)`
`251`	`263`	`{`
	`264`	`+ ITimeline child = Children[i];`
	`265`	`+`
`252`	`266`	`child.SkipToFill();`
`253`	`267`	`}`
`254`	`268`	`}`
`@@ -261,8 +275,10 @@ internal void Deactivate()`
`261`	`275`
`262`	`276`	`if (Children != null)`
`263`	`277`	`{`
`264`		`- foreach (ITimeline child in Children)`
	`278`	`+ for (int i = 0; i < Children.Count; i++)`
`265`	`279`	`{`
	`280`	`+ ITimeline child = Children[i];`
	`281`	`+`
`266`	`282`	`child.Deactivate();`
`267`	`283`	`DisposeChildRegistrations(child);`
`268`	`284`	`}`
`@@ -275,8 +291,10 @@ internal void TurnOverAnimationsTo(Storyboard storyboard)`
`275`	`291`	`{`
`276`	`292`	`var affectedProperties = storyboard.Children.TargetedProperties;`
`277`	`293`
`278`		`- foreach (var child in Children)`
	`294`	`+ for (int i = 0; i < Children.Count; i++)`
`279`	`295`	`{`
	`296`	`+ var child = Children[i];`
	`297`	`+`
`280`	`298`	`var id = child.GetTimelineTargetFullName();`
`281`	`299`
`282`	`300`	`if (affectedProperties.Contains(id))`
`@@ -361,9 +379,9 @@ protected override void Dispose(bool disposing)`
`361`	`379`
`362`	`380`	`if (Children != null)`
`363`	`381`	`{`
`364`		`- foreach (var child in Children)`
	`382`	`+ for (int i = 0; i < Children.Count; i++)`
`365`	`383`	`{`
`366`		`- child.Dispose();`
	`384`	`+ Children[i].Dispose();`
`367`	`385`	`}`
`368`	`386`	`}`
`369`	`387`	`}`
Original file line number	Diff line number	Diff line change
`@@ -70,8 +70,13 @@ public void Clear()`
`70`	`70`	`{`
`71`	`71`	`var items = ClearCore();`
`72`	`72`
`73`		`- foreach (var item in items)`
	`73`	`+ // This block is a manual enumeration to avoid the foreach pattern`
	`74`	`+ // See https://github.com/dotnet/runtime/issues/56309 for details`
	`75`	`+ var itemsEnumerator = items.GetEnumerator();`
	`76`	`+ while (itemsEnumerator.MoveNext())`
`74`	`77`	`{`
	`78`	`+ var item = itemsEnumerator.Current;`
	`79`	`+`
`75`	`80`	`if (item is IDependencyObjectStoreProvider provider)`
`76`	`81`	`{`
`77`	`82`	`item.SetParent(null);`
Original file line number	Diff line number	Diff line change
`@@ -240,8 +240,13 @@ internal void GoToState(`
`240`	`240`	`// the value is applied only at the end of the transition`
`241`	`241`	`if (current.setters is { } currentSetters)`
`242`	`242`	`{`
`243`		`- foreach (var setter in currentSetters.OfType<Setter>())`
	`243`	`+ // This block is a manual enumeration to avoid the foreach pattern`
	`244`	`+ // See https://github.com/dotnet/runtime/issues/56309 for details`
	`245`	`+ var settersEnumerator = currentSetters.OfType<Setter>().GetEnumerator();`
	`246`	`+ while(settersEnumerator.MoveNext())`
`244`	`247`	`{`
	`248`	`+ var setter = settersEnumerator.Current;`
	`249`	`+`
`245`	`250`	`if (element != null && (target.setters?.OfType<Setter>().Any(o => o.HasSameTarget(setter, DependencyPropertyValuePrecedences.Animations, element)) ?? false))`
`246`	`251`	`{`
`247`	`252`	`// We clear the value of the current setter only if there isn't any setter in the target state`
`@@ -333,9 +338,13 @@ void ApplyTargetStateSetters()`
`333`	`338`	`// We need to invoke them using the right resource context.`
`334`	`339`	`ResourceResolver.PushNewScope(_xamlScope);`
`335`	`340`
`336`		`- foreach (var setter in target.setters.OfType<Setter>())`
	`341`	`+ // This block is a manual enumeration to avoid the foreach pattern`
	`342`	`+ // See https://github.com/dotnet/runtime/issues/56309 for details`
	`343`	`+ var settersEnumerator = target.setters.OfType<Setter>().GetEnumerator();`
	`344`	`+`
	`345`	`+ while(settersEnumerator.MoveNext())`
`337`	`346`	`{`
`338`		`- setter.ApplyValue(DependencyPropertyValuePrecedences.Animations, element);`
	`347`	`+ settersEnumerator.Current.ApplyValue(DependencyPropertyValuePrecedences.Animations, element);`
`339`	`348`	`}`
`340`	`349`	`}`
`341`	`350`	`#if !HAS_EXPENSIVE_TRYFINALLY`