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

[20701] Enforce SHM ports open mode exclusions (backport #4635) #4645

Merged
merged 1 commit into from
Apr 17, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Apr 3, 2024

Description

As originally reported in #4504 a port could be open first with ReadShared and then with ReadExclusive the internal state of the port was incorrectly changed. This meant that the same port could be used at the same time for unicast and multicast.

This PR fixes #4634 by checking incompatibilities inside lock_read_exlcusive / lock_read_shared methods of the Port class.

@Mergifyio backport 2.13.x 2.10.x 2.6.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

  • Any new/modified methods have been properly documented using Doxygen.

  • Changes are ABI compatible.

  • 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.
  • Check CI results: changes do not issue any warning.
  • Check CI results: failing tests are unrelated with the changes.

This is an automatic backport of pull request #4635 done by [Mergify](https://mergify.com).

* Refs #20701. Added unit regression tests.

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>

* Refs #20701. Added blackbox regression test.

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>

* Refs #20701. Fix issue.

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>

---------

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
(cherry picked from commit 3d159dc)
@JesusPoderoso JesusPoderoso added this to the v2.13.5 milestone Apr 3, 2024
@JesusPoderoso JesusPoderoso self-requested a review April 4, 2024 11:02
Copy link
Contributor

@JesusPoderoso JesusPoderoso left a comment

Choose a reason for hiding this comment

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

LGTM with green CI

@github-actions github-actions bot added the ci-pending PR which CI is running label Apr 4, 2024
@JesusPoderoso
Copy link
Contributor

@richiprosima please test this

@JesusPoderoso
Copy link
Contributor

@richiprosima please test mac

@JesusPoderoso
Copy link
Contributor

MAC CI issues unrelated to this PR.
Ready to merge!

@JesusPoderoso JesusPoderoso added ready-to-merge Ready to be merged. CI and changes have been reviewed and approved. and removed ci-pending PR which CI is running labels Apr 9, 2024
@EduPonz EduPonz merged commit 5253a84 into 2.13.x Apr 17, 2024
14 of 16 checks passed
@EduPonz EduPonz deleted the mergify/bp/2.13.x/pr-4635 branch April 17, 2024 06:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ready-to-merge Ready to be merged. CI and changes have been reviewed and approved.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants