ADSB: fix deadlock issue #3109
Merged
ADSB: fix deadlock issue #3109
Conversation
This file contains hidden or 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
The call to MainV2.comPort.sendPacket waits for MAVLinkInterface.objlock to release. This can cause a deadlock if the MAVLinkInterface thread has also called adsb_UpdatePlanePosition, and is waiting on this thread to release adsblock. adsblock is only needed for accessing the adsbPlanes list, so this commit restricts the lock to only where it is needed.
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.
The call to MainV2.comPort.sendPacket waits for MAVLinkInterface.objlock to release. This can cause a deadlock if the MAVLinkInterface thread has also called adsb_UpdatePlanePosition, and is waiting on this thread to release adsblock. adsblock is only needed for accessing the adsbPlanes list, so this commit restricts the lock to only where it is needed.
When constructing the mavlink packet, adsbPlanes and adsb are used a bit randomly. I changed those all to read from adsb, and moved them out of the locked section as well.