-
Notifications
You must be signed in to change notification settings - Fork 765
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
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
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
changed the title
MessageReceiver refactor to fix deadlocks [14069]
MessageReceiver refactor to fix deadlocks [14069] <master>
May 19, 2022
jsan-rt
approved these changes
Jun 1, 2022
There was a problem hiding this 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.
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
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 atRTPSParticipantImpl::assignEndpoint2LocatorList()
EDP::pairing_writer_proxy_with_any_local_reader(A > B)
takes B while A is taken inMessageReceiver::process_data_message_without_security()
RTPSParticipantImpl::deleteUserEndpoint(B > C)
takes C while B is taken inRTPSParticipantImpl::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
versions.md
file (if applicable).Reviewer Checklist