diff options
| author | Pieter Wuille <pieter.wuille@gmail.com> | 2013-05-12 15:50:22 +0200 |
|---|---|---|
| committer | Pieter Wuille <pieter.wuille@gmail.com> | 2013-05-12 19:52:16 +0200 |
| commit | 0fe8010a10bafd67f9131b2da034fb9cd7fc5024 (patch) | |
| tree | d0b8dd4281e2c088559356642c48c903403f9909 /contrib | |
| parent | 5b5d399593adbdf8b9b4fb49ef39d51d4eac03cd (diff) | |
Make FindBlockByHeight constant-time.
Remove the pnext pointer in CBlockIndex, and replace it with a
vBlockIndexByHeight vector (no effect on memory usage). pnext can
now be replaced by vBlockIndexByHeight[nHeight+1], but
FindBlockByHeight becomes constant-time.
This also means the entire mapBlockIndex structure and the block
index entries in it become purely blocktree-related data, and
independent from the currently active chain, potentially allowing
them to be protected by separate mutexes in the future.
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/test-patches/bitcoind-comparison.patch | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/test-patches/bitcoind-comparison.patch b/contrib/test-patches/bitcoind-comparison.patch index 7464349b3c..f82b102e2a 100644 --- a/contrib/test-patches/bitcoind-comparison.patch +++ b/contrib/test-patches/bitcoind-comparison.patch @@ -3,9 +3,9 @@ index 04a8618..519429a 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -31,8 +31,8 @@ CTxMemPool mempool; - unsigned int nTransactionsUpdated = 0; map<uint256, CBlockIndex*> mapBlockIndex; + std::vector<CBlockIndex*> vBlockIndexByHeight; -uint256 hashGenesisBlock("0x000000000019d6689c085ae165831e934ff763ae46a2a6c172b3f1b60a8ce26f"); -static CBigNum bnProofOfWorkLimit(~uint256(0) >> 32); +uint256 hashGenesisBlock("0x0f9188f13cb7b2c71f2a335e3a4fc328bf5beb436012afca590b1a11466e2206"); |