foster/bitcoin-bitcoin-core
0
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-02-09 10:43:19 -05:00
Code Issues Activity

refactor: Drop boost::this_thread::interruption_point and boost::thread_interrupted in main thread

Browse source
This commit is contained in:
Chun Kuan Lee 2018-10-14 04:24:38 +08:00
parent be992701b0
commit b7df96f456
3 changed files with 0 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/bitcoin-cli.cpp
View file

@ -492,9 +492,6 @@ static int CommandLineRPC(int argc, char *argv[])
} }
} while (fWait); } while (fWait);
} }
catch (const boost::thread_interrupted&) {
throw;
}
catch (const std::exception& e) { catch (const std::exception& e) {
strPrint = std::string("error: ") + e.what(); strPrint = std::string("error: ") + e.what();
nRet = EXIT_FAILURE; nRet = EXIT_FAILURE;

4
src/bitcoin-tx.cpp
View file

@ -820,10 +820,6 @@ static int CommandLineRawTx(int argc, char* argv[])
OutputTx(tx); OutputTx(tx);
} }
catch (const boost::thread_interrupted&) {
throw;
}
catch (const std::exception& e) { catch (const std::exception& e) {
strPrint = std::string("error: ") + e.what(); strPrint = std::string("error: ") + e.what();
nRet = EXIT_FAILURE; nRet = EXIT_FAILURE;

2
src/validation.cpp
View file

@ -3819,8 +3819,6 @@ bool CChainState::LoadBlockIndex(const Consensus::Params& consensus_params, CBlo
if (!blocktree.LoadBlockIndexGuts(consensus_params, [this](const uint256& hash) EXCLUSIVE_LOCKS_REQUIRED(cs_main) { return this->InsertBlockIndex(hash); })) if (!blocktree.LoadBlockIndexGuts(consensus_params, [this](const uint256& hash) EXCLUSIVE_LOCKS_REQUIRED(cs_main) { return this->InsertBlockIndex(hash); }))
return false; return false;
boost::this_thread::interruption_point();
// Calculate nChainWork // Calculate nChainWork
std::vector<std::pair<int, CBlockIndex*> > vSortedByHeight; std::vector<std::pair<int, CBlockIndex*> > vSortedByHeight;
vSortedByHeight.reserve(mapBlockIndex.size()); vSortedByHeight.reserve(mapBlockIndex.size());