Skip to content

Clean-up CacheEntry #59110

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
maryamariyan merged 23 commits into from
Apr 27, 2022
Merged

Clean-up CacheEntry #59110

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
42fee8f
Pack CacheEntry.Size
pentp Sep 14, 2021
f0cd5a6
Pack AbsoluteExpirationRelativeToNow
pentp Sep 14, 2021
d4d723a
Pack SlidingExpiration
pentp Sep 14, 2021
f9f4517
Cleanup CacheEntryTokens
pentp Sep 14, 2021
56bb50e
Pack LastAccessed and use DateTimes for expiration logic
pentp Sep 14, 2021
49fcbeb
Pack AbsoluteExpiration
pentp Sep 14, 2021
1bce2be
Remove CacheEntryState
pentp Sep 14, 2021
9e31d49
Address PR feedback
pentp Sep 14, 2021
9ad0a11
Rebase cleanup
pentp Oct 1, 2021
10b1015
Address PR feedback
pentp Oct 6, 2021
b4a1843
More optimizations
pentp Oct 20, 2021
409583b
sync with main, solve merge conflict
adamsitnik Nov 23, 2021
dadc19b
Merge from main
pentp Mar 29, 2022
b9ae1b9
Merge from main
pentp Mar 29, 2022
f1295c9
Merge from main
pentp Mar 29, 2022
6d2890b
Merge from main
pentp Mar 29, 2022
79b7be2
Merge from main
pentp Mar 29, 2022
63f148b
Merge from main
pentp Mar 29, 2022
0a59d2e
Merge from main
pentp Mar 29, 2022
390b5c2
Fix nullability and var use.
pentp Mar 29, 2022
e1deafb
Fix nullability
pentp Mar 29, 2022
4c1e152
Merge branch main into CacheEntry-slim
pentp Apr 25, 2022
27f046a
Address PR feedback
pentp Apr 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
61 changes: 0 additions & 61 deletions src/libraries/Microsoft.Extensions.Caching.Memory/src/CacheEntry.CacheEntryState.cs
View file
Open in desktop

This file was deleted.

22 changes: 11 additions & 11 deletions src/libraries/Microsoft.Extensions.Caching.Memory/src/CacheEntry.CacheEntryTokens.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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);
Expand All @@ -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);
}
}
}
Expand Down
Loading