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 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.

return memusage::DynamicUsage(locator.vHave);
}

#endif // BITCOIN_PRIMITIVES_TRANSACTION_H
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: Wrong end comment :).

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, fixed!

@laanwj
Copy link
Member

laanwj commented Jul 20, 2015

utACK, looks like the good solution to me

@laanwj laanwj merged commit 9e38d0f into bitcoin:master Jul 20, 2015
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.
@bitcoin bitcoin locked as resolved and limited conversation to collaborators Sep 8, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Compile error on OSX
3 participants