include the CTxWitness structure in memory usage accounting #269
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
arvidn
commented
Sep 21, 2017
src/memusage.h
Outdated
| @@ -38,8 +38,9 @@ template<typename X> static inline size_t DynamicUsage(X * const &v) { return 0; | |||
| template<typename X> static inline size_t DynamicUsage(const X * const &v) { return 0; } | |||
|
|
|||
| /** Compute the memory used for dynamically allocated but owned data structures. | |||
| * For generic data types, this is *not* recursive. DynamicUsage(vector<vector<int> >) | |||
| * will compute the memory used for the vector<int>'s, but not for the ints inside. | |||
There was a problem hiding this comment.
I think this comment is misleading at best. It does account for the array of ints ("the ints").
There was a problem hiding this comment.
oh, I just realized the example had nested vectors. allright, I'll revert this
arvidn
force-pushed
the
account-memusage-of-txwitness
branch
from
7125df9
to
affbfad
Compare
arvidn
commented
Sep 21, 2017
src/core_memusage.h
Outdated
| @@ -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) { | |||
There was a problem hiding this comment.
all these static are redundant, I copied them for symmetry, though they should probably be removed.
arvidn
force-pushed
the
account-memusage-of-txwitness
branch
from
affbfad
to
88d0488
Compare
arvidn
force-pushed
the
account-memusage-of-txwitness
branch
from
88d0488
to
fb37954
Compare
|
tACK fb37954
became
Follow-on PR could be to account for non-witness issuance data. |
instagibbs
added a commit
that referenced
this pull request
Sep 22, 2017
fb37954 include the CTxWitness structure in memory usage accounting. (Arvid Norberg)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Also fixed comment in memusage.h