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

Don't copy contiguous bytes on reception (backport #343) #375

Merged
merged 1 commit into from
Jan 2, 2025

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Jan 2, 2025

This uses the slices iterator API of zenoh-c to avoid unecessarily copying bytes into an owned slice, if and only if the bytes is made up of exactly one slice.


This is an automatic backport of pull request #343 done by Mergify.

@mergify mergify bot added the conflicts label Jan 2, 2025
Copy link
Author

mergify bot commented Jan 2, 2025

Cherry-pick of cebb972 has failed:

On branch mergify/bp/humble/pr-343
Your branch is up to date with 'origin/humble'.

You are currently cherry-picking commit cebb972.
  (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:   rmw_zenoh_cpp/src/detail/rmw_subscription_data.cpp
	modified:   rmw_zenoh_cpp/src/detail/rmw_subscription_data.hpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   rmw_zenoh_cpp/src/detail/zenoh_utils.cpp
	both modified:   rmw_zenoh_cpp/src/detail/zenoh_utils.hpp

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

* Don't copy contiguous bytes on reception

This uses the slices iterator API of zenoh-cpp to avoid unecessarily
copying bytes into a vecotr, if and only if the bytes is made up of
exactly one slice.

* Don't use auto type specifiers

* Remove unused `<vector>` includes

* Explain lifetime of `Contiguous::slice`

* Move `Payload` into `zenoh_utils`

Signed-off-by: Mahmoud Mazouz <[email protected]>
Co-authored-by: Chris Lalancette <[email protected]>
@Yadunund Yadunund force-pushed the mergify/bp/humble/pr-343 branch from 821ee53 to 193693d Compare January 2, 2025 18:41
@Yadunund Yadunund merged commit 919851e into humble Jan 2, 2025
6 checks passed
@Yadunund Yadunund deleted the mergify/bp/humble/pr-343 branch January 2, 2025 19:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants