Revert "Add Clock::sleep_until method (#1748)" #1793
Merged
+2
−300
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This reverts commit 81df584. Signed-off-by: Jorge Perez <jjperez@ekumenlabs.com>
0cf60cd to
fb643a0
Compare
|
@emersonknapp FYI. |
|
I'll wait until I verify that the PR also introduced the osx regressions before checking this PR ready for review.
|
|
CI looks OK, but it's been some days, rebuilding JIC:
|
|
Standard CI up to
|
|
@ros-pull-request-builder retest this please |
clalancette
approved these changes
Oct 5, 2021
|
Noted - i think reverting was the right move, better to get back to green. |
sloretz
added a commit
that referenced
this pull request
Nov 3, 2021
sloretz
added a commit
that referenced
this pull request
Nov 3, 2021
sloretz
added a commit
that referenced
this pull request
Nov 5, 2021
* Revert "Revert "Add Clock::sleep_until method (#1748)" (#1793)" This reverts commit d04319a. Signed-off-by: Shane Loretz <sloretz@osrfoundation.org> * Context, Shutdown Callback, Condition Var per call The `Clock` doesn't have enough information to know which Context should wake it on shutdown, so this adds a Context as an argument to sleep_until(). Since the context is per call, the shutdown callback is also registered per call and cannot be stored on impl_. The condition_variable is also unique per call to reduce spurious wakeups when multiple threads sleep on the same clock. Signed-off-by: Shane Loretz <sloretz@osrfoundation.org> * Throw if until has wrong clock type Signed-off-by: Shane Loretz <sloretz@osrfoundation.org> * unnecessary newline Signed-off-by: Shane Loretz <sloretz@osrfoundation.org> * Shorten line Signed-off-by: Shane Loretz <sloretz@osrfoundation.org> * Fix time jump thresholds and add ROS time test Use -1 and 1 thresholds because 0 and 0 is supposed to disable the callbacks Signed-off-by: Shane Loretz <sloretz@osrfoundation.org> * Shorten line Signed-off-by: Shane Loretz <sloretz@osrfoundation.org> * rclcpp::ok() -> context->is_valid() Signed-off-by: Shane Loretz <sloretz@osrfoundation.org> * No pre-jump handler instead of noop handler Signed-off-by: Shane Loretz <sloretz@osrfoundation.org> * If ros_time_is_active errors, let it throw Signed-off-by: Shane Loretz <sloretz@osrfoundation.org> * Get time source change from callback to avoid race if ROS time toggled quickly Signed-off-by: Shane Loretz <sloretz@osrfoundation.org> * Fix threshold and no pre-jump callback Signed-off-by: Shane Loretz <sloretz@osrfoundation.org> * Use RCUTILS_MS_TO_NS macro Signed-off-by: Shane Loretz <sloretz@osrfoundation.org> * Explicit cast for duration to system time Signed-off-by: Shane Loretz <sloretz@osrfoundation.org> * Throws at the end of docblock Signed-off-by: Shane Loretz <sloretz@osrfoundation.org> * Add tests for invalid and non-global contexts Signed-off-by: Shane Loretz <sloretz@osrfoundation.org>
Bi0T1N
pushed a commit
to Bi0T1N/rclcpp
that referenced
this pull request
Dec 15, 2021
Bi0T1N
pushed a commit
to Bi0T1N/rclcpp
that referenced
this pull request
Dec 15, 2021
* Revert "Revert "Add Clock::sleep_until method (ros2#1748)" (ros2#1793)" This reverts commit d04319a. Signed-off-by: Shane Loretz <sloretz@osrfoundation.org> * Context, Shutdown Callback, Condition Var per call The `Clock` doesn't have enough information to know which Context should wake it on shutdown, so this adds a Context as an argument to sleep_until(). Since the context is per call, the shutdown callback is also registered per call and cannot be stored on impl_. The condition_variable is also unique per call to reduce spurious wakeups when multiple threads sleep on the same clock. Signed-off-by: Shane Loretz <sloretz@osrfoundation.org> * Throw if until has wrong clock type Signed-off-by: Shane Loretz <sloretz@osrfoundation.org> * unnecessary newline Signed-off-by: Shane Loretz <sloretz@osrfoundation.org> * Shorten line Signed-off-by: Shane Loretz <sloretz@osrfoundation.org> * Fix time jump thresholds and add ROS time test Use -1 and 1 thresholds because 0 and 0 is supposed to disable the callbacks Signed-off-by: Shane Loretz <sloretz@osrfoundation.org> * Shorten line Signed-off-by: Shane Loretz <sloretz@osrfoundation.org> * rclcpp::ok() -> context->is_valid() Signed-off-by: Shane Loretz <sloretz@osrfoundation.org> * No pre-jump handler instead of noop handler Signed-off-by: Shane Loretz <sloretz@osrfoundation.org> * If ros_time_is_active errors, let it throw Signed-off-by: Shane Loretz <sloretz@osrfoundation.org> * Get time source change from callback to avoid race if ROS time toggled quickly Signed-off-by: Shane Loretz <sloretz@osrfoundation.org> * Fix threshold and no pre-jump callback Signed-off-by: Shane Loretz <sloretz@osrfoundation.org> * Use RCUTILS_MS_TO_NS macro Signed-off-by: Shane Loretz <sloretz@osrfoundation.org> * Explicit cast for duration to system time Signed-off-by: Shane Loretz <sloretz@osrfoundation.org> * Throws at the end of docblock Signed-off-by: Shane Loretz <sloretz@osrfoundation.org> * Add tests for invalid and non-global contexts Signed-off-by: Shane Loretz <sloretz@osrfoundation.org>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This reverts commit 81df584.
Attempts to address
nighly_osx_debugtest regressions.