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/FeatureOracle.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/FeatureOracle.cpp')
| -rw-r--r-- | Swiften/Disco/FeatureOracle.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Swiften/Disco/FeatureOracle.cpp b/Swiften/Disco/FeatureOracle.cpp index 2baf87c..63f7a4e 100644 --- a/Swiften/Disco/FeatureOracle.cpp +++ b/Swiften/Disco/FeatureOracle.cpp @@ -1,32 +1,32 @@ /* - * Copyright (c) 2015-2016 Isode Limited. + * Copyright (c) 2015-2017 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #include <Swiften/Disco/FeatureOracle.h> #include <algorithm> #include <iterator> #include <unordered_set> #include <vector> #include <Swiften/Base/Log.h> #include <Swiften/Disco/EntityCapsProvider.h> #include <Swiften/Elements/Idle.h> #include <Swiften/Elements/Presence.h> #include <Swiften/FileTransfer/FileTransferManager.h> #include <Swiften/JID/JID.h> #include <Swiften/Presence/PresenceOracle.h> namespace Swift { FeatureOracle::FeatureOracle(EntityCapsProvider* capsProvider, PresenceOracle* presenceOracle) : capsProvider_(capsProvider), presenceOracle_(presenceOracle) { } Tristate FeatureOracle::isFileTransferSupported(const JID& jid) { Tristate fileTransferSupported = No; auto isYesOrMaybe = [](Tristate tristate) { return tristate == Yes || tristate == Maybe; }; auto isYes = [](Tristate tristate) { return tristate == Yes; }; @@ -127,75 +127,75 @@ class PresenceFeatureAvailablityComparator { JID FeatureOracle::getMostAvailableClientForFileTrasfer(const JID& bareJID) { JID fullJID; assert(bareJID.isBare()); std::vector<Presence::ref> allPresences = presenceOracle_->getAllPresence(bareJID); std::sort(allPresences.begin(), allPresences.end(), PresenceFeatureAvailablityComparator()); for (const auto& presence : allPresences) { if (presence->isAvailable()) { if (isFileTransferSupported(presence->getFrom()) == Yes) { fullJID = presence->getFrom(); break; } } } SWIFT_LOG_ASSERT(!fullJID.isBare(), error); return fullJID; } std::unordered_map<std::string, Tristate> FeatureOracle::getFeaturesForJID(const JID& jid) { std::unordered_map<std::string, Tristate> supportedFeatures; if (jid.isBare()) { // Calculate the union of disco features of all most available results and return that. std::vector<DiscoInfo::ref> onlineDiscoInfos; std::unordered_set<std::string> features; // Collect relevant disco info results and the set of features. for (auto&& presence : presenceOracle_->getAllPresence(jid)) { if (presence->getType() == Presence::Available) { - DiscoInfo::ref presenceDiscoInfo = capsProvider_->getCaps(presence->getFrom()); + DiscoInfo::ref presenceDiscoInfo = capsProvider_->getCapsCached(presence->getFrom()); if (presenceDiscoInfo) { onlineDiscoInfos.push_back(presenceDiscoInfo); features.insert(presenceDiscoInfo->getFeatures().begin(), presenceDiscoInfo->getFeatures().end()); } } } // Calculate supportedFeaturesMap. for (auto&& feature : features) { Tristate supported = Yes; for (auto&& discoInfo : onlineDiscoInfos) { if (!discoInfo->hasFeature(feature)) { supported = Maybe; break; } } supportedFeatures[feature] = supported; } } else { // Return the disco result of the full JID. - auto discoInfo = capsProvider_->getCaps(jid); + auto discoInfo = capsProvider_->getCapsCached(jid); if (discoInfo) { for (auto&& feature : discoInfo->getFeatures()) { supportedFeatures[feature] = Yes; } } } return supportedFeatures; } Tristate FeatureOracle::isFeatureSupported(const std::unordered_map<std::string, Tristate>& supportedFeatures, const std::string& feature) { Tristate supported = No; auto lookupResult = supportedFeatures.find(feature); if (lookupResult != supportedFeatures.end()) { supported = lookupResult->second; } return supported; } } |