Git-Mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-10-01 11:49:47 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4985

Browse Source 
808a1f1e wallet2: cut down on the number of useless derivation threads (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2019-01-16 19:06:31 +02:00
commit 63b5c933ef
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/wallet/wallet2.cpp
View File

@ -2193,7 +2193,6 @@ void wallet2::process_parsed_blocks(uint64_t start_height, const std::vector<cry
const cryptonote::account_keys &keys = m_account.get_keys(); const cryptonote::account_keys &keys = m_account.get_keys();
auto gender = [&](wallet2::is_out_data &iod) { auto gender = [&](wallet2::is_out_data &iod) {
boost::unique_lock<hw::device> hwdev_lock(hwdev);
if (!hwdev.generate_key_derivation(iod.pkey, keys.m_view_secret_key, iod.derivation)) if (!hwdev.generate_key_derivation(iod.pkey, keys.m_view_secret_key, iod.derivation))
{ {
MWARNING("Failed to generate key derivation from tx pubkey, skipping"); MWARNING("Failed to generate key derivation from tx pubkey, skipping");
@ -2202,12 +2201,16 @@ void wallet2::process_parsed_blocks(uint64_t start_height, const std::vector<cry
} }
}; };
for (auto &slot: tx_cache_data) for (size_t i = 0; i < tx_cache_data.size(); ++i)
{ {
for (auto &iod: slot.primary) tpool.submit(&waiter, [&hwdev, &gender, &tx_cache_data, i]() {
tpool.submit(&waiter, [&gender, &iod]() { gender(iod); }, true); auto &slot = tx_cache_data[i];
for (auto &iod: slot.additional) boost::unique_lock<hw::device> hwdev_lock(hwdev);
tpool.submit(&waiter, [&gender, &iod]() { gender(iod); }, true); for (auto &iod: slot.primary)
gender(iod);
for (auto &iod: slot.additional)
gender(iod);
}, true);
} }
waiter.wait(&tpool); waiter.wait(&tpool);