Fix bookkeeping of ongoing calls for recursive calls to CallbackQueue::callAvailable() #2378
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
…::callAvailable() When copying over pending calls to the thread-local callback queue held in tls->callbacks, the calling_ member was not updated correctly with the number of added callbacks if tls->callbacks was not empty before. This may be the case if callAvailable() is called recursively, e.g. from within another callback. The issue should only affect the empty() and isEmpty() member functions, which apparently are unused within the CallbackQueue class or within roscpp itself, but may be used by external code. Signed-off-by: Johannes Meyer <johannes@intermodalics.eu>
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.
While investigating a segmentation fault in one of our applications, and while working on #2377 yesterday, I found another small possible bug in the implementation of
ros::CallbackQueue::callAvailable()in the way it keeps track of how many callbacks are currently being executed in any spinner thread, namely thecalling_variable.When copying over pending calls to the thread-local callback queue held in
tls->callbacks, thecalling_member was not updated correctly with the number of added callbacks iftls->callbackswas not empty before. This may be the case ifcallAvailable()is called recursively, e.g. from within another callback.The issue should only affect the
calling_member andempty()andisEmpty()member functions, which apparently are unused within roscpp itself, but may be used by external code.