mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-01-10 20:03:34 -03:00
scripted-diff: rename vTxHashes to txns_randomized
-BEGIN VERIFY SCRIPT- git grep -l "vTxHashesIdx" src | xargs sed -i "s/vTxHashesIdx/idx_randomized/g" git grep -l "vTxHashes" src | xargs sed -i "s/vTxHashes/txns_randomized/g" -END VERIFY SCRIPT-
This commit is contained in:
parent
a03aef9cec
commit
55b0939cab
5 changed files with 16 additions and 16 deletions
|
@ -107,7 +107,7 @@ ReadStatus PartiallyDownloadedBlock::InitData(const CBlockHeaderAndShortTxIDs& c
|
|||
std::vector<bool> have_txn(txn_available.size());
|
||||
{
|
||||
LOCK(pool->cs);
|
||||
for (const auto& tx : pool->vTxHashes) {
|
||||
for (const auto& tx : pool->txns_randomized) {
|
||||
uint64_t shortid = cmpctblock.GetShortID(tx->GetWitnessHash());
|
||||
std::unordered_map<uint64_t, uint16_t>::iterator idit = shorttxids.find(shortid);
|
||||
if (idit != shorttxids.end()) {
|
||||
|
|
|
@ -172,7 +172,7 @@ public:
|
|||
Parents& GetMemPoolParents() const { return m_parents; }
|
||||
Children& GetMemPoolChildren() const { return m_children; }
|
||||
|
||||
mutable size_t vTxHashesIdx; //!< Index in mempool's vTxHashes
|
||||
mutable size_t idx_randomized; //!< Index in mempool's txns_randomized
|
||||
mutable Epoch::Marker m_epoch_marker; //!< epoch when last touched, useful for graph algorithms
|
||||
};
|
||||
|
||||
|
|
|
@ -51,7 +51,7 @@ static CBlock BuildBlockTestCase() {
|
|||
}
|
||||
|
||||
// Number of shared use_counts we expect for a tx we haven't touched
|
||||
// (block + mempool entry + mempool vTxHashes + our copy from the GetSharedTx call)
|
||||
// (block + mempool entry + mempool txns_randomized + our copy from the GetSharedTx call)
|
||||
constexpr long SHARED_TX_OFFSET{4};
|
||||
|
||||
BOOST_AUTO_TEST_CASE(SimpleRoundTripTest)
|
||||
|
|
|
@ -480,8 +480,8 @@ void CTxMemPool::addUnchecked(const CTxMemPoolEntry &entry, setEntries &setAnces
|
|||
minerPolicyEstimator->processTransaction(entry, validFeeEstimate);
|
||||
}
|
||||
|
||||
vTxHashes.emplace_back(newit->GetSharedTx());
|
||||
newit->vTxHashesIdx = vTxHashes.size() - 1;
|
||||
txns_randomized.emplace_back(newit->GetSharedTx());
|
||||
newit->idx_randomized = txns_randomized.size() - 1;
|
||||
|
||||
TRACE3(mempool, added,
|
||||
entry.GetTx().GetHash().data(),
|
||||
|
@ -517,16 +517,16 @@ void CTxMemPool::removeUnchecked(txiter it, MemPoolRemovalReason reason)
|
|||
|
||||
RemoveUnbroadcastTx(hash, true /* add logging because unchecked */ );
|
||||
|
||||
if (vTxHashes.size() > 1) {
|
||||
// Update vTxHashesIdx of the to-be-moved entry.
|
||||
Assert(GetEntry(vTxHashes.back()->GetHash()))->vTxHashesIdx = it->vTxHashesIdx;
|
||||
// Remove entry from vTxHashes by replacing it with the back and deleting the back.
|
||||
vTxHashes[it->vTxHashesIdx] = std::move(vTxHashes.back());
|
||||
vTxHashes.pop_back();
|
||||
if (vTxHashes.size() * 2 < vTxHashes.capacity())
|
||||
vTxHashes.shrink_to_fit();
|
||||
if (txns_randomized.size() > 1) {
|
||||
// Update idx_randomized of the to-be-moved entry.
|
||||
Assert(GetEntry(txns_randomized.back()->GetHash()))->idx_randomized = it->idx_randomized;
|
||||
// Remove entry from txns_randomized by replacing it with the back and deleting the back.
|
||||
txns_randomized[it->idx_randomized] = std::move(txns_randomized.back());
|
||||
txns_randomized.pop_back();
|
||||
if (txns_randomized.size() * 2 < txns_randomized.capacity())
|
||||
txns_randomized.shrink_to_fit();
|
||||
} else
|
||||
vTxHashes.clear();
|
||||
txns_randomized.clear();
|
||||
|
||||
totalTxSize -= it->GetTxSize();
|
||||
m_total_fee -= it->GetFee();
|
||||
|
@ -1054,7 +1054,7 @@ void CCoinsViewMemPool::Reset()
|
|||
size_t CTxMemPool::DynamicMemoryUsage() const {
|
||||
LOCK(cs);
|
||||
// Estimate the overhead of mapTx to be 15 pointers + an allocation, as no exact formula for boost::multi_index_contained is implemented.
|
||||
return memusage::MallocUsage(sizeof(CTxMemPoolEntry) + 15 * sizeof(void*)) * mapTx.size() + memusage::DynamicUsage(mapNextTx) + memusage::DynamicUsage(mapDeltas) + memusage::DynamicUsage(vTxHashes) + cachedInnerUsage;
|
||||
return memusage::MallocUsage(sizeof(CTxMemPoolEntry) + 15 * sizeof(void*)) * mapTx.size() + memusage::DynamicUsage(mapNextTx) + memusage::DynamicUsage(mapDeltas) + memusage::DynamicUsage(txns_randomized) + cachedInnerUsage;
|
||||
}
|
||||
|
||||
void CTxMemPool::RemoveUnbroadcastTx(const uint256& txid, const bool unchecked) {
|
||||
|
|
|
@ -392,7 +392,7 @@ public:
|
|||
indexed_transaction_set mapTx GUARDED_BY(cs);
|
||||
|
||||
using txiter = indexed_transaction_set::nth_index<0>::type::const_iterator;
|
||||
std::vector<CTransactionRef> vTxHashes GUARDED_BY(cs); //!< All transactions in mapTx, in random order
|
||||
std::vector<CTransactionRef> txns_randomized GUARDED_BY(cs); //!< All transactions in mapTx, in random order
|
||||
|
||||
typedef std::set<txiter, CompareIteratorByHash> setEntries;
|
||||
|
||||
|
|
Loading…
Reference in a new issue