Skip to content

[22841] Improve max_allocations calculation on SHM transport (backport #5659)#5675

Merged
MiguelCompany merged 2 commits into2.14.xfrom
mergify/bp/2.14.x/pr-5659
Mar 4, 2025
Merged

[22841] Improve max_allocations calculation on SHM transport (backport #5659)#5675
MiguelCompany merged 2 commits into2.14.xfrom
mergify/bp/2.14.x/pr-5659

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify bot commented Mar 3, 2025

Description

This PR improves SHM transport throughput by changing the calculation of the maximum number of allocated buffers.
It will now be the maximum between segment size / mean_message_size and the configured port_queue_capacity.

@Mergifyio backport 3.1.x 2.14.x 2.10.x

Contributor Checklist

  • Commit messages follow the project guidelines.

  • The code follows the style guidelines of this project.

  • NO: 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

    • I couldn't find a way to make a regression test, other than running a complex scenario and manually inspecting the results.
  • N/A: Any new/modified methods have been properly documented using Doxygen.

  • N/A: Any new configuration API has an equivalent XML API (with the corresponding XSD extension)

  • Changes are backport compatible: they do NOT break ABI nor change library core behavior.

  • 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.
  • If this is a critical bug fix, backports to the critical-only supported branches have been requested.
  • 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 #5659 done by [Mergify](https://mergify.com).

* Refs #22841. Improve max_allocations calculation.

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

* Refs #22841. Consider a mean message size of half the max message size.

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

* Refs #22841. Move `shm_default_segment_size` to global scope.

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

* Refs #22841. Move `SharedMemTransportDescriptor` constants.

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

* Refs #22841. Change calculation of `mean_message_size`.

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

---------

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
(cherry picked from commit b54cb8e)

# Conflicts:
#	src/cpp/rtps/transport/shared_mem/SharedMemTransport.cpp
#	src/cpp/rtps/transport/shared_mem/SharedMemTransportDescriptor.cpp
@mergify mergify bot added the conflicts Backport PR wich git cherry pick failed label Mar 3, 2025
@mergify
Copy link
Copy Markdown
Contributor Author

mergify bot commented Mar 3, 2025

Cherry-pick of b54cb8e has failed:

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

You are currently cherry-picking commit b54cb8ef.
  (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:   include/fastdds/rtps/transport/shared_mem/SharedMemTransportDescriptor.h
	modified:   test/mock/rtps/SharedMemTransportDescriptor/fastdds/rtps/transport/shared_mem/SharedMemTransportDescriptor.h

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   src/cpp/rtps/transport/shared_mem/SharedMemTransport.cpp
	both modified:   src/cpp/rtps/transport/shared_mem/SharedMemTransportDescriptor.cpp

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

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
@MiguelCompany MiguelCompany removed the conflicts Backport PR wich git cherry pick failed label Mar 3, 2025
@MiguelCompany MiguelCompany self-requested a review March 3, 2025 13:40
@github-actions github-actions bot added the ci-pending PR which CI is running label Mar 3, 2025
@MiguelCompany MiguelCompany merged commit 0d13583 into 2.14.x Mar 4, 2025
18 checks passed
@MiguelCompany MiguelCompany deleted the mergify/bp/2.14.x/pr-5659 branch March 4, 2025 15:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

ci-pending PR which CI is running

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant