aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authormoneromooo-monero <moneromooo-monero@users.noreply.github.com>2015-08-09 18:14:30 +0100
committermoneromooo-monero <moneromooo-monero@users.noreply.github.com>2015-08-09 18:14:30 +0100
commit4f19e6847609bf90d3a41fe98166f81a69fbae2f (patch)
tree0ce7ac11855a6433e4c82baa61275594e65aab3c /src
parentblockchain: always select random outs using triangular distribution (diff)
downloadmonero-4f19e6847609bf90d3a41fe98166f81a69fbae2f.tar.xz
blockchain: factor get_num_outpouts(amount) calls
It has to stay constant as we get the blockchain lock for the entire function. Avoids some unnecessary DB accesses.
Diffstat (limited to 'src')
-rw-r--r--src/cryptonote_core/blockchain.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/cryptonote_core/blockchain.cpp b/src/cryptonote_core/blockchain.cpp
index 8a81268ab..648b77b2f 100644
--- a/src/cryptonote_core/blockchain.cpp
+++ b/src/cryptonote_core/blockchain.cpp
@@ -1473,6 +1473,7 @@ bool Blockchain::get_random_outs_for_amounts(const COMMAND_RPC_GET_RANDOM_OUTPUT
// from BlockchainDB where <n> is req.outs_count (number of mixins).
for (uint64_t amount : req.amounts)
{
+ auto num_outs = m_db->get_num_outputs(amount);
// create outs_for_amount struct and populate amount field
COMMAND_RPC_GET_RANDOM_OUTPUTS_FOR_AMOUNTS::outs_for_amount& result_outs = *res.outs.insert(res.outs.end(), COMMAND_RPC_GET_RANDOM_OUTPUTS_FOR_AMOUNTS::outs_for_amount());
result_outs.amount = amount;
@@ -1481,9 +1482,9 @@ bool Blockchain::get_random_outs_for_amounts(const COMMAND_RPC_GET_RANDOM_OUTPUT
// if there aren't enough outputs to mix with (or just enough),
// use all of them. Eventually this should become impossible.
- if (m_db->get_num_outputs(amount) <= req.outs_count)
+ if (num_outs <= req.outs_count)
{
- for (uint64_t i = 0; i < m_db->get_num_outputs(amount); i++)
+ for (uint64_t i = 0; i < num_outs; i++)
{
// get tx_hash, tx_out_index from DB
tx_out_index toi = m_db->get_output_tx_and_index(amount, i);
@@ -1499,7 +1500,6 @@ bool Blockchain::get_random_outs_for_amounts(const COMMAND_RPC_GET_RANDOM_OUTPUT
else
{
// while we still need more mixins
- auto num_outs = m_db->get_num_outputs(amount);
while (result_outs.outs.size() < req.outs_count)
{
// if we've gone through every possible output, we've gotten all we can