Two minor inconvenience fixes #2074

pull sipa wants to merge 2 commits into bitcoin:master from sipa:minor changing 4 files +12 −8

sipa commented at 11:27 PM on December 4, 2012: member

Nothing large, this fixes two minor inconveniences. See the commit messages for more information.
BitcoinPullTester commented at 11:42 PM on December 4, 2012: none

Automatic sanity-testing: PASSED, see http://jenkins.bluematt.me/pull-tester/69e42e7d03fe7115b345ee0cd4f2a869941f4bbc for binaries and test log.
Diapolo commented at 9:20 AM on December 5, 2012: none

ACK

Edit: @sipa Can you please take a look at #2063 and #2068 as I consider them "minor", too :).
BitcoinPullTester commented at 10:05 PM on December 5, 2012: none

Automatic sanity-testing: PASSED, see http://jenkins.bluematt.me/pull-tester/f00687beada5622efc9b565aa5cee84659e13c0f for binaries and test log.

Update the block file counter in database when using -reindex

This problem is like earth (mostly harmless). After/during a
-reindex, it means the statistics about the last block file
reported in debug.log are always of blk00000.dat instead of the
last file. Apart from that, it means a few more database entries
need to be read when finding a file to append to the first time.

c8b2e4426b

Allow lengthy block reconnections to be interrupted

When the coin database is out of date with the block database, the
best block in it is automatically switched to. This reconnection
process can take time, so allow it to be interrupted.

This also stops block connection as soon as shutdown is requested,
leading to a faster shutdown.

3fb9b99cca

in src/main.cpp:None in 0005888874 outdated

1239 | @@ -1240,9 +1240,12 @@ bool ConnectBestBlock() {
1240 |  
1241 |              if (pindexTest->pprev == NULL || pindexTest->pnext != NULL) {
1242 |                  reverse(vAttach.begin(), vAttach.end());
1243 | -                BOOST_FOREACH(CBlockIndex *pindexSwitch, vAttach)
1244 | +                BOOST_FOREACH(CBlockIndex *pindexSwitch, vAttach) {
1245 | +                    if (fRequestShutdown)

laanwj commented at 7:13 AM on December 6, 2012:

I suppose we should declare fRequestShutdown as volatile, as a sufficiently smart compiler will decide to move this statement out of the loop, as it doesn't depend on the loop invariants in any way (not expecting other threads to modify it).

sipa commented at 9:11 PM on December 6, 2012:

Done.

BitcoinPullTester commented at 2:45 AM on December 7, 2012: none

Automatic sanity-testing: PASSED, see http://jenkins.bluematt.me/pull-tester/3fb9b99cca390e8ac5838c03363c46a99396e463 for binaries and test log.
laanwj commented at 6:25 AM on December 7, 2012: member

ACK
gavinandresen referenced this in commit 8b83e2fc2e on Dec 12, 2012
gavinandresen merged this on Dec 12, 2012
gavinandresen closed this on Dec 12, 2012
sipa deleted the branch on May 3, 2013
laudney referenced this in commit 398b2cc016 on Mar 19, 2014
HashUnlimited referenced this in commit dce89f3931 on Jun 4, 2018
DrahtBot locked this on Sep 8, 2021

Contributors