Reduce WeakReference allocs in AggregateBindable

ppy · Feb 26, 2024 · 840d401 · 840d401
1 parent 082f699
commit 840d401
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/osu.Framework/Bindables/AggregateBindable.cs b/osu.Framework/Bindables/AggregateBindable.cs
@@ -52,7 +52,7 @@ public void AddSource(IBindable<T> bindable)
                     return;
 
                 var boundCopy = bindable.GetBoundCopy();
-                sourceMapping.Add(new WeakRefPair(new WeakReference<IBindable<T>>(bindable), boundCopy));
+                sourceMapping.Add(new WeakRefPair(bindable.GetWeakReference(), boundCopy));
                 boundCopy.BindValueChanged(recalculateAggregate, true);
             }
         }
@@ -114,10 +114,10 @@ public void RemoveAllSources()
 
         private class WeakRefPair
         {
-            public readonly WeakReference<IBindable<T>> WeakReference;
+            public readonly WeakReference<Bindable<T>> WeakReference;
             public readonly IBindable<T> BoundCopy;
 
-            public WeakRefPair(WeakReference<IBindable<T>> weakReference, IBindable<T> boundCopy)
+            public WeakRefPair(WeakReference<Bindable<T>> weakReference, IBindable<T> boundCopy)
             {
                 WeakReference = weakReference;
                 BoundCopy = boundCopy;

diff --git a/osu.Framework/Bindables/Bindable.cs b/osu.Framework/Bindables/Bindable.cs
@@ -440,6 +440,8 @@ public Bindable<T> GetUnboundCopy()
 
         IBindable IBindable.GetBoundCopy() => GetBoundCopy();
 
+        public WeakReference<Bindable<T>> GetWeakReference() => weakReference;
+
         IBindable<T> IBindable<T>.GetBoundCopy() => GetBoundCopy();
 
         /// <inheritdoc cref="IBindable{T}.GetBoundCopy"/>

diff --git a/osu.Framework/Bindables/IBindable.cs b/osu.Framework/Bindables/IBindable.cs
@@ -111,5 +111,10 @@ IBindable<T> BindTarget
 
         /// <inheritdoc cref="IBindable.GetBoundCopy"/>
         IBindable<T> GetBoundCopy();
+
+        /// <summary>
+        /// Retrieves a weak reference to this bindable.
+        /// </summary>
+        internal WeakReference<Bindable<T>> GetWeakReference();
     }
 }