Makes struct from Owned

DevTeam · Apr 11, 2024 · 4d527e3 · 4d527e3
1 parent a8d5f92
commit 4d527e3
Showing 1 changed file with 15 additions and 19 deletions.
diff --git a/src/Pure.DI.Core/Components/Api.g.cs b/src/Pure.DI.Core/Components/Api.g.cs
@@ -1102,9 +1102,9 @@ public interface IOwned : global::System.IDisposable
     [global::System.Diagnostics.DebuggerTypeProxy(typeof(global::Pure.DI.Owned.DebugView))]
     internal partial struct Owned : global::Pure.DI.IOwned
     {
-        private volatile object _lockObject;
+        private const int InitialSize = 8;
         private int _count;
-        private global::System.IDisposable[] _disposables;
+        private volatile global::System.IDisposable[] _disposables;
 
         /// <summary>
         /// Adds a disposable instance.
@@ -1118,26 +1118,22 @@ public void Add(global::System.IDisposable disposable)
                 return;
             }
 
-            if (_lockObject == null)
+            if (_disposables == null)
             {
-                while (global::System.Threading.Interlocked.CompareExchange(ref _lockObject, new object(), null) == null) ;
+                global::System.Threading.Interlocked.CompareExchange(
+                    ref _disposables,
+                    new global::System.IDisposable[InitialSize],
+                    null);
             }
 
-            lock (_lockObject)
+            lock (_disposables)
             {
-                if (_count == 0)
+                var size = _disposables.Length;
+                if (size == _count)
                 {
-                    _disposables = new global::System.IDisposable[8];
-                }
-                else
-                {
-                    var size = _disposables.Length;
-                    if (size == _count)
-                    {
-                        var disposables = new global::System.IDisposable[size << 1];
-                        global::System.Array.Copy(_disposables, disposables, size);
-                        _disposables = disposables;
-                    }
+                    var disposables = new global::System.IDisposable[size << 1];
+                    global::System.Array.Copy(_disposables, disposables, size);
+                    _disposables = disposables;
                 }
 
                 _disposables[_count++] = disposable;
@@ -1148,14 +1144,14 @@ public void Add(global::System.IDisposable disposable)
         [global::System.Runtime.CompilerServices.MethodImpl((global::System.Runtime.CompilerServices.MethodImplOptions)512)]
         public void Dispose()
         {
-            if (_lockObject == null)
+            if (_disposables == null)
             {
                 return;
             }
 
             global::System.IDisposable[] disposables;
             int count;
-            lock (_lockObject)
+            lock (_disposables)
             {
                 disposables = new global::System.IDisposable[_count];
                 global::System.Array.Copy(_disposables, disposables, _count);