Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

include the CTxWitness structure in memory usage accounting #269

Merged
merged 1 commit into from
Sep 22, 2017
Merged

include the CTxWitness structure in memory usage accounting #269

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 31 additions & 9 deletions src/core_memusage.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,27 +26,49 @@ static inline size_t RecursiveDynamicUsage(const CTxOut& out) {
return RecursiveDynamicUsage(out.scriptPubKey);
}

//TODO Account for CTxWitness.
static inline size_t RecursiveDynamicUsage(const ::CTxInWitness& wit) {
return memusage::DynamicUsage(wit.vchIssuanceAmountRangeproof)
+ memusage::DynamicUsage(wit.vchInflationKeysRangeproof);
}

static inline size_t RecursiveDynamicUsage(const ::CTxOutWitness& wit) {
return memusage::DynamicUsage(wit.vchSurjectionproof)
+ memusage::DynamicUsage(wit.vchRangeproof);
}

static inline size_t RecursiveDynamicUsage(const ::CTxWitness& wit) {
size_t mem = memusage::DynamicUsage(wit.vtxinwit)
+ memusage::DynamicUsage(wit.vtxoutwit);
for (const CTxInWitness& w : wit.vtxinwit) {
mem += RecursiveDynamicUsage(w);
}
for (const CTxOutWitness& w : wit.vtxoutwit) {
mem += RecursiveDynamicUsage(w);
}
return mem;
}

static inline size_t RecursiveDynamicUsage(const CTransaction& tx) {
size_t mem = memusage::DynamicUsage(tx.vin) + memusage::DynamicUsage(tx.vout);
for (std::vector<CTxIn>::const_iterator it = tx.vin.begin(); it != tx.vin.end(); it++) {
mem += RecursiveDynamicUsage(*it);
for (const CTxIn& txi : tx.vin) {
mem += RecursiveDynamicUsage(txi);
}
for (std::vector<CTxOut>::const_iterator it = tx.vout.begin(); it != tx.vout.end(); it++) {
mem += RecursiveDynamicUsage(*it);
for (const CTxOut& txo : tx.vout) {
mem += RecursiveDynamicUsage(txo);
}
mem += RecursiveDynamicUsage(tx.wit);
return mem;
}

static inline size_t RecursiveDynamicUsage(const CMutableTransaction& tx) {
size_t mem = memusage::DynamicUsage(tx.vin) + memusage::DynamicUsage(tx.vout);
for (std::vector<CTxIn>::const_iterator it = tx.vin.begin(); it != tx.vin.end(); it++) {
mem += RecursiveDynamicUsage(*it);
for (const CTxIn& txi : tx.vin) {
mem += RecursiveDynamicUsage(txi);
}
for (std::vector<CTxOut>::const_iterator it = tx.vout.begin(); it != tx.vout.end(); it++) {
mem += RecursiveDynamicUsage(*it);
for (const CTxOut& txo : tx.vout) {
mem += RecursiveDynamicUsage(txo);
}
mem += RecursiveDynamicUsage(tx.wit);
return mem;
}

Expand Down