Clean-up CacheEntry (#59110)

dotnet · Apr 27, 2022 · fa55bec · fa55bec
1 parent 276d642
commit fa55bec
Show file tree

Hide file tree

Showing 9 changed files with 236 additions and 268 deletions.
diff --git a/src/libraries/Microsoft.Extensions.Caching.Memory/src/CacheEntry.CacheEntryState.cs b/src/libraries/Microsoft.Extensions.Caching.Memory/src/CacheEntry.CacheEntryState.cs
diff --git a/src/libraries/Microsoft.Extensions.Caching.Memory/src/CacheEntry.CacheEntryTokens.cs b/src/libraries/Microsoft.Extensions.Caching.Memory/src/CacheEntry.CacheEntryTokens.cs
@@ -26,13 +26,14 @@ private sealed class CacheEntryTokens
 
             internal void AttachTokens(CacheEntry cacheEntry)
             {
-                if (_expirationTokens != null)
+                List<IChangeToken>? expirationTokens = _expirationTokens;
+                if (expirationTokens is not null)
                 {
                     lock (this)
                     {
-                        for (int i = 0; i < _expirationTokens.Count; i++)
+                        for (int i = 0; i < expirationTokens.Count; i++)
                         {
-                            IChangeToken expirationToken = _expirationTokens[i];
+                            IChangeToken expirationToken = expirationTokens[i];
                             if (expirationToken.ActiveChangeCallbacks)
                             {
                                 _expirationTokenRegistrations ??= new List<IDisposable>(1);
@@ -46,11 +47,12 @@ internal void AttachTokens(CacheEntry cacheEntry)
 
             internal bool CheckForExpiredTokens(CacheEntry cacheEntry)
             {
-                if (_expirationTokens != null)
+                List<IChangeToken>? expirationTokens = _expirationTokens;
+                if (expirationTokens is not null)
                 {
-                    for (int i = 0; i < _expirationTokens.Count; i++)
+                    for (int i = 0; i < expirationTokens.Count; i++)
                     {
-                        IChangeToken expiredToken = _expirationTokens[i];
+                        IChangeToken expiredToken = expirationTokens[i];
                         if (expiredToken.HasChanged)
                         {
                             cacheEntry.SetExpired(EvictionReason.TokenExpired);
@@ -69,12 +71,10 @@ internal void PropagateTokens(CacheEntry parentEntry)
                 {
                     lock (this)
                     {
-                        lock (parentEntry.GetOrCreateTokens())
+                        CacheEntryTokens parentTokens = parentEntry.GetOrCreateTokens();
+                        lock (parentTokens)
                         {
-                            foreach (IChangeToken expirationToken in _expirationTokens)
-                            {
-                                parentEntry.AddExpirationToken(expirationToken);
-                            }
+                            parentTokens.ExpirationTokens.AddRange(_expirationTokens);
                         }
                     }
                 }