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

[dashing] Backports #1023 #1167 #1171

Merged
merged 2 commits into from
Jul 2, 2020
Merged

Conversation

ivanpauno
Copy link
Member

@ivanpauno ivanpauno commented Jun 11, 2020

This PR will be merged with --ff-only, to preserve commit hashes.
Backports #1023 #1167.

#1167 was modified, as #844 wasn't backported to eloquent.
I don't think it's a good idea to backport #844, as it introduces a behavior change that can affect some use cases (see discussion in #1156).

@ivanpauno ivanpauno added the in review Waiting for review (Kanban column) label Jun 11, 2020
@ivanpauno ivanpauno self-assigned this Jun 11, 2020
@ivanpauno ivanpauno force-pushed the ivanpauno/dashing-#1023-#1167 branch from 7b60efd to 61d3a74 Compare June 22, 2020 19:58
@ivanpauno
Copy link
Member Author

@nuclearsandwich friednly ping

@nuclearsandwich
Copy link
Member

I will wait until tomorrow to merge, so all nightly jobs were ran once with these changes in.

This line doesn't make sense to me. Unmerged changes won't be part of nightlies and ci.ros2.org doesn't run Dashing nightlies.

@ivanpauno
Copy link
Member Author

This line doesn't make sense to me. Unmerged changes won't be part of nightlies and ci.ros2.org doesn't run Dashing nightlies.

Sorry, that is old.

I merged the original PR the same day I opened the backport.
CI jobs in the original PR were more limited than full CI.
I wanted to double check that there were no regressions in full CI.

That has been checked, so the comment doesn't apply anymore.

@ivanpauno
Copy link
Member Author

The test failing in the PR checker is a known flaky test.

@ivanpauno
Copy link
Member Author

@nuclearsandwich friendly ping

@ivanpauno ivanpauno requested a review from hidmic July 1, 2020 12:03
Copy link
Contributor

@hidmic hidmic left a comment

Choose a reason for hiding this comment

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

LGTM but for one question

rclcpp/include/rclcpp/executor.hpp Show resolved Hide resolved
@ivanpauno ivanpauno force-pushed the ivanpauno/dashing-#1023-#1167 branch from 61d3a74 to 8364d67 Compare July 2, 2020 19:12
@ivanpauno
Copy link
Member Author

@hidmic based on the failing PR check, spin_until_future_complete will be solved at compile time in another package and it needs to link against spin_once_impl.

I will undo the last change and use RCLCPP_PUBLIC again.

DongheeYe and others added 2 commits July 2, 2020 16:41
Signed-off-by: Donghee Ye <donghee.ye@samsung.com>
Signed-off-by: Ivan Santiago Paunovic <ivanpauno@ekumenlabs.com>
Signed-off-by: Ivan Santiago Paunovic <ivanpauno@ekumenlabs.com>
@ivanpauno ivanpauno force-pushed the ivanpauno/dashing-#1023-#1167 branch from 8364d67 to 66e9a78 Compare July 2, 2020 19:41
@ivanpauno ivanpauno requested a review from hidmic July 2, 2020 20:15
@hidmic
Copy link
Contributor

hidmic commented Jul 2, 2020

@hidmic based on the failing PR check, spin_until_future_complete will be solved at compile time in another package and it needs to link against spin_once_impl.

Oh, right, this is a template class. Hmm, that means that all downstream packages have to be recompiled to make use of this :/

@ivanpauno
Copy link
Member Author

Oh, right, this is a template class.

The method is a template, not the class.

Hmm, that means that all downstream packages have to be recompiled to make use of this :/

Users will need to recompile to get the fix, but users won't have to recompile if they are not interested in this fix (i.e. this is ABI compatible).
For fixes in templates (and in inline functions), there's no other way to get a fix than recompiling (in the extreme case of a header only library, you always have to recompile to get the latest fixes).

Copy link
Contributor

@hidmic hidmic left a comment

Choose a reason for hiding this comment

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

LGTM

@hidmic
Copy link
Contributor

hidmic commented Jul 2, 2020

Users will need to recompile to get the fix, but users won't have to recompile if they are not interested in this fix (i.e. this is ABI compatible).

Yeah, I know. It striked me as a bit odd, but it won't do any harm. The added throw could mean trouble but I'm sure spin_once() was already throwing.

@ivanpauno ivanpauno merged commit 8906c9e into dashing Jul 2, 2020
@clalancette clalancette deleted the ivanpauno/dashing-#1023-#1167 branch January 15, 2021 16:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
in review Waiting for review (Kanban column)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants