From a2d8b56f0c21c5562c23717b6137ed6254ddc6d4 Mon Sep 17 00:00:00 2001 From: Patrick Mylund Nielsen Date: Fri, 25 Nov 2016 13:56:11 -0500 Subject: [PATCH] Make Items() return a copy rather than an unsynchronized reference to the underlying items map --- cache.go | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/cache.go b/cache.go index 3562543..4eab3d0 100644 --- a/cache.go +++ b/cache.go @@ -998,19 +998,25 @@ func (c *cache) LoadFile(fname string) error { return fp.Close() } -// Returns the items in the cache. This may include items that have expired, -// but have not yet been cleaned up. If this is significant, the Expiration -// fields of the items should be checked. Note that explicit synchronization -// is needed to use a cache and its corresponding Items() return value at -// the same time, as the map is shared. +// Copies all unexpired items in the cache into a new map and returns it. func (c *cache) Items() map[string]Item { c.mu.RLock() defer c.mu.RUnlock() - return c.items + m := make(map[string]Item, len(c.items)) + now := time.Now().UnixNano() + for k, v := range c.items { + if v.Expiration > 0 { + if now > v.Expiration { + continue + } + } + m[k] = v + } + return m } // Returns the number of items in the cache. This may include items that have -// expired, but have not yet been cleaned up. Equivalent to len(c.Items()). +// expired, but have not yet been cleaned up. func (c *cache) ItemCount() int { c.mu.RLock() n := len(c.items)