OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #611 from matrix-org/erikj/expiring_cache_size 

Report size of ExpiringCache
pull/614/head
Erik Johnston 2016-03-01 11:15:56 +00:00
parent bfdcc7b9b6 72165e5b77
commit 742ec37ca3
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
synapse/util/caches/expiringcache.py
View File

@ -13,6 +13,8 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
from synapse.util.caches import cache_counter, caches_by_name
import logging import logging
@ -47,6 +49,8 @@ class ExpiringCache(object):
self._cache = {} self._cache = {}
caches_by_name[cache_name] = self._cache
def start(self): def start(self):
if not self._expiry_ms: if not self._expiry_ms:
# Don't bother starting the loop if things never expire # Don't bother starting the loop if things never expire
@ -72,7 +76,12 @@ class ExpiringCache(object):
self._cache.pop(k) self._cache.pop(k)
def __getitem__(self, key): def __getitem__(self, key):
entry = self._cache[key] try:
entry = self._cache[key]
cache_counter.inc_hits(self._cache_name)
except KeyError:
cache_counter.inc_misses(self._cache_name)
raise
if self._reset_expiry_on_get: if self._reset_expiry_on_get:
entry.time = self._clock.time_msec() entry.time = self._clock.time_msec()
@ -105,9 +114,12 @@ class ExpiringCache(object):
logger.debug( logger.debug(
"[%s] _prune_cache before: %d, after len: %d", "[%s] _prune_cache before: %d, after len: %d",
self._cache_name, begin_length, len(self._cache.keys()) self._cache_name, begin_length, len(self._cache)
) )
def __len__(self):
return len(self._cache)
class _CacheEntry(object): class _CacheEntry(object):
def __init__(self, time, value): def __init__(self, time, value):