vbatts/shadowsocks
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

fix duplicated close in LRUCache

Browse source 
close #324
This commit is contained in:
clowwindy 2015-05-19 08:13:47 +08:00
parent 893d21da76
commit 082c8a80f4
1 changed files with 20 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
shadowsocks/lru_cache.py
View file

@ -74,6 +74,7 @@ class LRUCache(collections.MutableMapping):
# O(m) # O(m)
now = time.time() now = time.time()
c = 0 c = 0
values_closed = list() # list is cheaper to create
while len(self._last_visits) > 0: while len(self._last_visits) > 0:
least = self._last_visits[0] least = self._last_visits[0]
if now - least <= self.timeout: if now - least <= self.timeout:
@ -83,7 +84,9 @@ class LRUCache(collections.MutableMapping):
if key in self._store: if key in self._store:
if now - self._keys_to_last_time[key] > self.timeout: if now - self._keys_to_last_time[key] > self.timeout:
value = self._store[key] value = self._store[key]
if value not in values_closed:
self.close_callback(value) self.close_callback(value)
values_closed.append(value)
for key in self._time_to_keys[least]: for key in self._time_to_keys[least]:
self._last_visits.popleft() self._last_visits.popleft()
if key in self._store: if key in self._store:
@ -126,5 +129,21 @@ def test():
assert 'a' not in c assert 'a' not in c
assert 'b' not in c assert 'b' not in c
global close_cb_called
close_cb_called = False
def close_cb(t):
global close_cb_called
assert not close_cb_called
close_cb_called = True
c = LRUCache(timeout=0.1, close_callback=close_cb)
c['s'] = 1
c['s']
time.sleep(0.1)
c['s']
time.sleep(0.3)
c.sweep()
if __name__ == '__main__': if __name__ == '__main__':
test() test()