Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2017-02-17 18:21:32 (GMT) |
|---|---|---|
| committer | Kevin Smith <kevin.smith@isode.com> | 2017-02-22 12:06:37 (GMT) |
| commit | ce307c6531053fc7edb966ba9bc2149f73cd18c2 (patch) | |
| tree | 7355bf20fc54b007cf637b5366353439c4b08207 /Swiften/Disco/EntityCapsManager.cpp | |
| parent | 996ca9ecf4f226a033d161419f11e715a3f892c3 (diff) | |
| download | swift-ce307c6531053fc7edb966ba9bc2149f73cd18c2.zip swift-ce307c6531053fc7edb966ba9bc2149f73cd18c2.tar.bz2 | |
Cache some recently used entity capability lookups in memory
Previously any entity capability lookup was only cached
on the disk. This meant that even for a cache hit, you would
read from disk and parse the disco info XML in the cache,
to return the result.
This commit adds an addition LRUCache based in-memory cache.
This extends the EntityCapsProvider API with a non-const
method, i.e. getCapsCached, which allows active caching
of results from the disk cache.
Test-Information:
All unit tests pass on macOS 10.12.3.
This noticeably speeds up the duration of a join of a large
MUC room, i.e. about 160 occupants, to about half of the
previous duration.
Change-Id: I0fc254cda962860416713822ddcad15ae13085f1
Diffstat (limited to 'Swiften/Disco/EntityCapsManager.cpp')
| -rw-r--r-- | Swiften/Disco/EntityCapsManager.cpp | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/Swiften/Disco/EntityCapsManager.cpp b/Swiften/Disco/EntityCapsManager.cpp index 64d90be..28c525f 100644 --- a/Swiften/Disco/EntityCapsManager.cpp +++ b/Swiften/Disco/EntityCapsManager.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2016 Isode Limited. + * Copyright (c) 2010-2017 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ @@ -76,4 +76,20 @@ DiscoInfo::ref EntityCapsManager::getCaps(const JID& jid) const { return DiscoInfo::ref(); } +DiscoInfo::ref EntityCapsManager::getCapsCached(const JID& jid) { + DiscoInfo::ref result; + auto capsHit = caps.find(jid); + if (capsHit != caps.end()) { + result = lruDiscoCache.get(capsHit->second, [&](const std::string& capsHash) { + boost::optional<DiscoInfo::ref> fileCacheResult; + auto fileCacheDiscoInfo = capsProvider->getCaps(capsHash); + if (fileCacheDiscoInfo) { + fileCacheResult = fileCacheDiscoInfo; + } + return fileCacheResult; + }).get_value_or(DiscoInfo::ref()); + } + return result; +} + } |