Fix deadlock in tests (Continued) #2050
Merged
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.
Following on from #2043 I am still getting a deadlock on Windows from a similar issue where the last
node
shared_ptr reference is freed while holding the mutex ofbootstrap_initiator
and the~bootstrap_initiator
destructor is implicitly called (and hencestop
) which then has the same problem as before as it then locks the same mutex while already holding it. Madestopped
astd::atomic<bool>
so that it can be checked without locking the mutex. Thethread
can already be joined, so have moved this inside thestopped
function (whenstopped
is false) to avoid an already joined error.