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

Enable memory protection on DataSharing readers [13457] (backport #2405) #2475

Merged
merged 2 commits into from
Feb 9, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 9, 2022

This is an automatic backport of pull request #2405 done by Mergify.
Cherry-pick of 6505a51 has failed:

On branch mergify/bp/2.3.x/pr-2405
Your branch is up to date with 'origin/2.3.x'.

You are currently cherry-picking commit 6505a51ff.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   examples/C++/DDS/ZeroCopyExample/LoanableHelloWorldSubscriber.cxx
	modified:   include/fastdds/dds/core/LoanableSequence.hpp
	modified:   include/fastdds/dds/core/LoanableTypedCollection.hpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   src/cpp/rtps/DataSharing/ReaderPool.hpp
	both modified:   src/cpp/utils/shared_memory/SharedMemSegment.hpp

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

* Refs 13457. DataSharing reader map memory as read only.

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

* Refs 13457. Allow disabling non-const accessor on LoanableSequence.

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

* Refs 13457. New macro FASTDDS_CONST_SEQUENCE.

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

* Refs 13457. Use FASTDDS_CONST_SEQUENCE on zero copy example.

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

* Refs 13457. Linters.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>
(cherry picked from commit 6505a51)

# Conflicts:
#	src/cpp/rtps/DataSharing/ReaderPool.hpp
#	src/cpp/utils/shared_memory/SharedMemSegment.hpp
@mergify mergify bot added the conflicts Backport PR wich git cherry pick failed label Feb 9, 2022
MiguelCompany
MiguelCompany previously approved these changes Feb 9, 2022
@MiguelCompany MiguelCompany removed the conflicts Backport PR wich git cherry pick failed label Feb 9, 2022
Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>
@MiguelCompany
Copy link
Member

@richiprosima Please test mac

@MiguelCompany MiguelCompany merged commit 5cd6cc5 into 2.3.x Feb 9, 2022
@MiguelCompany MiguelCompany deleted the mergify/bp/2.3.x/pr-2405 branch February 9, 2022 13:44
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.

1 participant