neobytes-project/neobytes
neobytes-project/neobytes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge #8004: signal handling: fReopenDebugLog and fRequestShutdown should be type sig_atomic_t

Browse Source 
3262316 fReopenDebugLog and fRequestShutdown should be type sig_atomic_t (Chirag Davé)
This commit is contained in:
Wladimir J. van der Laan 2016-05-12 11:45:49 +02:00 committed by Alexander Block
parent f0fe21d372
commit 26f07f835c
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/init.cpp
View File

@ -158,7 +158,7 @@ static const char* FEE_ESTIMATES_FILENAME="fee_estimates.dat";
// shutdown thing. // shutdown thing.
// //
volatile bool fRequestShutdown = false; volatile sig_atomic_t fRequestShutdown = false;
void StartShutdown() void StartShutdown()
{ {

2
src/util.cpp
View File

@ -131,7 +131,7 @@ bool fLogTimestamps = DEFAULT_LOGTIMESTAMPS;
bool fLogTimeMicros = DEFAULT_LOGTIMEMICROS; bool fLogTimeMicros = DEFAULT_LOGTIMEMICROS;
bool fLogThreadNames = DEFAULT_LOGTHREADNAMES; bool fLogThreadNames = DEFAULT_LOGTHREADNAMES;
bool fLogIPs = DEFAULT_LOGIPS; bool fLogIPs = DEFAULT_LOGIPS;
volatile bool fReopenDebugLog = false; volatile sig_atomic_t fReopenDebugLog = false;
CTranslationInterface translationInterface; CTranslationInterface translationInterface;
/** Init OpenSSL library multithreading support */ /** Init OpenSSL library multithreading support */

6
src/util.h
View File

@ -30,6 +30,10 @@
#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
// Debugging macros // Debugging macros
// Uncomment the following line to enable debugging messages // Uncomment the following line to enable debugging messages
@ -71,7 +75,7 @@ extern bool fLogTimestamps;
extern bool fLogTimeMicros; extern bool fLogTimeMicros;
extern bool fLogThreadNames; extern bool fLogThreadNames;
extern bool fLogIPs; extern bool fLogIPs;
extern volatile bool fReopenDebugLog; extern volatile sig_atomic_t fReopenDebugLog;
extern CTranslationInterface translationInterface; extern CTranslationInterface translationInterface;
extern const char * const BITCOIN_CONF_FILENAME; extern const char * const BITCOIN_CONF_FILENAME;