Skip to content

use dynamic_pointer_cast to detect allocator mismatch in intra process manager (backport #1643)#1645

Merged
jacobperron merged 6 commits intofoxyfrom
mergify/bp/foxy/pr-1643
Oct 12, 2021
Merged

use dynamic_pointer_cast to detect allocator mismatch in intra process manager (backport #1643)#1645
jacobperron merged 6 commits intofoxyfrom
mergify/bp/foxy/pr-1643

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify bot commented Apr 29, 2021

This is an automatic backport of pull request #1643 done by Mergify.
Cherry-pick of 79c2dd8 has failed:

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

You are currently cherry-picking commit 79c2dd8e.
  (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:   rclcpp/test/rclcpp/CMakeLists.txt
	modified:   rclcpp/test/rclcpp/test_intra_process_manager.cpp
	new file:   rclcpp/test/rclcpp/test_intra_process_manager_with_allocators.cpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   rclcpp/include/rclcpp/experimental/intra_process_manager.hpp

To fix up this pull request, you can check it out locally. See documentation: https://help.github.com/articles/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/

…s manager (#1643)

* use dynamic_pointer_cast to detect allocator mismatch in intra process manager

Signed-off-by: William Woodall <william@osrfoundation.org>

* add test case for mismatched allocators

Signed-off-by: William Woodall <william@osrfoundation.org>

* forward template arguments to avoid mismatched types in intra process manager

Signed-off-by: William Woodall <william@osrfoundation.org>

* style fixes

Signed-off-by: William Woodall <william@osrfoundation.org>

* refactor to test message address and count, more DRY

Signed-off-by: William Woodall <william@osrfoundation.org>

* update copyright

Signed-off-by: William Woodall <william@osrfoundation.org>

* fix typo

Signed-off-by: William Woodall <william@osrfoundation.org>

Co-authored-by: Michel Hidalgo <michel@ekumenlabs.com>

Co-authored-by: Michel Hidalgo <michel@ekumenlabs.com>
(cherry picked from commit 79c2dd8)

# Conflicts:
#	rclcpp/include/rclcpp/experimental/intra_process_manager.hpp
Signed-off-by: Ivan Santiago Paunovic <ivanpauno@ekumenlabs.com>
@ivanpauno
Copy link
Copy Markdown
Member

CI:

  • Linux Build Status
  • Linux-aarch64 Build Status
  • macOS Build Status
  • Windows Build Status

@ivanpauno
Copy link
Copy Markdown
Member

CI:

  • Linux Build Status
  • Linux-aarch64 Build Status
  • macOS Build Status
  • Windows Build Status

Signed-off-by: Ivan Santiago Paunovic <ivanpauno@ekumenlabs.com>
Signed-off-by: Ivan Santiago Paunovic <ivanpauno@ekumenlabs.com>
Signed-off-by: Ivan Santiago Paunovic <ivanpauno@ekumenlabs.com>
@ivanpauno
Copy link
Copy Markdown
Member

Conflicts were solved, I need to investigate a bit why the test is failing.

Signed-off-by: Ivan Santiago Paunovic <ivanpauno@ekumenlabs.com>
@ivanpauno
Copy link
Copy Markdown
Member

ivanpauno commented Oct 1, 2021

CI:

  • Linux Build Status
  • Linux-aarch64 Build Status
  • macOS Build Status
  • Windows Build Status

@ivanpauno ivanpauno requested a review from jacobperron October 12, 2021 18:28
@ivanpauno
Copy link
Copy Markdown
Member

failures seem unrelated

Copy link
Copy Markdown
Member

@jacobperron jacobperron left a comment

Choose a reason for hiding this comment

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

failures seem unrelated

Indeed, they are unrelated.

@jacobperron jacobperron merged commit e70a07d into foxy Oct 12, 2021
@delete-merged-branch delete-merged-branch bot deleted the mergify/bp/foxy/pr-1643 branch October 12, 2021 19:24
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