Misc. fixes for 6.x #991
Merged
Misc. fixes for 6.x #991
Conversation
This file contains 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
There's no way to know which of this was fired (the one above, in the same function, has identical wording).
Also don't return a completely useless bool.
Blockchain::prepare_handle_incoming_blocks locks m_tx_pool, but uses a local RAII lock on the blockchain object itself, then also starts a batch. Blockchain::cleanup_handle_incoming_blocks then also takes out a local RAII blockchain lock, then cleans up the batch. But the lmdb layer is retarded in that it throws an exception if any thread tries to write to the database while a batch is active in another thread, and so the blockchain lock is *also* used as a guard writes. Holding an open batch but *not* holding the blockchain lock then hits this exception if a write arrives in another thread at just the right time. This is, of course, terrible design at multiple layers, but this close to release I am reluctant to make more drastic fixes. Other small changes here: - All the locks in `blockchain.cpp` now use tools::unique_lock or tools::unique_locks rather than the nasty epee macro. This also reduces the likelihood of accidental deadlock because this means the dual txpool-blockchain locks are not taken out simultaneously via std::lock rather than sequentially. - Removed a completely useless "if (1)". Git blame shows that there was previously a condition here, but apparently the upstream monero author who changed it was afraid of removing the `if` keyword. - Reduced the sleep in the loop that waits for a batch to 100ms from 1000ms because sleeping for a full second for a fairly light test is insane. - boost isn't happy calling boost::lock() on the tx pool or blockchain object because the lock/unlock/try_lock methods are const, and so the workaround of using boost::lock because std::lock and std::shared_time_mutex are broken on the macOS SDK 10.11 that we use for mac builds now requires extra workarounds. Joy.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Fixes some compilation issues and a db txn bug.