Fix double-locking issue in DataSharingListener (backport #5468)
#5521
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
![mergify[bot]](https://avatars.githubusercontent.com/in/10562?s=60&v=4){kind=small}
11 tasks
|
I re-run the mac ci just to ensure that the failing test is unrelated |
Signed-off-by: Xiaojing Cao <xiaojing.cao@hirain.com> (cherry picked from commit 059457a)
Mario-DL
force-pushed
the
mergify/bp/3.0.x/pr-5468
branch
from
116000d to
6acc122
Compare
Mario-DL
approved these changes
Jan 22, 2025
Mario-DL
added
ready-to-merge
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.
Description
In the run() function of DataSharingListener, due to time jumps, the wait() function may occasionally experience spurious wakeups and throw a const boost::interprocess_exception. After executing continue in the catch block, the code attempts to lock the mutex again while it's already locked, which leads to a std::system_error exception being thrown(e.what(): Resource deadlock avoided), ultimately causing the program to crash.
@Mergifyio backport 3.1.x 3.0.x 2.14.x 2.10.x
Contributor Checklist
Commit messages follow the project guidelines.
The code follows the style guidelines of this project.
Tests that thoroughly check the new feature have been added/Regression tests checking the bug and its fix have been added; the added tests pass locally
N/A Any new/modified methods have been properly documented using Doxygen.
N/A Any new configuration API has an equivalent XML API (with the corresponding XSD extension)
Changes are backport compatible: they do NOT break ABI nor change library core behavior.
Changes are API compatible.
N/A New feature has been added to the
versions.mdfile (if applicable).N/A New feature has been documented/Current behavior is correctly described in the documentation.
Applicable backports have been included in the description.
Reviewer Checklist
This is an automatic backport of pull request #5468 done by [Mergify](https://mergify.com).