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

Improve lru_cache. Update test for it (#897)

Browse source
This commit is contained in:
Minwei Shen 2017-09-06 00:12:37 -07:00 committed by mengskysama
parent 893f9099b3
commit 3c82f02343
1 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
shadowsocks/lru_cache.py
View file

@ -79,18 +79,15 @@ class LRUCache(collections.MutableMapping):
least = self._last_visits[0] least = self._last_visits[0]
if now - least <= self.timeout: if now - least <= self.timeout:
break break
if self.close_callback is not None:
for key in self._time_to_keys[least]:
if key in self._store:
if now - self._keys_to_last_time[key] > self.timeout:
value = self._store[key]
if value not in self._closed_values:
self.close_callback(value)
self._closed_values.add(value)
self._last_visits.popleft() self._last_visits.popleft()
for key in self._time_to_keys[least]: for key in self._time_to_keys[least]:
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:
if self.close_callback is not None:
value = self._store[key]
if value not in self._closed_values:
self.close_callback(value)
self._closed_values.add(value)
del self._store[key] del self._store[key]
del self._keys_to_last_time[key] del self._keys_to_last_time[key]
c += 1 c += 1
@ -140,6 +137,7 @@ def test():
c = LRUCache(timeout=0.1, close_callback=close_cb) c = LRUCache(timeout=0.1, close_callback=close_cb)
c['s'] = 1 c['s'] = 1
c['t'] = 1
c['s'] c['s']
time.sleep(0.1) time.sleep(0.1)
c['s'] c['s']