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

Use foonathan memory manager for reducing allocations in SharedMemManager.hpp (backport #3833) #3890

Merged
merged 2 commits into from
Nov 30, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 28, 2023

This is an automatic backport of pull request #3833 done by Mergify.
Cherry-pick of df18056 has failed:

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

You are currently cherry-picking commit df180560d.
  (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:   src/cpp/rtps/transport/shared_mem/SharedMemManager.hpp
	new file:   src/cpp/utils/collections/impl/node-sizes/foonathan/list_node_size_impl.hpp
	new file:   src/cpp/utils/collections/impl/node-sizes/list_node_size_impl.hpp
	modified:   src/cpp/utils/collections/node_size_helpers.hpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   test/unittest/transport/CMakeLists.txt

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

…ager.hpp (#3833)

* Add helpers for std::list node sizes.

Signed-off-by: Matthias Schneider <ma30002000@yahoo.de>

* Use foonathan memory pool for storing buffer nodes in shared mem manager in order to reduce dynamic heap allocations.

Signed-off-by: Matthias Schneider <ma30002000@yahoo.de>

* Uncrustify.

Signed-off-by: Matthias Schneider <ma30002000@yahoo.de>

* Add foonathan dependency to SharedMemTests.

Signed-off-by: Matthias Schneider <ma30002000@yahoo.de>

* Initialize allocator with more realistic allocation assumption.

* Fix include order

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

* Removed unnecessary constexpr.

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

* Fix copyright year.

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

* Fix EOL.

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

* Fix windows build of unit test.

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

---------

Signed-off-by: Matthias Schneider <ma30002000@yahoo.de>
Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>
Co-authored-by: Miguel Company <MiguelCompany@eprosima.com>
(cherry picked from commit df18056)

# Conflicts:
#	test/unittest/transport/CMakeLists.txt
@mergify mergify bot added the conflicts Backport PR wich git cherry pick failed label Sep 28, 2023
@JLBuenoLopez JLBuenoLopez added this to the v2.6.7 milestone Oct 3, 2023
@JesusPoderoso
Copy link
Contributor

Hi @MiguelCompany, could you please take a look at the conflicts?

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>
@MiguelCompany MiguelCompany removed the conflicts Backport PR wich git cherry pick failed label Nov 13, 2023
@JesusPoderoso
Copy link
Contributor

@richiprosima please test this

@MiguelCompany MiguelCompany merged commit 6938e11 into 2.6.x Nov 30, 2023
2 checks passed
@MiguelCompany MiguelCompany deleted the mergify/bp/2.6.x/pr-3833 branch November 30, 2023 16:45
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