From f81f466b2831a0fa586cd9dafa3473084778bdda Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Sat, 18 Nov 2017 21:35:40 +0100 Subject: util.cache: Call on-eviction callback when shrinking --- util/cache.lua | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/util/cache.lua b/util/cache.lua index beb55112..a5fd5e6d 100644 --- a/util/cache.lua +++ b/util/cache.lua @@ -120,9 +120,14 @@ function cache_methods:resize(new_size) new_size = assert(tonumber(new_size), "cache size must be a number"); new_size = math.floor(new_size); assert(new_size > 0, "cache size must be greater than zero"); + local on_evict = self._on_evict; while self._count > new_size do local tail = self._tail; - local evicted_key = tail.key; + local evicted_key, evicted_value = 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 -- cgit v1.2.3