Separate core memory usage computation in core_memusage.h #6453

Merged
merged 1 commit into from Jul 20, 2015

Conversation

Projects
None yet
3 participants
@sipa
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

View changes

src/core_memusage.h
+ return memusage::DynamicUsage(locator.vHave);
+}
+
+#endif // BITCOIN_PRIMITIVES_TRANSACTION_H

This comment has been minimized.

@Diapolo

Diapolo Jul 18, 2015

Nit: Wrong end comment :).

@Diapolo

Diapolo Jul 18, 2015

Nit: Wrong end comment :).

This comment has been minimized.

@sipa

sipa Jul 20, 2015

Member

Thanks, fixed!

@sipa

sipa Jul 20, 2015

Member

Thanks, fixed!

@laanwj

This comment has been minimized.

Show comment
Hide comment
@laanwj

laanwj Jul 20, 2015

Member

utACK, looks like the good solution to me

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

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

Merge pull request #6453
9e38d0f Separate core memory usage computation in core_memusage.h (Pieter Wuille)

@str4d str4d referenced this pull request in zcash/zcash Mar 14, 2017

Merged

Bitcoin 0.12 mempool memory usage PRs #2175

zkbot added a commit to zcash/zcash that referenced this pull request Mar 23, 2017

Auto merge of #2175 - str4d:2074-txn-mempool, r=bitcartel
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