aboutsummaryrefslogtreecommitdiff
path: root/external/easylogging++/easylogging++.h
diff options
context:
space:
mode:
authorLee Clagett <code@leeclagett.com>2021-03-05 22:46:54 -0500
committerLee Clagett <code@leeclagett.com>2021-01-16 22:55:41 +0000
commit0f2b5af0dd4483eb207f50e606b95a774bc438fd (patch)
tree434fec5c2b1453dcb00746f75a8db56b73f0d6f7 /external/easylogging++/easylogging++.h
parentMerge pull request #7399 (diff)
downloadmonero-0f2b5af0dd4483eb207f50e606b95a774bc438fd.tar.xz
Reduced executable size; reduced call sequence to "allowed" log function
Diffstat (limited to 'external/easylogging++/easylogging++.h')
-rw-r--r--external/easylogging++/easylogging++.h12
1 files changed, 4 insertions, 8 deletions
diff --git a/external/easylogging++/easylogging++.h b/external/easylogging++/easylogging++.h
index 0b65461bc..c4a88339f 100644
--- a/external/easylogging++/easylogging++.h
+++ b/external/easylogging++/easylogging++.h
@@ -412,7 +412,6 @@ ELPP_INTERNAL_DEBUGGING_OUT_INFO << ELPP_INTERNAL_DEBUGGING_MSG(internalInfoStre
#include <sstream>
#include <memory>
#include <type_traits>
-#include <atomic>
#if ELPP_THREADING_ENABLED
# if ELPP_USE_STD_THREADING
# include <mutex>
@@ -2464,12 +2463,7 @@ class VRegistry : base::NoCopy, public base::threading::ThreadSafe {
return m_level;
}
- inline void clearCategories(void) {
- base::threading::ScopedLock scopedLock(lock());
- m_categories.clear();
- m_cached_allowed_categories.clear();
- m_lowest_priority = INT_MAX;
- }
+ void clearCategories(void);
inline void clearModules(void) {
base::threading::ScopedLock scopedLock(lock());
@@ -2482,6 +2476,7 @@ class VRegistry : base::NoCopy, public base::threading::ThreadSafe {
void setModules(const char* modules);
+ bool priority_allowed(int priority, const std::string &category);
bool allowed(Level level, const std::string &category);
bool allowed(base::type::VerboseLevel vlevel, const char* file);
@@ -2513,7 +2508,6 @@ class VRegistry : base::NoCopy, public base::threading::ThreadSafe {
std::map<std::string, int> m_cached_allowed_categories;
std::string m_categoriesString;
std::string m_filenameCommonPrefix;
- std::atomic<int> m_lowest_priority;
};
} // namespace base
class LogMessage {
@@ -3868,6 +3862,8 @@ class Helpers : base::StaticClass {
/// @brief Static helpers to deal with loggers and their configurations
class Loggers : base::StaticClass {
public:
+ /// @brief Determines whether logging will occur at this level and category
+ static bool allowed(Level leve, const char* cat);
/// @brief Gets existing or registers new logger
static Logger* getLogger(const std::string& identity, bool registerIfNotAvailable = true);
/// @brief Changes default log builder for future loggers