perf: Remove ObjectId from DependencyObjectStore

unoplatform · Sep 10, 2024 · cb16b0d · cb16b0d
1 parent d427c31
commit cb16b0d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 18 deletions.
diff --git a/src/Uno.UI/UI/Xaml/DependencyObjectExtensions.cs b/src/Uno.UI/UI/Xaml/DependencyObjectExtensions.cs
@@ -51,7 +51,7 @@ internal static AttachedDependencyObject GetAttachedDependencyObject(object inst
 		/// <returns>A unique ID</returns>
 		internal static long GetDependencyObjectId(this object dependencyObject)
 		{
-			return GetStore(dependencyObject).ObjectId;
+			return GetStore(dependencyObject).GetHashCode();
 		}
 
 		/// <summary>

diff --git a/src/Uno.UI/UI/Xaml/DependencyObjectStore.Binder.cs b/src/Uno.UI/UI/Xaml/DependencyObjectStore.Binder.cs
@@ -340,7 +340,7 @@ private void ApplyDataContext(object? actualDataContext)
 		}
 
 		private object?[] GetTraceProperties()
-			=> new object?[] { ObjectId, _originalObjectType?.ToString() };
+			=> new object?[] { GetHashCode(), _originalObjectType?.ToString() };
 
 
 		public void SetBinding(object target, string dependencyProperty, BindingBase binding)

diff --git a/src/Uno.UI/UI/Xaml/DependencyObjectStore.cs b/src/Uno.UI/UI/Xaml/DependencyObjectStore.cs
@@ -61,12 +61,6 @@ public static class TraceProvider
 
 		private static readonly IEventProvider _trace = Tracing.Get(TraceProvider.Id);
 
-		/// <summary>
-		/// A global static counter that is used to uniquely identify objects.
-		/// This is primarily used during trace profiling.
-		/// </summary>
-		private static long _objectIdCounter;
-
 		private bool _isDisposed;
 
 		private readonly DependencyPropertyDetailsCollection _properties;
@@ -184,8 +178,6 @@ internal void ClonePropertiesToAnotherStoreForHotReload(DependencyObjectStore ot
 		/// <param name="originalObject"></param>
 		public DependencyObjectStore(object originalObject, DependencyProperty dataContextProperty, DependencyProperty templatedParentProperty)
 		{
-			ObjectId = Interlocked.Increment(ref _objectIdCounter);
-
 			_originalObjectRef = WeakReferencePool.RentWeakReference(this, originalObject);
 			_originalObjectType = originalObject is AttachedDependencyObject a ? a.Owner.GetType() : originalObject.GetType();
 
@@ -198,7 +190,7 @@ public DependencyObjectStore(object originalObject, DependencyProperty dataConte
 			{
 				_trace.WriteEvent(
 					DependencyObjectStore.TraceProvider.CreationTask,
-					new object[] { ObjectId, _originalObjectType.Name }
+					new object[] { GetHashCode(), _originalObjectType.Name }
 				);
 			}
 		}
@@ -235,11 +227,6 @@ private void Dispose(bool disposing)
 
 		internal bool IsTemplatedParentFrozen { get; set; }
 
-		/// <summary>
-		/// Gets a unique identifier for the current DependencyObject.
-		/// </summary>
-		internal long ObjectId { get; }
-
 		/// <summary>
 		/// Returns the current effective value of a dependency property from a DependencyObject.
 		/// </summary>
@@ -776,7 +763,7 @@ private void WritePropertyEventTrace(int eventId, DependencyProperty property, D
 		{
 			if (_trace.IsEnabled)
 			{
-				_trace.WriteEvent(eventId, new object[] { ObjectId, property.OwnerType.Name, property.Name, precedence?.ToString() ?? "Local" });
+				_trace.WriteEvent(eventId, new object[] { GetHashCode(), property.OwnerType.Name, property.Name, precedence?.ToString() ?? "Local" });
 			}
 		}
 
@@ -787,7 +774,7 @@ private void WritePropertyEventTrace(int eventId, DependencyProperty property, D
 				return _trace.WriteEventActivity(
 					startEventId,
 					stopEventId,
-					new object[] { ObjectId, property.OwnerType.Name, property.Name, precedence.ToString() }
+					new object[] { GetHashCode(), property.OwnerType.Name, property.Name, precedence.ToString() }
 				);
 			}
 			else