Fix termination issues #62
Merged
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
|
LGTM, @k-okada , feel free to merge and release. |
Change-Id: I1443ce10576f10ceda5041139c90a3df2e65f043
Calling subscribe or unsubscribe while the callback is being called is already protected on naoqi side. So no need to protect it on the bridge side, this is what previously led to a deadlock. We only need mutex protection on configuration variable (publishing, recording, logging) and also make sure calling subscribe and unsubscribe at the same time is not possible (even though this is also protected in naoqi). Change-Id: Iae604c047046fec9e24832dd4df5017ff4ae724f
|
These last two commits fix audio and a compilation issue I had with qibuild. It does not seem to impact compilation with catkin.
|
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.
This PR fixes the segfault happening every time the bridge is terminated.
@k-okada I also took the liberty of including your commit to fix the termination error due to tactile and bumpers, hope you don't mind. If you do I'll remove it.
This fixes #57 and the other problems discussed in #61 (not including the deadlock caused by audio yet, but it is on the way)