diff options
| author | Pieter Wuille <pieter.wuille@gmail.com> | 2016-06-01 20:23:11 +0200 |
|---|---|---|
| committer | Pieter Wuille <pieter.wuille@gmail.com> | 2016-06-01 20:38:41 +0200 |
| commit | 2e0a99037dcc35bc63ba0d54371bc678af737c8e (patch) | |
| tree | 4cb42cd44838ac03072053f4ce8197f9d85431ef | |
| parent | 7fa8d758598407f3bf0beb0118dc122ea5340736 (diff) | |
| parent | a886dbf8e7b6b007153a53e8d8d1fd63b7fc9ee2 (diff) | |
| download | bitcoin-2e0a99037dcc35bc63ba0d54371bc678af737c8e.tar.xz | |
Merge #8123: Use std::atomic for fRequestShutdown and fReopenDebugLog
a886dbf Use std::atomic for fRequestShutdown and fReopenDebugLog (Pieter Wuille)
16cf85f Revert "Include signal.h for sig_atomic_t in WIN32" (Pieter Wuille)
| -rw-r--r-- | src/init.cpp | 2 | ||||
| -rw-r--r-- | src/util.cpp | 2 | ||||
| -rw-r--r-- | src/util.h | 5 |
3 files changed, 4 insertions, 5 deletions
diff --git a/src/init.cpp b/src/init.cpp index 98c0894122..9a22501859 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -123,7 +123,7 @@ static const char* FEE_ESTIMATES_FILENAME="fee_estimates.dat"; // shutdown thing. // -volatile sig_atomic_t fRequestShutdown = false; +std::atomic<bool> fRequestShutdown(false); void StartShutdown() { diff --git a/src/util.cpp b/src/util.cpp index 80f2193016..9a9209c621 100644 --- a/src/util.cpp +++ b/src/util.cpp @@ -113,7 +113,7 @@ string strMiscWarning; bool fLogTimestamps = DEFAULT_LOGTIMESTAMPS; bool fLogTimeMicros = DEFAULT_LOGTIMEMICROS; bool fLogIPs = DEFAULT_LOGIPS; -volatile sig_atomic_t fReopenDebugLog = false; +std::atomic<bool> fReopenDebugLog(false); CTranslationInterface translationInterface; /** Init OpenSSL library multithreading support */ diff --git a/src/util.h b/src/util.h index c6f8af4cdf..ac4b947785 100644 --- a/src/util.h +++ b/src/util.h @@ -18,6 +18,7 @@ #include "tinyformat.h" #include "utiltime.h" +#include <atomic> #include <exception> #include <map> #include <stdint.h> @@ -28,8 +29,6 @@ #include <boost/signals2/signal.hpp> #include <boost/thread/exceptions.hpp> -#include <signal.h> - static const bool DEFAULT_LOGTIMEMICROS = false; static const bool DEFAULT_LOGIPS = false; static const bool DEFAULT_LOGTIMESTAMPS = true; @@ -52,7 +51,7 @@ extern std::string strMiscWarning; extern bool fLogTimestamps; extern bool fLogTimeMicros; extern bool fLogIPs; -extern volatile sig_atomic_t fReopenDebugLog; +extern std::atomic<bool> fReopenDebugLog; extern CTranslationInterface translationInterface; extern const char * const BITCOIN_CONF_FILENAME; |