sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-26 12:32:48 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

merge bitcoin#13013: Move constructors out of mempool_eviction hot loop

Browse Source
This commit is contained in:
Kittywhiskers Van Gogh 2018-04-17 19:15:46 -04:00
parent 28a5e599bf
commit cf59264631
1 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/bench/mempool_eviction.cpp
View File

@ -9,7 +9,7 @@
#include <list> #include <list>
#include <vector> #include <vector>
static void AddTx(const CMutableTransaction& tx, const CAmount& nFee, CTxMemPool& pool) EXCLUSIVE_LOCKS_REQUIRED(cs_main, pool.cs) static void AddTx(const CTransactionRef& tx, const CAmount& nFee, CTxMemPool& pool) EXCLUSIVE_LOCKS_REQUIRED(cs_main, pool.cs)
{ {
int64_t nTime = 0; int64_t nTime = 0;
unsigned int nHeight = 1; unsigned int nHeight = 1;
@ -17,7 +17,7 @@ static void AddTx(const CMutableTransaction& tx, const CAmount& nFee, CTxMemPool
unsigned int sigOpCost = 4; unsigned int sigOpCost = 4;
LockPoints lp; LockPoints lp;
pool.addUnchecked(CTxMemPoolEntry( pool.addUnchecked(CTxMemPoolEntry(
MakeTransactionRef(tx), nFee, nTime, nHeight, tx, nFee, nTime, nHeight,
spendsCoinbase, sigOpCost, lp)); spendsCoinbase, sigOpCost, lp));
} }
@ -97,16 +97,25 @@ static void MempoolEviction(benchmark::Bench& bench)
tx7.vout[1].nValue = 10 * COIN; tx7.vout[1].nValue = 10 * COIN;
CTxMemPool pool; CTxMemPool pool;
// Create transaction references outside the "hot loop"
const CTransactionRef tx1_r{MakeTransactionRef(tx1)};
const CTransactionRef tx2_r{MakeTransactionRef(tx2)};
const CTransactionRef tx3_r{MakeTransactionRef(tx3)};
const CTransactionRef tx4_r{MakeTransactionRef(tx4)};
const CTransactionRef tx5_r{MakeTransactionRef(tx5)};
const CTransactionRef tx6_r{MakeTransactionRef(tx6)};
const CTransactionRef tx7_r{MakeTransactionRef(tx7)};
LOCK2(cs_main, pool.cs); LOCK2(cs_main, pool.cs);
bench.run([&]() NO_THREAD_SAFETY_ANALYSIS { bench.run([&]() NO_THREAD_SAFETY_ANALYSIS {
AddTx(tx1, 10000LL, pool); AddTx(tx1_r, 10000LL, pool);
AddTx(tx2, 5000LL, pool); AddTx(tx2_r, 5000LL, pool);
AddTx(tx3, 20000LL, pool); AddTx(tx3_r, 20000LL, pool);
AddTx(tx4, 7000LL, pool); AddTx(tx4_r, 7000LL, pool);
AddTx(tx5, 1000LL, pool); AddTx(tx5_r, 1000LL, pool);
AddTx(tx6, 1100LL, pool); AddTx(tx6_r, 1100LL, pool);
AddTx(tx7, 9000LL, pool); AddTx(tx7_r, 9000LL, pool);
pool.TrimToSize(pool.DynamicMemoryUsage() * 3 / 4); pool.TrimToSize(pool.DynamicMemoryUsage() * 3 / 4);
pool.TrimToSize(::GetSerializeSize(tx1, SER_NETWORK, PROTOCOL_VERSION)); pool.TrimToSize(::GetSerializeSize(tx1, SER_NETWORK, PROTOCOL_VERSION));
}); });