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

util.cache: Change behaviour of on_evict (and tests). Now accepts false instead of a function (never evict), or on_evict can return false to prevent eviction.

Browse source
This commit is contained in:
Matthew Wild 2016-03-17 19:08:42 +00:00
parent 5f86077aa2
commit 6b4c1ca955
2 changed files with 34 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

10
util/cache.lua
View file

@ -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