DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Use std::atomic for fRequestShutdown and fReopenDebugLog

Browse Source
This commit is contained in:
Pieter Wuille
2016-05-30 15:39:37 +02:00
committed by Simon
parent 3f97a535ee
commit bf673640e3
3 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/init.cpp
View File

@@ -111,7 +111,7 @@ CClientUIInterface uiInterface; // Declared but not defined in ui_interface.h
// shutdown thing. // shutdown thing.
// //
volatile sig_atomic_t fRequestShutdown = false; std::atomic<bool> fRequestShutdown(false);
void StartShutdown() void StartShutdown()
{ {

2
src/util.cpp
View File

@@ -110,7 +110,7 @@ string strMiscWarning;
bool fLogTimestamps = DEFAULT_LOGTIMESTAMPS; bool fLogTimestamps = DEFAULT_LOGTIMESTAMPS;
bool fLogTimeMicros = DEFAULT_LOGTIMEMICROS; bool fLogTimeMicros = DEFAULT_LOGTIMEMICROS;
bool fLogIPs = DEFAULT_LOGIPS; bool fLogIPs = DEFAULT_LOGIPS;
volatile sig_atomic_t fReopenDebugLog = false; std::atomic<bool> fReopenDebugLog(false);
CTranslationInterface translationInterface; CTranslationInterface translationInterface;
/** Init OpenSSL library multithreading support */ /** Init OpenSSL library multithreading support */

7
src/util.h
View File

@@ -18,6 +18,7 @@
#include "tinyformat.h" #include "tinyformat.h"
#include "utiltime.h" #include "utiltime.h"
#include <atomic>
#include <exception> #include <exception>
#include <map> #include <map>
#include <stdint.h> #include <stdint.h>
@@ -28,10 +29,6 @@
#include <boost/signals2/signal.hpp> #include <boost/signals2/signal.hpp>
#include <boost/thread/exceptions.hpp> #include <boost/thread/exceptions.hpp>
#ifndef WIN32
#include <signal.h>
#endif
static const bool DEFAULT_LOGTIMEMICROS = false; static const bool DEFAULT_LOGTIMEMICROS = false;
static const bool DEFAULT_LOGIPS = false; static const bool DEFAULT_LOGIPS = false;
static const bool DEFAULT_LOGTIMESTAMPS = true; static const bool DEFAULT_LOGTIMESTAMPS = true;
@@ -53,7 +50,7 @@ extern bool fServer;
extern std::string strMiscWarning; extern std::string strMiscWarning;
extern bool fLogTimestamps; extern bool fLogTimestamps;
extern bool fLogIPs; extern bool fLogIPs;
extern volatile sig_atomic_t fReopenDebugLog; extern std::atomic<bool> fReopenDebugLog;
extern CTranslationInterface translationInterface; extern CTranslationInterface translationInterface;
/** /**