diff options
Diffstat (limited to 'util/cache.lua')
| -rw-r--r-- | util/cache.lua | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/util/cache.lua b/util/cache.lua index d3639b3f..074916cd 100644 --- a/util/cache.lua +++ b/util/cache.lua @@ -51,10 +51,13 @@ function cache_methods:set(k, v) return true; end -- Check whether we need to remove oldest k/v - local on_evict, evicted_key, evicted_value; if self._count == self.size then local tail = self._tail; - on_evict, evicted_key, evicted_value = self._on_evict, tail.key, tail.value; + local on_evict, evicted_key, evicted_value = self._on_evict, tail.key, tail.value; + if on_evict ~= nil and (on_evict == false or on_evict(evicted_key, evicted_value) == false) then + -- Cache is full, and we're not allowed to evict + return false; + end _remove(self, tail); self._data[evicted_key] = nil; end @@ -62,9 +65,6 @@ function cache_methods:set(k, v) m = { key = k, value = v, prev = nil, next = nil }; self._data[k] = m; _insert(self, m); - if on_evict and evicted_key then - on_evict(evicted_key, evicted_value, self); - end return true; end @@ -92,6 +92,18 @@ function cache_methods:count() return self._count; end +function cache_methods:head() + local head = self._head; + if not head then return nil, nil; end + return head.key, head.value; +end + +function cache_methods:tail() + local tail = self._tail; + if not tail then return nil, nil; end + return tail.key, tail.value; +end + local function new(size, on_evict) size = assert(tonumber(size), "cache size must be a number"); size = math.floor(size); |