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

MessageReceiver refactor to fix deadlocks [14069] <master> #2680

Merged
merged 10 commits into from
Jun 2, 2022

Conversation

MiguelBarro
Copy link
Contributor

Description

For sanitizer CI see #2565

This refactor promotes the mutex to shared mutex in order to prevent deadlocks due to interaction with participant mutexes.

A) std::mutex MessageReceives::mtx_
B) std::recursive_mutex* RTPSParticipantImpl::mp_mutex
C) std::mutex RTPSParticipantImpl::m_receiverResourcelistMutex

MessageReceiver::associateEndpoint(C > A) takes A while C is taken at RTPSParticipantImpl::assignEndpoint2LocatorList()

EDP::pairing_writer_proxy_with_any_local_reader(A > B) takes B while A is taken in MessageReceiver::process_data_message_without_security()

RTPSParticipantImpl::deleteUserEndpoint(B > C) takes C while B is taken in RTPSParticipantImpl::disable()

This is the first use of shared_mutex in Fast-DDS. Because it's a C++17 feature a public domain implementation is included in our utils folder to support old compilers.

Contributor Checklist

  • Commit messages follow the project guidelines.
  • The code follows the style guidelines of this project.
  • [Sanitizer] Tests that thoroughly check the new feature have been added/Regression tests checking the bug and its fix have been added.
  • NA 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.
  • NA Documentation builds and tests pass locally.
  • NA New feature has been added to the versions.md file (if applicable).
  • NA 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.

jsan-rt and others added 10 commits May 3, 2022 12:18
Signed-off-by: Javier Santiago <javiersantiago@eprosima.com>
* Refs #14285: Fixed typo. Updated working directory to be in line with master branch to prevent fuzzhash mismatches due to path changes.

Signed-off-by: Javier Santiago <javiersantiago@eprosima.com>

* Refs #14285: Adjusted generated file path

Signed-off-by: Javier Santiago <javiersantiago@eprosima.com>
Signed-off-by: Miguel Barro <miguelbarro@eprosima.com>
Signed-off-by: Miguel Barro <miguelbarro@eprosima.com>
…train workaround

Signed-off-by: Miguel Barro <miguelbarro@eprosima.com>
Signed-off-by: Miguel Barro <miguelbarro@eprosima.com>
Signed-off-by: Miguel Barro <miguelbarro@eprosima.com>
Signed-off-by: Miguel Barro <miguelbarro@eprosima.com>
Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>
Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>
@MiguelBarro MiguelBarro self-assigned this May 17, 2022
@MiguelBarro MiguelBarro changed the title MessageReceiver refactor to fix deadlocks [14069] MessageReceiver refactor to fix deadlocks [14069] <master> May 19, 2022
@EduPonz EduPonz added this to the v2.6.1 milestone Jun 1, 2022
Copy link
Contributor

@jsan-rt jsan-rt left a comment

Choose a reason for hiding this comment

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

LGTM. Original comments on this PR can be found on PR #2565.

@MiguelCompany MiguelCompany merged commit b60155e into master Jun 2, 2022
@MiguelCompany MiguelCompany deleted the test/deadlock_fixes branch June 2, 2022 06:50
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.

4 participants