Browse Source

Use std::atomic for fRequestShutdown and fReopenDebugLog

pull/4/head
Pieter Wuille 8 years ago
committed by Simon
parent
commit
bf673640e3
  1. 2
      src/init.cpp
  2. 2
      src/util.cpp
  3. 7
      src/util.h

2
src/init.cpp

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

2
src/util.cpp

@ -110,7 +110,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 */

7
src/util.h

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

Loading…
Cancel
Save