Skip to content

[Foxy backport] Use valid clock in case of issue in rcl_timer_init (#795) Store reference to rcl_clock_t instead of copy (#797)#805

Merged
sloretz merged 2 commits intofoxyfrom
backport_795_797_foxy
Sep 23, 2020
Merged

[Foxy backport] Use valid clock in case of issue in rcl_timer_init (#795) Store reference to rcl_clock_t instead of copy (#797)#805
sloretz merged 2 commits intofoxyfrom
backport_795_797_foxy

Conversation

@sloretz
Copy link
Copy Markdown
Contributor

@sloretz sloretz commented Sep 18, 2020

Backport #795 and #797 to Foxy

brawner and others added 2 commits September 18, 2020 14:53
* Use valid clock in case of issue

Signed-off-by: Stephen Brawner <brawner@gmail.com>

* Cleanup

Signed-off-by: Stephen Brawner <brawner@gmail.com>
Signed-off-by: Shane Loretz <sloretz@osrfoundation.org>
rcl_clock_t can't be trivially copied because adding or removing clock
jump callbacks to a copy will free the pointer held by the original
instance.

Signed-off-by: Shane Loretz<sloretz@openrobotics.org>
Signed-off-by: Shane Loretz <sloretz@osrfoundation.org>
@sloretz sloretz added the bug Something isn't working label Sep 18, 2020
@sloretz sloretz self-assigned this Sep 18, 2020
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.

LGTM.

It'd be nice to get the CI job to turn green before merging. Looks like an infrastructure issue?

@sloretz
Copy link
Copy Markdown
Contributor Author

sloretz commented Sep 19, 2020

@ros-pull-request-builder retest this please

1 similar comment
@jacobperron
Copy link
Copy Markdown
Member

@ros-pull-request-builder retest this please

@sloretz
Copy link
Copy Markdown
Contributor Author

sloretz commented Sep 23, 2020

Looks like PR job is happy and PR is approved. I'll merge with just the PR job since it's a cherry-pick backport.

@sloretz sloretz merged commit c5e903a into foxy Sep 23, 2020
@delete-merged-branch delete-merged-branch bot deleted the backport_795_797_foxy branch September 23, 2020 14:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bug Something isn't working

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants