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

feat: introduce the advanced publisher and subscriber (backport #368) #470

Merged
merged 4 commits into from
Mar 19, 2025

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Feb 18, 2025

With this PR, we replace the QueryingSubscriber and PublicationCache (+ a normal publisher)
with the AdvancedSubscriber and AdvancedPublisher.

NOTE: A deadlock is found when undeclaring advanced subscribers. It will be fixed once eclipse-zenoh/zenoh#1685 is merged and synced with zenoh-c.


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

* feat: introduce the advanced publisher/subscriber

* chore: ament_uncrustify and ament_cpplint

* trigger CI

* refactor: remove the unneeded querying callbacks

* fix: reorder the advanced pub/sub options to match the ROS2 QoS

* chore: add tmp

* chore: apply the QoS mapping

* style: ament_cpplint + ament_uncrustify

* trigger CI

* refactor: remove the recovery option as it exceeds typical ROS use cases

* chore: remove the QoS for end-to-end reliability

* style: ament_uncrustify

* Cleanup

Signed-off-by: Yadunund <[email protected]>

---------

Signed-off-by: Yadunund <[email protected]>
Co-authored-by: Yadunund <[email protected]>
(cherry picked from commit 77561d8)

# Conflicts:
#	rmw_zenoh_cpp/src/detail/rmw_publisher_data.cpp
@mergify mergify bot added the conflicts label Feb 18, 2025
Copy link
Author

mergify bot commented Feb 18, 2025

Cherry-pick of 77561d8 has failed:

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

You are currently cherry-picking commit 77561d8.
  (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/graph_cache.cpp
	modified:   rmw_zenoh_cpp/src/detail/graph_cache.hpp
	modified:   rmw_zenoh_cpp/src/detail/rmw_publisher_data.hpp
	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/rmw_publisher_data.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: Alejandro Hernandez Cordero <[email protected]>
Copy link
Member

@Yadunund Yadunund left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's hold on this for reasons described in #469 (comment)

@Yadunund
Copy link
Member

We'll need to get #472 in before this.

Signed-off-by: Yadunund <[email protected]>
@Yadunund Yadunund merged commit bb60d0d into humble Mar 19, 2025
4 checks passed
@Yadunund Yadunund deleted the mergify/bp/humble/pr-368 branch March 19, 2025 01:27
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.

3 participants