Diff

util/cache.lua @ 13175:bbdaa770b955

util.cache: Pass cache itself to eviction callback 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)
author Kim Alvefur <zash@zash.se>
date Fri, 30 Jun 2023 22:01:55 +0200
parent 13174:8ec7b7d6556f
line wrap: on
line diff
--- a/util/cache.lua	Fri Jun 30 22:01:49 2023 +0200
+++ b/util/cache.lua	Fri Jun 30 22:01:55 2023 +0200
@@ -55,7 +55,7 @@
 		local tail = self._tail;
 		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
 			-- Cache is full, and we're not allowed to evict
@@ -129,7 +129,7 @@
 	while self._count > new_size do
 		local tail = self._tail;
 		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
 			return false;
 		end