rottenwheel/monero
1
0
Fork 0
mirror of https://codeberg.org/anoncontributorxmr/monero.git synced 2024-11-25 08:52:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #3702

Browse source 
099bb83 easylogging++: cached allowed categories (moneromooo-monero)
This commit is contained in:
luigi1111 2018-06-20 14:02:12 -05:00
commit 4aa832e534
No known key found for this signature in database
GPG key ID: F4ACA0183641E010
2 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
external/easylogging++/easylogging++.cc vendored
View file

@ -1967,10 +1967,12 @@ void VRegistry::setCategories(const char* categories, bool clear) {
base::threading::ScopedLock scopedLock(lock()); base::threading::ScopedLock scopedLock(lock());
auto insert = [&](std::stringstream& ss, Level level) { auto insert = [&](std::stringstream& ss, Level level) {
m_categories.push_back(std::make_pair(ss.str(), level)); m_categories.push_back(std::make_pair(ss.str(), level));
m_cached_allowed_categories.clear();
}; };
if (clear) { if (clear) {
m_categories.clear(); m_categories.clear();
m_cached_allowed_categories.clear();
m_categoriesString.clear(); m_categoriesString.clear();
} }
if (!m_categoriesString.empty()) if (!m_categoriesString.empty())
@ -2033,15 +2035,22 @@ static int priority(Level level) {
bool VRegistry::allowed(Level level, const char* category) { bool VRegistry::allowed(Level level, const char* category) {
base::threading::ScopedLock scopedLock(lock()); base::threading::ScopedLock scopedLock(lock());
const std::string scategory = category;
const std::map<std::string, int>::const_iterator it = m_cached_allowed_categories.find(scategory);
if (it != m_cached_allowed_categories.end())
return priority(level) <= it->second;
if (m_categories.empty() || category == nullptr) { if (m_categories.empty() || category == nullptr) {
return false; return false;
} else { } else {
std::deque<std::pair<std::string, Level>>::const_reverse_iterator it = m_categories.rbegin(); std::deque<std::pair<std::string, Level>>::const_reverse_iterator it = m_categories.rbegin();
for (; it != m_categories.rend(); ++it) { for (; it != m_categories.rend(); ++it) {
if (base::utils::Str::wildCardMatch(category, it->first.c_str())) { if (base::utils::Str::wildCardMatch(category, it->first.c_str())) {
return priority(level) <= priority(it->second); const int p = priority(it->second);
m_cached_allowed_categories.insert(std::make_pair(std::move(scategory), p));
return priority(level) <= p;
} }
} }
m_cached_allowed_categories.insert(std::make_pair(std::move(scategory), -1));
return false; return false;
} }
} }

2
external/easylogging++/easylogging++.h vendored
View file

@ -2485,6 +2485,7 @@ class VRegistry : base::NoCopy, public base::threading::ThreadSafe {
inline void clearCategories(void) { inline void clearCategories(void) {
base::threading::ScopedLock scopedLock(lock()); base::threading::ScopedLock scopedLock(lock());
m_categories.clear(); m_categories.clear();
m_cached_allowed_categories.clear();
} }
inline void clearModules(void) { inline void clearModules(void) {
@ -2526,6 +2527,7 @@ class VRegistry : base::NoCopy, public base::threading::ThreadSafe {
base::type::EnumType* m_pFlags; base::type::EnumType* m_pFlags;
std::map<std::string, base::type::VerboseLevel> m_modules; std::map<std::string, base::type::VerboseLevel> m_modules;
std::deque<std::pair<std::string, Level>> m_categories; std::deque<std::pair<std::string, Level>> m_categories;
std::map<std::string, int> m_cached_allowed_categories;
std::string m_categoriesString; std::string m_categoriesString;
std::string m_filenameCommonPrefix; std::string m_filenameCommonPrefix;
}; };