Fix shutdown deadlock, ticket #2690 #2766

pull theuni wants to merge 2 commits into bitcoin:master from theuni:fix-shutdown-deadlock changing 1 files +6 −1

theuni commented at 4:32 AM on June 14, 2013: member

See commits for explanation. Busted boost release, this works around it.

This affected fedora 18, and probably Ubuntu Quantal as well.

fixed: include boost header as necessary

Without this include, sometimes BOOST_VERSION was defined and sometimes
it was not, depending on which includes came before it. The result was a
random mix of sleep or sleep_for for boost versions >= 1.50.

f2763d6d60

fixed: don't use thread::sleep_for where it's known to be broken
Fixes #2690.
e2654c8d28
BitcoinPullTester commented at 5:37 AM on June 14, 2013: none

Automatic sanity-testing: PASSED, see http://jenkins.bluematt.me/pull-tester/e2654c8d280fbe77920960009f337d3f3c6772b6 for binaries and test log. This test script verifies pulls every time they are updated. It, however, dies sometimes and fails to test properly. If you are waiting on a test, please check timestamps to verify that the test.log is moving at http://jenkins.bluematt.me/pull-tester/current/ Contact BlueMatt on freenode if something looks broken.
theuni commented at 8:12 AM on June 14, 2013: member

@wtogami did a quick test with this and confirmed that it solved the hang. Could you please verify that it's completely fixed?
laanwj commented at 8:47 AM on June 14, 2013: member

ACK
wtogami commented at 9:24 AM on June 14, 2013: contributor

@theuni Seems great in my Fedora native builds now. I enjoy not needing kill -9 to quit bitcoin-qt. Haven't tested with gitian builds, but it seems from the simplicity of this patch that it shouldn't be a problem.
sipa commented at 9:30 AM on June 14, 2013: member

ACK
Diapolo commented at 10:21 AM on June 14, 2013: none

Very nice.
sipa referenced this in commit f5442aeef4 on Jun 15, 2013
sipa merged this on Jun 15, 2013
sipa closed this on Jun 15, 2013
DrahtBot locked this on Sep 8, 2021

Contributors