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

Adds a context pointer to subscriptions (backport #107) #120

Merged
merged 2 commits into from
Jul 15, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 13, 2021

This is an automatic backport of pull request #107 done by Mergify.
Cherry-pick of 5b11c5a has failed:

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

You are currently cherry-picking commit 5b11c5a.
  (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:   NOTICE
	modified:   rclc/include/rclc/executor.h
	modified:   rclc/include/rclc/executor_handle.h
	modified:   rclc/src/rclc/executor.c
	modified:   rclc/src/rclc/executor_handle.c
	modified:   rclc/test/rclc/test_executor.cpp
	new file:   rclc_examples/src/example_sub_context.c

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   rclc_examples/CMakeLists.txt

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/

(cherry picked from commit 5b11c5a)

# Conflicts:
#	rclc_examples/CMakeLists.txt
Signed-off-by: Jan Staschulat <[email protected]>
@codecov-commenter
Copy link

Codecov Report

Merging #120 (c3b075b) into galactic (88cd65c) will decrease coverage by 0.51%.
The diff coverage is n/a.

Impacted file tree graph

@@             Coverage Diff              @@
##           galactic     #120      +/-   ##
============================================
- Coverage     32.55%   32.03%   -0.52%     
============================================
  Files            31       32       +1     
  Lines          3600     3786     +186     
  Branches       1791     1850      +59     
============================================
+ Hits           1172     1213      +41     
- Misses          932     1032     +100     
- Partials       1496     1541      +45     
Impacted Files Coverage Δ
.../src/zmy3q7fyodg/rclc/rclc/test/rclc/test_node.cpp
...fyodg/rclc/rclc/test/rclc/test_executor_handle.cpp
...lc_parameter/src/rclc_parameter/parameter_server.c
...c/zmy3q7fyodg/rclc/rclc/test/rclc/test_service.cpp
ros_ws/src/zmy3q7fyodg/rclc/rclc/src/rclc/init.c
.../zmy3q7fyodg/rclc/rclc/test/rclc/test_executor.cpp
...rclc_lifecycle/src/rclc_lifecycle/rclc_lifecycle.c
ros_ws/src/zmy3q7fyodg/rclc/rclc/src/rclc/client.c
...yodg/rclc/rclc_examples/src/example_service_node.c
ros_ws/src/zmy3q7fyodg/rclc/rclc/src/rclc/sleep.c
... and 53 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 88cd65c...c3b075b. Read the comment docs.

@JanStaschulat JanStaschulat self-requested a review July 15, 2021 15:59
@JanStaschulat JanStaschulat merged commit 86399a7 into galactic Jul 15, 2021
@JanStaschulat JanStaschulat deleted the mergify/bp/galactic/pr-107 branch July 15, 2021 15:59
@JanStaschulat
Copy link
Contributor

solves #50 for galactic

Acuadros95 pushed a commit that referenced this pull request Nov 11, 2021
* Adds a context pointer to subscriptions (#107)

(cherry picked from commit 5b11c5a)

# Conflicts:
#	rclc_examples/CMakeLists.txt

* resolved merge confict

Signed-off-by: Jan Staschulat <[email protected]>

Co-authored-by: Brett Downing <[email protected]>
Co-authored-by: Jan Staschulat <[email protected]>
Acuadros95 pushed a commit that referenced this pull request Nov 12, 2021
* Adds a context pointer to subscriptions (#107)

(cherry picked from commit 5b11c5a)

# Conflicts:
#	rclc_examples/CMakeLists.txt

* resolved merge confict

Signed-off-by: Jan Staschulat <[email protected]>

Co-authored-by: Brett Downing <[email protected]>
Co-authored-by: Jan Staschulat <[email protected]>
Signed-off-by: Antonio Cuadros <[email protected]>
pablogs9 added a commit that referenced this pull request Nov 15, 2021
* ci workflow for galactic (#90)

Signed-off-by: Jan Staschulat <[email protected]>

* galactic: updated ci-job and codecov (#91)

* bump version to 2.0.1 of galactic branch for new bloom release (#95)

* Dummy (#100)

* test of galactic bloom release see also #100 (#101)

* Adds a context pointer to subscriptions (backport #107) (#120)

* Adds a context pointer to subscriptions (#107)

(cherry picked from commit 5b11c5a)

# Conflicts:
#	rclc_examples/CMakeLists.txt

* resolved merge confict

Signed-off-by: Jan Staschulat <[email protected]>

Co-authored-by: Brett Downing <[email protected]>
Co-authored-by: Jan Staschulat <[email protected]>

* version bump and updated changelog. (#139)

Signed-off-by: Jan Staschulat <[email protected]>

* prepare bloom release v2.0.3 for galactic (#159)

Signed-off-by: Jan Staschulat <[email protected]>

* refactor #116 remove callback_type (#154) (#163)

* refactor #116 remove callback_type

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

* rename subscription callback

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

* deduplicate remove functions

Signed-off-by: BrettRD <[email protected]>
(cherry picked from commit 700ea24)

Co-authored-by: Brett Downing <[email protected]>

* updated rcl dependency to galactic (#184)

Signed-off-by: Jan Staschulat <[email protected]>

* added pingpong example (#172) (#188)

* added pingpong example

Signed-off-by: Jan Staschulat <[email protected]>

* added two executor configuration to pingpong

Signed-off-by: Jan Staschulat <[email protected]>

* example_pingpong multiple files

Signed-off-by: Jan Staschulat <[email protected]>

* added class member function to executor

Signed-off-by: Jan Staschulat <[email protected]>
(cherry picked from commit e0252bd)

Co-authored-by: Jan Staschulat <[email protected]>

* prepare bloom release 2.0.4-galactic (#193)

Signed-off-by: Jan Staschulat <[email protected]>

* Copy client to action client


Initial mods to action client

Initial executor support for action client

Updates

Fix

Updates

Copy client action to server action


Initial action server changes

Fix

Revert "Copy client to action client"

This reverts commit 304c70a.

Initial


Update


Working state


Uncrustify


fix


Update


Update


Add client


Uncrustify


Uncrus


Apply suggestions from code review

Co-authored-by: Ralph Lange <[email protected]>
Initial test


Fix data available logic


Update tests


Update


Uncrust


Revert "Update"

This reverts commit 940aa96.

Working state

Working

Building state


Update


Working state


Working state


Working state


Uncrust


Updates


Fix cancelling reject


Test approach modified


Complete server tests


Uncrusti


Add multigoal test


Fix


Initial action client tests


Add executor client cancel handlers


Update action client


Add cancel tests


Tests update


Uncrustify


Refactor cancel response handling


Update

* Revert "Copy client to action client"

This reverts commit d65adc7.

* Initial version

* Hide non public API

* Fix abort API

* Minor fix

* Update

* Fix

* Add rclcpp dep

* Update actions implementation

* Delete COLCON_IGNORE

* Fix dependencies export

* cpplint

* Initial Ralph changes

Co-authored-by: Ralph Lange <[email protected]>

* Add RCLC error

* Refactor pop/take inner functions

* Argument renaming

* Argument renaming

* Rename get API to find

* Reafctor functio naming

* Refactor naming

* Remove explicit == true in conditionals

* Update rclc/src/rclc/executor.c

Co-authored-by: Ralph Lange <[email protected]>

* Update rclc/src/rclc/executor.c

Co-authored-by: Ralph Lange <[email protected]>

* Remove white lines

* Update rclc/src/rclc/action_server.c

* Apply suggestions from code review

Co-authored-by: Jan Staschulat <[email protected]>

* Apply suggestions from code review

Co-authored-by: Jan Staschulat <[email protected]>

* Add pointer check suggestions

* Apply suggestions on executor

* Add check for feedback msg on client

* Put goal on default switch case

* Revert code delete

* Add comments to executor loops

* Update loop comments

* Apply for loop style where possible

* Fix variable name

* Fix rebase

* ci workflow for galactic (#90)

Signed-off-by: Jan Staschulat <[email protected]>
Signed-off-by: Antonio Cuadros <[email protected]>

* galactic: updated ci-job and codecov (#91)

Signed-off-by: Antonio Cuadros <[email protected]>

* bump version to 2.0.1 of galactic branch for new bloom release (#95)

Signed-off-by: Antonio Cuadros <[email protected]>

* Dummy (#100)

Signed-off-by: Antonio Cuadros <[email protected]>

* test of galactic bloom release see also #100 (#101)

Signed-off-by: Antonio Cuadros <[email protected]>

* Adds a context pointer to subscriptions (backport #107) (#120)

* Adds a context pointer to subscriptions (#107)

(cherry picked from commit 5b11c5a)

# Conflicts:
#	rclc_examples/CMakeLists.txt

* resolved merge confict

Signed-off-by: Jan Staschulat <[email protected]>

Co-authored-by: Brett Downing <[email protected]>
Co-authored-by: Jan Staschulat <[email protected]>
Signed-off-by: Antonio Cuadros <[email protected]>

* version bump and updated changelog. (#139)

Signed-off-by: Jan Staschulat <[email protected]>
Signed-off-by: Antonio Cuadros <[email protected]>

* prepare bloom release v2.0.3 for galactic (#159)

Signed-off-by: Jan Staschulat <[email protected]>
Signed-off-by: Antonio Cuadros <[email protected]>

* refactor #116 remove callback_type (#154) (#163)

* refactor #116 remove callback_type

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

* rename subscription callback

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

* deduplicate remove functions

Signed-off-by: BrettRD <[email protected]>
(cherry picked from commit 700ea24)

Co-authored-by: Brett Downing <[email protected]>
Signed-off-by: Antonio Cuadros <[email protected]>

* updated rcl dependency to galactic (#184)

Signed-off-by: Jan Staschulat <[email protected]>
Signed-off-by: Antonio Cuadros <[email protected]>

* added pingpong example (#172) (#188)

* added pingpong example

Signed-off-by: Jan Staschulat <[email protected]>

* added two executor configuration to pingpong

Signed-off-by: Jan Staschulat <[email protected]>

* example_pingpong multiple files

Signed-off-by: Jan Staschulat <[email protected]>

* added class member function to executor

Signed-off-by: Jan Staschulat <[email protected]>
(cherry picked from commit e0252bd)

Co-authored-by: Jan Staschulat <[email protected]>
Signed-off-by: Antonio Cuadros <[email protected]>

* prepare bloom release 2.0.4-galactic (#193)

Signed-off-by: Jan Staschulat <[email protected]>
Signed-off-by: Antonio Cuadros <[email protected]>

* Copy client to action client


Initial mods to action client

Initial executor support for action client

Updates

Fix

Updates

Copy client action to server action


Initial action server changes

Fix

Revert "Copy client to action client"

This reverts commit 304c70a.

Initial


Update


Working state


Uncrustify


fix


Update


Update


Add client


Uncrustify


Uncrus


Apply suggestions from code review

Co-authored-by: Ralph Lange <[email protected]>
Initial test


Fix data available logic


Update tests


Update


Uncrust


Revert "Update"

This reverts commit 940aa96.

Working state

Working

Building state


Update


Working state


Working state


Working state


Uncrust


Updates


Fix cancelling reject


Test approach modified


Complete server tests


Uncrusti


Add multigoal test


Fix


Initial action client tests


Add executor client cancel handlers


Update action client


Add cancel tests


Tests update


Uncrustify


Refactor cancel response handling


Update

Signed-off-by: Antonio Cuadros <[email protected]>

* Revert "Copy client to action client"

This reverts commit d65adc7.

Signed-off-by: Antonio Cuadros <[email protected]>

* Initial version

Signed-off-by: Antonio Cuadros <[email protected]>

* Hide non public API

Signed-off-by: Antonio Cuadros <[email protected]>

* Fix abort API

Signed-off-by: Antonio Cuadros <[email protected]>

* Minor fix

Signed-off-by: Antonio Cuadros <[email protected]>

* Update

Signed-off-by: Antonio Cuadros <[email protected]>

* Fix

Signed-off-by: Antonio Cuadros <[email protected]>

* Add rclcpp dep

Signed-off-by: Antonio Cuadros <[email protected]>

* Update actions implementation

Signed-off-by: Antonio Cuadros <[email protected]>

* Delete COLCON_IGNORE

Signed-off-by: Antonio Cuadros <[email protected]>

* Fix dependencies export

Signed-off-by: Antonio Cuadros <[email protected]>

* cpplint

Signed-off-by: Antonio Cuadros <[email protected]>

* Initial Ralph changes

Co-authored-by: Ralph Lange <[email protected]>
Signed-off-by: Antonio Cuadros <[email protected]>

* Add RCLC error

Signed-off-by: Antonio Cuadros <[email protected]>

* Refactor pop/take inner functions

Signed-off-by: Antonio Cuadros <[email protected]>

* Argument renaming

Signed-off-by: Antonio Cuadros <[email protected]>

* Argument renaming

Signed-off-by: Antonio Cuadros <[email protected]>

* Rename get API to find

Signed-off-by: Antonio Cuadros <[email protected]>

* Reafctor functio naming

Signed-off-by: Antonio Cuadros <[email protected]>

* Refactor naming

Signed-off-by: Antonio Cuadros <[email protected]>

* Remove explicit == true in conditionals

Signed-off-by: Antonio Cuadros <[email protected]>

* Update rclc/src/rclc/executor.c

Co-authored-by: Ralph Lange <[email protected]>
Signed-off-by: Antonio Cuadros <[email protected]>

* Update rclc/src/rclc/executor.c

Co-authored-by: Ralph Lange <[email protected]>
Signed-off-by: Antonio Cuadros <[email protected]>

* Remove white lines

Signed-off-by: Antonio Cuadros <[email protected]>

* Update rclc/src/rclc/action_server.c

Signed-off-by: Antonio Cuadros <[email protected]>

* Apply suggestions from code review

Co-authored-by: Jan Staschulat <[email protected]>
Signed-off-by: Antonio Cuadros <[email protected]>

* Apply suggestions from code review

Co-authored-by: Jan Staschulat <[email protected]>
Signed-off-by: Antonio Cuadros <[email protected]>

* Add pointer check suggestions

Signed-off-by: Antonio Cuadros <[email protected]>

* Apply suggestions on executor

Signed-off-by: Antonio Cuadros <[email protected]>

* Add check for feedback msg on client

Signed-off-by: Antonio Cuadros <[email protected]>

* Put goal on default switch case

Signed-off-by: Antonio Cuadros <[email protected]>

* Revert code delete

Signed-off-by: Antonio Cuadros <[email protected]>

* Add comments to executor loops

Signed-off-by: Antonio Cuadros <[email protected]>

* Update loop comments

Signed-off-by: Antonio Cuadros <[email protected]>

* Apply for loop style where possible

Signed-off-by: Antonio Cuadros <[email protected]>

* Fix variable name

Signed-off-by: Antonio Cuadros <[email protected]>

* Fix rebase

Signed-off-by: Antonio Cuadros <[email protected]>

* Apply suggestions from code review

Co-authored-by: Jan Staschulat <[email protected]>

* removed unneccary reset of handle->data_available , in _rclc_check_for_new_data this flag is assigned again.

Signed-off-by: Jan Staschulat (CR/ADA1.2) <[email protected]>

* Change put goal function name

Co-authored-by: Jan Staschulat <[email protected]>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Co-authored-by: Brett Downing <[email protected]>
Co-authored-by: Antonio Cuadros <[email protected]>
Co-authored-by: Ralph Lange <[email protected]>
Co-authored-by: Antonio Cuadros <[email protected]>
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