Skip to content

chore: merge from humble 16.0.5 - #4

Merged
23 commits merged into
humble_tracepoint_addedfrom
work_for_update_humble_tracepoint_added
Aug 28, 2023
Merged

23 commits merged into
humble_tracepoint_addedfrom
work_for_update_humble_tracepoint_added

Conversation

@ghost

@ghost ghost commented Aug 25, 2023 •

Copy link
Copy Markdown
  • Merge from the latest version of Humble branch (16.0.5) to humble_tracepoint_added
  • Create commits for merging 16.0.2, 16.0.3, 16.0.4

mergify Bot and others added 23 commits June 15, 2022 15:02
This fails with g++ -std=gnu++20.

Signed-off-by: Jochen Sprickerhof <git@jochen.sprickerhof.de>
(cherry picked from commit 02802bc)

Co-authored-by: Jochen Sprickerhof <github@jochen.sprickerhof.de>
* use regex for wildcard matching (ros2#1839)

* use regex for wildcard matching

Co-authored-by: Aaron Lipinski <aaron.lipinski@roboticsplus.co.nz>
Signed-off-by: Chen Lihui <lihui.chen@sony.com>

* use map to process the content of parameter file by order

Signed-off-by: Chen Lihui <lihui.chen@sony.com>

* add more test cases

Signed-off-by: Chen Lihui <lihui.chen@sony.com>

* try to not decrease the performance and make the param win last

Signed-off-by: Chen Lihui <lihui.chen@sony.com>

* update node name

Signed-off-by: Chen Lihui <lihui.chen@sony.com>

* update document comment

Signed-off-by: Chen Lihui <lihui.chen@sony.com>

* add more test for parameter_map_from

Signed-off-by: Chen Lihui <lihui.chen@sony.com>

Co-authored-by: Aaron Lipinski <aaron.lipinski@roboticsplus.co.nz>
(cherry picked from commit 6dd3a03)

* not to break ABI

Signed-off-by: Chen Lihui <lihui.chen@sony.com>

Signed-off-by: Chen Lihui <lihui.chen@sony.com>
Co-authored-by: Chen Lihui <lihui.chen@sony.com>
* fix mismatched issue if uzing zero_allocated

Signed-off-by: Chen Lihui <lihui.chen@sony.com>
(cherry picked from commit 9784391)

Co-authored-by: Chen Lihui <lihui.chen@sony.com>
Signed-off-by: Audrow Nash <audrow@openrobotics.org>
* Add a test case

a subscriber on a new executor with a callback group triggered to receive a message

Signed-off-by: Chen Lihui <lihui.chen@sony.com>

* fix flaky and not to use spin_some

Signed-off-by: Chen Lihui <lihui.chen@sony.com>

* update comment

Signed-off-by: Chen Lihui <lihui.chen@sony.com>

* update for not using anti-pattern source code

Signed-off-by: Chen Lihui <lihui.chen@sony.com>

* add a notify guard condition for callback group

Co-authored-by: William Woodall <william@osrfoundation.org>
Signed-off-by: Chen Lihui <lihui.chen@sony.com>

* Notify guard condition of Node not to be used in Executor

it is only for the waitset of GraphListener

Signed-off-by: Chen Lihui <lihui.chen@sony.com>

* put code in the try catch

Signed-off-by: Chen Lihui <lihui.chen@sony.com>

* defer to create guard condition

Signed-off-by: Chen Lihui <lihui.chen@sony.com>

* use context directly for the create function

Signed-off-by: Chen Lihui <lihui.chen@sony.com>

* cpplint

Signed-off-by: Chen Lihui <lihui.chen@sony.com>

* fix that some case might call add_node after shutdown

Signed-off-by: Chen Lihui <lihui.chen@sony.com>

* nitpick and fix some potential bug

Signed-off-by: Chen Lihui <lihui.chen@sony.com>

* add sanity check as some case might not create notify guard condition after shutdown

Signed-off-by: Chen Lihui <lihui.chen@sony.com>

* Cleanup includes.

Signed-off-by: Chris Lalancette <clalancette@openrobotics.org>

* remove destroy method

make a callback group can only create one guard condition

Signed-off-by: Chen Lihui <lihui.chen@sony.com>

* remove limitation that guard condition can not be re-created in callback group

Signed-off-by: Chen Lihui <lihui.chen@sony.com>

Signed-off-by: Chen Lihui <lihui.chen@sony.com>
Signed-off-by: Chris Lalancette <clalancette@openrobotics.org>
Co-authored-by: William Woodall <william@osrfoundation.org>
Co-authored-by: Chris Lalancette <clalancette@openrobotics.org>
(cherry picked from commit d119157)

Co-authored-by: Chen Lihui <lihui.chen@sony.com>
…2#2065)

* fix nullptr dereference in prune_requests_older_than

Signed-off-by: akela1101 <akela1101@gmail.com>

* add tests for prune_requests_older_than

Signed-off-by: akela1101 <akela1101@gmail.com>

* Update rclcpp/test/rclcpp/test_client.cpp

Co-authored-by: Chen Lihui <lihui.chen@sony.com>
Signed-off-by: akela1101 <akela1101@gmail.com>

Signed-off-by: akela1101 <akela1101@gmail.com>
Co-authored-by: Chen Lihui <lihui.chen@sony.com>
(cherry picked from commit 1ac37b6)

Co-authored-by: andrei <akela1101@gmail.com>
…ffer (ros2#2061) (ros2#2070)

Signed-off-by: Alberto Soragna <alberto.soragna@gmail.com>

Signed-off-by: Alberto Soragna <alberto.soragna@gmail.com>
(cherry picked from commit 3fb012e)

Co-authored-by: Alberto Soragna <alberto.soragna@gmail.com>
…) (ros2#2076)

Signed-off-by: Lei Liu <Lei.Liu.AP@sony.com>
(cherry picked from commit 66b1944)

Co-authored-by: Lei Liu <64953129+llapx@users.noreply.github.com>
Signed-off-by: Audrow Nash <audrow@openrobotics.org>
Signed-off-by: Tomoya Fujita <Tomoya.Fujita@sony.com>
(cherry picked from commit 1a796b5)

Co-authored-by: Tomoya Fujita <Tomoya.Fujita@sony.com>
backport of ros2#2132

Signed-off-by: Tomoya Fujita <Tomoya.Fujita@sony.com>
Co-authored-by: Chen Lihui <lihui.chen@sony.com>
…os2#2133)" (ros2#2148)

This reverts commit c8ac675.

Signed-off-by: Tomoya Fujita <Tomoya.Fujita@sony.com>
…sued. (ros2#2133)" (ros2#2148)" (ros2#2152)

This reverts commit 19a666f.

Signed-off-by: Tomoya Fujita <Tomoya.Fujita@sony.com>
Signed-off-by: Audrow Nash <audrow@intrinsic.ai>
(cherry picked from commit c091fe1)

Co-authored-by: methylDragon <methylDragon@gmail.com>
…2167)

If the intraprocess buffer still has data after taking, re-trigger the
guard condition to ensure that the executor will continue to service it,
even if incoming publications stop.

Signed-off-by: Michael Carroll <michael@openrobotics.org>
(cherry picked from commit 5f9695a)

Co-authored-by: Michael Carroll <michael@openrobotics.org>
…os2#2219) (ros2#2223)

ros2#2167 (comment)

Signed-off-by: Tomoya Fujita <Tomoya.Fujita@sony.com>
(cherry picked from commit fe2e0e4)

Co-authored-by: Tomoya Fujita <Tomoya.Fujita@sony.com>
…os2#2183)

* add initially-failing test case

* apply changes to LifecycleNodeInterfaceImpl from ros2#1756

* add static member to State for managing state_handle_ access

* allow parallel read access in MutexMap

Signed-off-by: Joe Schornak <joe.schornak@gmail.com>
Signed-off-by: Audrow Nash <audrow@intrinsic.ai>
Merge commit 'ae8b033ae01601475104bf9e4c2350b98c9560c4' into work_for_update_humble_tracepoint_added
Merge commit '9171122eae940504200889b2a7b12344fa7c0c8b' into work_for_update_humble_tracepoint_added
Merge commit '00ef09cbf34563db27b9aac9b0206eb142cf3995' into work_for_update_humble_tracepoint_added
Merge commit '52327dd3a3b0fc47446ce86ecaf16fdde4fc4a60' into work_for_update_humble_tracepoint_added
@ghost ghost changed the title Work for update humble tracepoint added chore: merge from humble 16.0.5 Aug 25, 2023
@ghost
ghost requested review from nabetetsu and ymski August 28, 2023 07:17

@ymski ymski left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

LGTM

@ghost
ghost merged commit 58a5228 into humble_tracepoint_added Aug 28, 2023
@ghost
ghost deleted the work_for_update_humble_tracepoint_added branch August 28, 2023 07:47
This pull request was closed.
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.

3 participants