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

RMW QoS incoming buffer handling (backport #165) #176

Merged
merged 3 commits into from
Sep 28, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 28, 2021

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

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

You are currently cherry-picking commit b1531c7.
  (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_microxrcedds_c/CMakeLists.txt
	modified:   rmw_microxrcedds_c/src/callbacks.c
	modified:   rmw_microxrcedds_c/src/rmw_client.c
	modified:   rmw_microxrcedds_c/src/rmw_init.c
	modified:   rmw_microxrcedds_c/src/rmw_publisher.c
	modified:   rmw_microxrcedds_c/src/rmw_request.c
	modified:   rmw_microxrcedds_c/src/rmw_response.c
	modified:   rmw_microxrcedds_c/src/rmw_service.c
	modified:   rmw_microxrcedds_c/src/rmw_subscription.c
	modified:   rmw_microxrcedds_c/src/rmw_take.c
	modified:   rmw_microxrcedds_c/src/rmw_wait.c
	modified:   rmw_microxrcedds_c/src/types.c
	modified:   rmw_microxrcedds_c/test/test_pubsub.cpp
	modified:   rmw_microxrcedds_c/test/test_reqres.cpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   rmw_microxrcedds_c/src/types.h

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.io/

* Initial

* Update

* Uncrustify

* Fixes

* Tests pubsub

* Add two subs test

* Uncrustify

* Initial reqres

* Adding complete req res tests

* Uncrustify

* Use absolute time reference

* Avoid future data

* Speedup tests

* Update

* Update

* Pub/sub in best effort

* Fix

* Revert "Pub/sub in best effort"

This reverts commit 9f46d80.

* Revert "Fix"

This reverts commit cb7a130.

* Major review of rmw_wait

* Uncrustify

* Adapt Cmake

* client branch

* Update

* Update

* Uncrustify

* Update rmw_microxrcedds_c/CMakeLists.txt

Co-authored-by: Antonio Cuadros <49162117+Acuadros95@users.noreply.github.com>

* Update rmw_microxrcedds_c/src/config.h.in

Co-authored-by: Antonio Cuadros <49162117+Acuadros95@users.noreply.github.com>

* Fix on_topic callback

* Fix timeout handling

* Exit if deserialize fails

* Update .github/workflows/ci.yml

Co-authored-by: Pablo Garrido <pablogs9@gmail.com>

Co-authored-by: Antonio Cuadros <49162117+Acuadros95@users.noreply.github.com>
Co-authored-by: Antonio cuadros <acuadros1995@gmail.com>
(cherry picked from commit b1531c7)

# Conflicts:
#	rmw_microxrcedds_c/src/types.h
@mergify mergify bot added the conflicts label Sep 28, 2021
@mergify mergify bot mentioned this pull request Sep 28, 2021
2 tasks
@github-actions
Copy link

Static memory analysis

Default configuration

MTU: 512 B
Input buffer size: 2048 B
Input history: 4
Output buffer size: 2048 B
Output history: 4

Entity Qty Size per unit
Context 2 5608 B
Topic 8 56 B
Service 4 168 B
Client 4 168 B
Subscription 4 168 B
Publisher 4 184 B
Node 4 56 B
Static input buffer 8 2136 B

TOTAL: 31508 B

@pablogs9 pablogs9 merged commit eeb83d4 into main Sep 28, 2021
@pablogs9 pablogs9 deleted the mergify/bp/main/pr-165 branch September 28, 2021 13:18
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.

1 participant