core: deadlock fix, remove empty system, relax version request #2300
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
I don't believe it is still required to create these fake systems. That's because we send out heartbeats from MavsdkImpl or rather ServerComponentImpl, and not from within SystemImpl any longer which makes a lot more sense anyway. This commit removes creating the fake system. Signed-off-by: Julian Oes <julian@oes.ch>
This should fix the deadlock which can happen when a timeout happens at the exact time when a heartbeat arrives again. In that case one thread will call: SystemImpl::heartbeats_timed_out() -> acquire _connection_mutex SystemImpl::set_disconnected() MavsdkImpl::notify_on_timeout() -> acquire _systems_mutex The other thread will call: MavsdkImpl::receive_message() -> acquire _systems_mutex SystemImpl::set_connected() -> acquire _connection_mutex So both threads end up waiting for each other's mutex and dead lock. This commit fixes the problem by moving the on_discover and on_timeout calls outside of the scope of where the _connection_mutex is acquired. Signed-off-by: Julian Oes <julian@oes.ch>
Instead of doing too many commands at once, we only do one at a time, and don't immediately call ourselves again. We don't want to hold up the plugins' enable() calls for too long. Also, we can make the request interval slightly longer. Signed-off-by: Julian Oes <julian@oes.ch>
|
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.
Three issues I found running multiple instances overnight. See commits.