diff options
| author | moneromooo-monero <moneromooo-monero@users.noreply.github.com> | 2018-12-29 15:41:48 +0000 |
|---|---|---|
| committer | moneromooo-monero <moneromooo-monero@users.noreply.github.com> | 2019-08-19 14:52:14 +0000 |
| commit | 32b0560003b087b9c32407f50bd60eda413d70a2 (patch) | |
| tree | 1ed0a125e9e7ba54ae6f8aa78227222e3776286b /external/easylogging++/easylogging++.h | |
| parent | Merge pull request #5685 (diff) | |
| download | monero-32b0560003b087b9c32407f50bd60eda413d70a2.tar.xz | |
easylogging++: weed out most calls to allowed without locking
Diffstat (limited to 'external/easylogging++/easylogging++.h')
| -rw-r--r-- | external/easylogging++/easylogging++.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/external/easylogging++/easylogging++.h b/external/easylogging++/easylogging++.h index f0d8d5df7..f1fa2cb0d 100644 --- a/external/easylogging++/easylogging++.h +++ b/external/easylogging++/easylogging++.h @@ -359,6 +359,7 @@ ELPP_INTERNAL_DEBUGGING_OUT_INFO << ELPP_INTERNAL_DEBUGGING_MSG(internalInfoStre #if defined(ELPP_SYSLOG) # include <syslog.h> #endif // defined(ELPP_SYSLOG) +#include <climits> #include <ctime> #include <cstring> #include <cstdlib> @@ -406,6 +407,7 @@ 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> @@ -2451,6 +2453,7 @@ class VRegistry : base::NoCopy, public base::threading::ThreadSafe { base::threading::ScopedLock scopedLock(lock()); m_categories.clear(); m_cached_allowed_categories.clear(); + m_lowest_priority = INT_MAX; } inline void clearModules(void) { @@ -2495,6 +2498,7 @@ 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 { |