Skip to content

fix: thread-safe Cap() #193

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: thread-safe Cap() #193

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
27 changes: 16 additions & 11 deletions lru.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,7 @@ func (c *Cache[K, V]) Add(key K, value V) (evicted bool) {
c.lock.Lock()
evicted = c.lru.Add(key, value)
if c.onEvictedCB != nil && evicted {
k, v = c.evictedKeys[0], c.evictedVals[0]
c.evictedKeys, c.evictedVals = c.evictedKeys[:0], c.evictedVals[:0]
k, v = c.clearEvictedKV()
}
c.lock.Unlock()
if c.onEvictedCB != nil && evicted {
Expand Down Expand Up @@ -130,8 +129,7 @@ func (c *Cache[K, V]) ContainsOrAdd(key K, value V) (ok, evicted bool) {
}
evicted = c.lru.Add(key, value)
if c.onEvictedCB != nil && evicted {
k, v = c.evictedKeys[0], c.evictedVals[0]
c.evictedKeys, c.evictedVals = c.evictedKeys[:0], c.evictedVals[:0]
k, v = c.clearEvictedKV()
}
c.lock.Unlock()
if c.onEvictedCB != nil && evicted {
Expand All @@ -154,8 +152,7 @@ func (c *Cache[K, V]) PeekOrAdd(key K, value V) (previous V, ok, evicted bool) {
}
evicted = c.lru.Add(key, value)
if c.onEvictedCB != nil && evicted {
k, v = c.evictedKeys[0], c.evictedVals[0]
c.evictedKeys, c.evictedVals = c.evictedKeys[:0], c.evictedVals[:0]
k, v = c.clearEvictedKV()
}
c.lock.Unlock()
if c.onEvictedCB != nil && evicted {
Expand All @@ -171,8 +168,7 @@ func (c *Cache[K, V]) Remove(key K) (present bool) {
c.lock.Lock()
present = c.lru.Remove(key)
if c.onEvictedCB != nil && present {
k, v = c.evictedKeys[0], c.evictedVals[0]
c.evictedKeys, c.evictedVals = c.evictedKeys[:0], c.evictedVals[:0]
k, v = c.clearEvictedKV()
}
c.lock.Unlock()
if c.onEvictedCB != nil && present {
Expand Down Expand Up @@ -207,8 +203,7 @@ func (c *Cache[K, V]) RemoveOldest() (key K, value V, ok bool) {
c.lock.Lock()
key, value, ok = c.lru.RemoveOldest()
if c.onEvictedCB != nil && ok {
k, v = c.evictedKeys[0], c.evictedVals[0]
c.evictedKeys, c.evictedVals = c.evictedKeys[:0], c.evictedVals[:0]
k, v = c.clearEvictedKV()
}
c.lock.Unlock()
if c.onEvictedCB != nil && ok {
Expand Down Expand Up @@ -251,5 +246,15 @@ func (c *Cache[K, V]) Len() int {

// Cap returns the capacity of the cache
func (c *Cache[K, V]) Cap() int {
return c.lru.Cap()
c.lock.RLock()
ret := c.lru.Cap()
c.lock.RUnlock()
return ret
}

// clearEvictedKV returns the first k/v, clean the evictedKeys and evictedVals
func (c *Cache[K, V]) clearEvictedKV() (K, V) {
k, v := c.evictedKeys[0], c.evictedVals[0]
c.evictedKeys, c.evictedVals = c.evictedKeys[:0], c.evictedVals[:0]
return k, v
}