diff options
| author | Ben Woosley <ben.woosley@gmail.com> | 2018-05-16 19:17:40 +0000 |
|---|---|---|
| committer | Ben Woosley <ben.woosley@gmail.com> | 2018-06-25 00:08:49 -0400 |
| commit | 1fabd59e7e870fae73bfbcfb227dd7452de94726 (patch) | |
| tree | c6b4ec2a9f4e6e2897633cccdd82d13cc10acbe2 /src/qt | |
| parent | e62fdfeeab13ff65bcedac30f08a3216f3b29255 (diff) | |
Break circular dependency: init -> * -> init by extracting shutdown.h
Most includers just wanted to react to pending shutdown.
This isolates access to `fRequestShutdown` and limits access to the shutdown
api functions, including the new `AbortShutdown` for setting it to `false`.
Note I originally called `AbortShutdown` `CancelShutdown` but that name was
already taken by winuser.h
https://travis-ci.org/bitcoin/bitcoin/jobs/386913329
This change also triggered a build error in bench. Fixing it required moving LIBBITCOIN_SERVER after LIBBITCOIN_WALLET in bench_bench_bitcoin_LDADD To make
server definitions in src/net.cpp available to wallet methods in
src/wallet/wallet.cpp. Specifically, solving:
libbitcoin_wallet.a(libbitcoin_wallet_a-wallet.o): In function `CWalletTx::RelayWalletTransaction(CConnman*)':
wallet.cpp:(.text+0x3f0e): undefined reference to `CConnman::NodeFullyConnected(CNode const*)'
collect2: error: ld returned 1 exit status
https://travis-ci.org/bitcoin/bitcoin/jobs/392133581
Need for remaining init.h includes confirmed via a thorough search with a more
specific regex:
\bInterrupt\(\)|\bShutdown\(\)|\bInitLogging\(\)|\bInitParameterInteraction\(\)|\bAppInitBasicSetup\(\)|\bAppInitParameterInteraction\(\)|\bAppInitSanityChecks\(\)|\bAppInitLockDataDirectory\(\)|\bAppInitMain\(\)|\bSetupServerArgs\(\)|\bLicenseInfo\(\)|g_wallet_init_interface|init.h
Diffstat (limited to 'src/qt')
| -rw-r--r-- | src/qt/bitcoingui.h | 2 | ||||
| -rw-r--r-- | src/qt/winshutdownmonitor.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/qt/bitcoingui.h b/src/qt/bitcoingui.h index 68c35557cc..3b3b534884 100644 --- a/src/qt/bitcoingui.h +++ b/src/qt/bitcoingui.h @@ -257,7 +257,7 @@ private Q_SLOTS: /** Simply calls showNormalIfMinimized(true) for use in SLOT() macro */ void toggleHidden(); - /** called by a timer to check if fRequestShutdown has been set **/ + /** called by a timer to check if ShutdownRequested() has been set **/ void detectShutdown(); /** Show progress dialog e.g. for verifychain */ diff --git a/src/qt/winshutdownmonitor.cpp b/src/qt/winshutdownmonitor.cpp index 6190a74598..122d6f0b12 100644 --- a/src/qt/winshutdownmonitor.cpp +++ b/src/qt/winshutdownmonitor.cpp @@ -5,7 +5,7 @@ #include <qt/winshutdownmonitor.h> #if defined(Q_OS_WIN) -#include <init.h> +#include <shutdown.h> #include <util.h> #include <windows.h> |