improved LRU cache operations (avoid write lock on TotalCount)

0xERR0R · Jun 2, 2022 · fd8c61c · fd8c61c
1 parent a120aaf
commit fd8c61c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/cache/expirationcache/expiration_cache.go b/cache/expirationcache/expiration_cache.go
@@ -84,7 +84,7 @@ func (e *ExpiringLRUCache) cleanUp() {
 
 	// check for expired items and collect expired keys
 	for _, k := range e.lru.Keys() {
-		if v, ok := e.lru.Get(k); ok {
+		if v, ok := e.lru.Peek(k); ok {
 			if isExpired(v.(*element)) {
 				expiredKeys = append(expiredKeys, k.(string))
 			}
@@ -148,7 +148,7 @@ func calculateRemainTTL(expiresEpoch int64) time.Duration {
 
 func (e *ExpiringLRUCache) TotalCount() (count int) {
 	for _, k := range e.lru.Keys() {
-		if v, ok := e.lru.Get(k); ok {
+		if v, ok := e.lru.Peek(k); ok {
 			if !isExpired(v.(*element)) {
 				count++
 			}

diff --git a/resolver/caching_resolver.go b/resolver/caching_resolver.go
@@ -219,9 +219,11 @@ func (r *CachingResolver) trackQueryDomainNameCount(domain string, cacheKey stri
 		}
 		domainCount++
 		r.prefetchingNameCache.Put(cacheKey, domainCount, r.prefetchExpires)
+		totalCount := r.prefetchingNameCache.TotalCount()
+
 		logger.Debugf("domain '%s' was requested %d times, "+
-			"total cache size: %d", util.Obfuscate(domain), domainCount, r.prefetchingNameCache.TotalCount())
-		evt.Bus().Publish(evt.CachingDomainsToPrefetchCountChanged, r.prefetchingNameCache.TotalCount())
+			"total cache size: %d", util.Obfuscate(domain), domainCount, totalCount)
+		evt.Bus().Publish(evt.CachingDomainsToPrefetchCountChanged, totalCount)
 	}
 }