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.

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

Separate core memory usage computation in core_memusage.h #6453

Merged
merged 1 commit into from Jul 20, 2015

Conversation

@sipa
Copy link
Member

sipa commented Jul 17, 2015

Remove support for computing recursive memory usage from memusage.h, making it more easy to plug in other functions.

Furthermore, move the computation of memory usage of core data structures from primitives/*, to reduce its dependencies, specifically on boost.

Should fix #6441.

@Diapolo
Diapolo reviewed Jul 18, 2015
View changes
src/core_memusage.h Outdated
return memusage::DynamicUsage(locator.vHave);
}

#endif // BITCOIN_PRIMITIVES_TRANSACTION_H

This comment has been minimized.

Copy link
@Diapolo

Diapolo Jul 18, 2015

Nit: Wrong end comment :).

This comment has been minimized.

Copy link
@sipa

sipa Jul 20, 2015

Author Member

Thanks, fixed!

@laanwj
Copy link
Member

laanwj commented Jul 20, 2015

utACK, looks like the good solution to me

@sipa sipa force-pushed the sipa:coremem branch to 9e38d0f Jul 20, 2015
@laanwj laanwj merged commit 9e38d0f into bitcoin:master Jul 20, 2015
1 check passed
1 check passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
laanwj added a commit that referenced this pull request Jul 20, 2015
9e38d0f Separate core memory usage computation in core_memusage.h (Pieter Wuille)
zkbot added a commit to zcash/zcash that referenced this pull request Mar 23, 2017
Bitcoin 0.12 mempool memory usage PRs

Cherry-picked from the following upstream PRs:

- bitcoin/bitcoin#6410
- bitcoin/bitcoin#6453
- bitcoin/bitcoin#6013 (excludes changes to docs we deleted)

Part of #2074.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

3 participants
You can’t perform that action at this time.