diff options
author | Riccardo Spagni <ric@spagni.net> | 2016-04-29 10:43:48 +0200 |
---|---|---|
committer | Riccardo Spagni <ric@spagni.net> | 2016-04-29 10:43:48 +0200 |
commit | 5b734c2a3acfc8580cdc2e19942a3d4a043cc830 (patch) | |
tree | ab37a04721f4d5c1041b77a480f8b59d5b7d9387 /src/wallet | |
parent | Merge pull request #824 (diff) | |
parent | add a --max-concurrency flag (diff) | |
download | monero-5b734c2a3acfc8580cdc2e19942a3d4a043cc830.tar.xz |
Merge pull request #825
513a658 add a --max-concurrency flag (moneromooo-monero)
Diffstat (limited to 'src/wallet')
-rw-r--r-- | src/wallet/wallet2.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp index 53ce23490..dd83891df 100644 --- a/src/wallet/wallet2.cpp +++ b/src/wallet/wallet2.cpp @@ -213,7 +213,7 @@ void wallet2::process_new_transaction(const cryptonote::transaction& tx, uint64_ tx_pub_key = pub_key_field.pub_key; bool r = true; - int threads = boost::thread::hardware_concurrency(); + int threads = tools::get_max_concurrency(); if (miner_tx && m_refresh_type == RefreshNoCoinbase) { // assume coinbase isn't for us @@ -603,7 +603,7 @@ void wallet2::process_blocks(uint64_t start_height, const std::list<cryptonote:: size_t current_index = start_height; blocks_added = 0; - int threads = boost::thread::hardware_concurrency(); + int threads = tools::get_max_concurrency(); if (threads > 1) { std::vector<crypto::hash> round_block_hashes(threads); |