Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix double-locking issue in DataSharingListener #5468

Merged
merged 1 commit into from
Dec 20, 2024

Conversation

xjzer
Copy link
Contributor

@xjzer xjzer commented Dec 6, 2024

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.

图片1

未命名文件 (5)

@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.md file (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

  • The PR has a milestone assigned.
  • The title and description correctly express the PR's purpose.
  • Check contributor checklist is correct.
  • N/A: If this is a critical bug fix, backports to the critical-only supported branches have been requested.
  • Check CI results: changes do not issue any warning.
  • Check CI results: failing tests are unrelated with the changes.

…tion.

Signed-off-by: Xiaojing Cao <xiaojing.cao@hirain.com>
@xjzer xjzer changed the title Fix the double-locking issue when spurious wakeup occurs in wait func… Fix the double-locking issue when spurious wakeup occurs in wait(). Dec 9, 2024
@MiguelCompany MiguelCompany self-requested a review December 9, 2024 14:14
@MiguelCompany MiguelCompany added this to the v3.2.0 milestone Dec 9, 2024
@xjzer
Copy link
Contributor Author

xjzer commented Dec 20, 2024

@MiguelCompany Is there anything else I need to do?

@MiguelCompany
Copy link
Member

@MiguelCompany Is there anything else I need to do?

Sorry for the delay @xjzer, and thanks for the heads up! This got buried in my pile of things.
Thank you for your contribution!

@MiguelCompany MiguelCompany changed the title Fix the double-locking issue when spurious wakeup occurs in wait(). Fix double-locking issue in DataSharingListener Dec 20, 2024
@MiguelCompany MiguelCompany merged commit 059457a into eProsima:master Dec 20, 2024
17 checks passed
@MiguelCompany
Copy link
Member

@Mergifyio backport 3.1.x 3.0.x 2.14.x 2.10.x

Copy link
Contributor

mergify bot commented Dec 20, 2024

backport 3.1.x 3.0.x 2.14.x 2.10.x

✅ Backports have been created

mergify bot pushed a commit that referenced this pull request Dec 20, 2024
Signed-off-by: Xiaojing Cao <xiaojing.cao@hirain.com>
(cherry picked from commit 059457a)
mergify bot pushed a commit that referenced this pull request Dec 20, 2024
Signed-off-by: Xiaojing Cao <xiaojing.cao@hirain.com>
(cherry picked from commit 059457a)
mergify bot pushed a commit that referenced this pull request Dec 20, 2024
Signed-off-by: Xiaojing Cao <xiaojing.cao@hirain.com>
(cherry picked from commit 059457a)
mergify bot pushed a commit that referenced this pull request Dec 20, 2024
Signed-off-by: Xiaojing Cao <xiaojing.cao@hirain.com>
(cherry picked from commit 059457a)
@xjzer xjzer deleted the bugfix/deadlock branch December 23, 2024 06:03
EugenioCollado pushed a commit that referenced this pull request Dec 27, 2024
Signed-off-by: Xiaojing Cao <xiaojing.cao@hirain.com>
(cherry picked from commit 059457a)
EugenioCollado pushed a commit that referenced this pull request Dec 30, 2024
Signed-off-by: Xiaojing Cao <xiaojing.cao@hirain.com>
(cherry picked from commit 059457a)

Co-authored-by: xjzer <62737335+xjzer@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants