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 SharedMemWatchdog datarace (issue 1049) [14916] <master> #2762

Merged
merged 1 commit into from
Jun 30, 2022

Conversation

MiguelBarro
Copy link
Contributor

Description

SharedMemWatchdog::exit_thread_ has a data race on destruction because it's accessed from the main thread. as easy as
promote it to atomic_bool.

Review and testing on: #2761

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.
  • Any new/modified methods have been properly documented using Doxygen.
  • Fast DDS test suite has been run locally.
  • Changes are ABI compatible.
  • Changes are API compatible.
  • Documentation builds and tests pass locally.
  • New feature has been added to the versions.md file (if applicable).
  • New feature has been documented/Current behavior is correctly described in the documentation.

Reviewer Checklist

  • Check contributor checklist is correct.
  • Check CI results: changes do not issue any warning.
  • Check CI results: failing tests are unrelated with the changes.

@MiguelBarro MiguelBarro added the no-test Skip CI tests if PR marked with this label label Jun 20, 2022
@MiguelBarro MiguelBarro changed the title Test/issue/1049 Fix SharedMemWatchdog datarace (issue 1049) [14916] <master> Jun 20, 2022
@MiguelCompany MiguelCompany added this to the v2.7.0 milestone Jun 29, 2022
Signed-off-by: Miguel Barro <miguelbarro@eprosima.com>
Copy link
Member

@MiguelCompany MiguelCompany left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@MiguelCompany MiguelCompany merged commit d5a116a into master Jun 30, 2022
@MiguelCompany MiguelCompany deleted the test/issue/1049 branch June 30, 2022 07:35
@MiguelCompany
Copy link
Member

@Mergifyio backport 2.6.x 2.5.x

mergify bot pushed a commit that referenced this pull request Jun 30, 2022
Signed-off-by: Miguel Barro <miguelbarro@eprosima.com>
(cherry picked from commit d5a116a)
mergify bot pushed a commit that referenced this pull request Jun 30, 2022
Signed-off-by: Miguel Barro <miguelbarro@eprosima.com>
(cherry picked from commit d5a116a)
@mergify
Copy link
Contributor

mergify bot commented Jun 30, 2022

backport 2.6.x 2.5.x

✅ Backports have been created

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
no-test Skip CI tests if PR marked with this label
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants