mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-03 21:27:38 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

util.cache: Pass cache itself to eviction callback

Browse source 
Simplifies access to the cache without moving code around a lot given
the currently common pattern of

	local some_cache = cache.new(size, function(k,v) end)
This commit is contained in:
Kim Alvefur 2023-06-30 22:01:55 +02:00
parent 29b6ed4f0a
commit 915ef3a222
2 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
spec/util_cache_spec.lua
View file

@ -390,8 +390,7 @@ describe("util.cache", function()
end); end);
it("eviction stuff", function () it("eviction stuff", function ()
local c; local c = cache.new(4, function(_k,_v,c)
c = cache.new(4, function(_k,_v)
if c.size < 10 then if c.size < 10 then
c:resize(c.size*2); c:resize(c.size*2);
end end

4
util/cache.lua
View file

@ -55,7 +55,7 @@ function cache_methods:set(k, v)
local tail = self._tail; local tail = self._tail;
local 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;
local do_evict = on_evict and on_evict(evicted_key, evicted_value); local do_evict = on_evict and on_evict(evicted_key, evicted_value, self);
if do_evict == false then if do_evict == false then
-- Cache is full, and we're not allowed to evict -- Cache is full, and we're not allowed to evict
@ -129,7 +129,7 @@ function cache_methods:resize(new_size)
while self._count > new_size do while self._count > new_size do
local tail = self._tail; local tail = self._tail;
local evicted_key, evicted_value = tail.key, tail.value; 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 if on_evict ~= nil and (on_evict == false or on_evict(evicted_key, evicted_value, self) == false) then
-- Cache is full, and we're not allowed to evict -- Cache is full, and we're not allowed to evict
return false; return false;
end end