Encapsulate BDB environment inside new CDBEnv class #1293
Merged
Conversation
This file contains hidden or 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
|
Rebased on top of #1295 (check return values of TxnBegin, TxnCommit) |
| @@ -13,7 +13,6 @@ | |||
|
|
|||
| static uint64 nAccountingEntryNumber = 0; | |||
|
|
|||
| extern CCriticalSection cs_db; | |||
| extern map<string, int> mapFileUseCount; | |||
There was a problem hiding this comment.
Does mapFileUseCount need to remain global?
There was a problem hiding this comment.
No, that and mapFiles[] could be moved into CDBEnv as well.
|
Moved mapDb and mapFileUseCount into class CDBEnv. mapFileUseCount had to remain public for the moment, until some wrappers may be written that eliminates the need for walletdb and CDB::Rewrite() to directly access these internals. It doesn't help that we use this reference counting scheme sometimes, and other times we wish to immediately close regardless of reference count. |
|
This seems stable in testing, though the encapsulation isn't the best. Some of the mapFileUseCount[] stuff is rather delicate, and relies on implicit behavior. Best left to complete the encapsulation of that to a separate commit, IMO. Once done, that will fit naturally inside CDBEnv::OpenDb(), which would be split out from CDB::CDB(). |
added 6 commits
May 19, 2012 20:40
If Reorganize() fails, then its caller, CBlock::SetBestChain(), will call TxnAbort(). Redundant TxnAbort() calls are harmless. The second will return an error return value, with no other side effects. TxnAbort() return values are generally never checked. The impact is nil.
Cleans up and organizes several scattered functions and variables related to the BDB env. Class CDBInit() existed to provide a guaranteed-via-C++-destructor cleanup of the db environment. A formal CDBEnv class provides all of this inside a single wrapper.
|
ACK |
lateminer
pushed a commit
to lateminer/bitcoin
that referenced
this pull request
Jan 22, 2019
lateminer
pushed a commit
to lateminer/bitcoin
that referenced
this pull request
May 6, 2020
… proofs 29c02c7 [Cleanup] Remove ZerocoinParams from legacy CoinSpend classes (random-zebra) a038651 [zPIV][Cleanup] Remove old CoinSpend proofs files (random-zebra) 26f407a [Cleanup][zPIV] Remove Acc Witness (random-zebra) 0052be4 [Cleanup][zPIV] Start removing old/unused zerocoin spend validation code (random-zebra) Pull request description: Based on top of bitcoin#1291 . Old (v2) `CoinSpend` proofs are no longer checked. We can thus remove most of `AccumulatorProofOfKnowledge`, `SerialNumberSignatureOfKnowledge` and `CommitmentProofOfKnowledge`. We save only the structure and serialize methods (inside `CoinSpend.h`) to be able to parse them from the chain. ACKs for top commit: furszy: ACK 29c02c7 Fuzzbawls: ACK 29c02c7 Tree-SHA512: f4198443bf760fb398badff5bb31579bb0feb97677bbd55b23a136c07e35d3150588883ef7645f9f6122a0bbf394180d78012916e9bff41597756666945106ab
lateminer
pushed a commit
to lateminer/bitcoin
that referenced
this pull request
May 6, 2020
…t cleaning 79dccae [Trivial][RPC] Fix spendzerocoin num of arguments (random-zebra) c9aefbf [Doc] Update rel notes: remove zPIV backup - mintchange/minimizechange (random-zebra) 35dae21 [Cleanup][Trivial] Remove unused variable nStakeSetUpdateTime in wallet (random-zebra) f95af41 [Wallet][Cleanup] Refactor zPIV legacy functions at the end of wallet.* (random-zebra) 565b963 [Wallet][RPC] Remove fMintChange / fMinimizeChange from zc spends/mints (random-zebra) 76b7386 [Wallet][zPIV] Remove auto-backups. Lock minting only for tests. (random-zebra) Pull request description: Builds on top of bitcoin#1293 . This removes zerocoin backups and locks minting only for tests. Mints and v2 spends are rejected from mempool. Removes `fMintChange/fMinimizeChange` options from RPC functions. Cleans up unused variables and functions. Zerocoin specific implementations have been moved from wallet.cpp to a new file wallet_zerocoin.cpp in the wallet directory. ACKs for top commit: furszy: cool refactor, utACK 79dccae. Fuzzbawls: ACK 79dccae Tree-SHA512: bb69e9e79e2a5664d351fdce1a35a16642576290ead7198e74b04213b478a5e1e9a96ff9aa800ca714c5c6f2045e780a533921681d2ab79af6761a8acebec7c8
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Cleans up and organizes several scattered functions and variables related to
the BDB env. Class CDBInit() existed to provide a
guaranteed-via-C++-destructor cleanup of the db environment.
A formal CDBEnv class provides all of this inside a single wrapper.
NOTES: