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

[18966] SHM sending improvements (backport #3642) #3711

Merged
merged 2 commits into from
Jul 21, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 13, 2023

This is an automatic backport of pull request #3642 done by Mergify.
Cherry-pick of 2f80b06 has failed:

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

You are currently cherry-picking commit 2f80b06b5.
  (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/SharedMemGlobal.hpp
	modified:   src/cpp/rtps/transport/shared_mem/SharedMemManager.hpp
	modified:   src/cpp/rtps/transport/shared_mem/SharedMemTransport.h
	modified:   test/unittest/transport/SharedMemTests.cpp

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

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 #18966. Refactor of try_push.

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

* Refs #18966. Retry try_push after regenerating output port.

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

* Refs #18966. Clean all output ports on every send.

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

* Refs #18966. Clean output ports when they have no listeners.

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

* Refs #18966: Applied suggestions

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

* Refs #18966: Uncrustify

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

* Refs #18966: Prevent port cleanup on Windows platforms

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

---------

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>
Signed-off-by: Javier Santiago <javiersantiago@eprosima.com>
Co-authored-by: Miguel Company <MiguelCompany@eprosima.com>
(cherry picked from commit 2f80b06)

# Conflicts:
#	src/cpp/rtps/transport/shared_mem/SharedMemTransport.cpp
@mergify mergify bot added the conflicts Backport PR wich git cherry pick failed label Jul 13, 2023
@mergify mergify bot mentioned this pull request Jul 13, 2023
11 tasks
@JesusPoderoso JesusPoderoso added this to the v2.6.6 milestone Jul 13, 2023
Signed-off-by: Javier Santiago <javiersantiago@eprosima.com>
@JesusPoderoso JesusPoderoso added ci-pending PR which CI is running and removed conflicts Backport PR wich git cherry pick failed labels Jul 17, 2023
@jsan-rt
Copy link
Contributor

jsan-rt commented Jul 17, 2023

@richiprosima please test this

@JesusPoderoso
Copy link
Contributor

JesusPoderoso commented Jul 20, 2023

CI errors seem unrelated. Ready to merge.

@MiguelCompany MiguelCompany added ready-to-merge Ready to be merged. CI and changes have been reviewed and approved. and removed ci-pending PR which CI is running labels Jul 21, 2023
@MiguelCompany MiguelCompany merged commit 3fffea5 into 2.6.x Jul 21, 2023
@MiguelCompany MiguelCompany deleted the mergify/bp/2.6.x/pr-3642 branch July 21, 2023 08:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ready-to-merge Ready to be merged. CI and changes have been reviewed and approved.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants