Added timeout_sec_to_nsec utility #160
Merged
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
Executor timeouts now block if None or Negative Executor is only non-blocking if timeout is zero
mikaelarguedas
approved these changes
Nov 28, 2017
| Python tends to use floating point numbers in seconds for timeouts. This utility converts a | ||
| python-style timeout to an integer in nanoseconds that can be used by rcl_wait. | ||
|
|
||
| :param timeout_sec: Seconds to wait. Block forever if None or negative. Don't wait if < 1ns |
There was a problem hiding this comment.
Nit: Don't wait if 0 <= timeout_sec < 1ns
maybe it's clear enough as is
There was a problem hiding this comment.
If it is okay with you, I would like to leave this as is to avoid wrapping the line.
rclpy/test/test_utilities.py
Outdated
| self.assertGreater(0, rclpy.utilities.timeout_sec_to_nsec(None)) | ||
| self.assertGreater(0, rclpy.utilities.timeout_sec_to_nsec(-1)) | ||
| self.assertEqual(0, rclpy.utilities.timeout_sec_to_nsec(0)) | ||
| self.assertEqual(int(1.5 * S_TO_NS), rclpy.utilities.timeout_sec_to_nsec(1.5)) |
There was a problem hiding this comment.
Nit: should we add a test to show that something < 1ns results in a timeout of 0?
|
OSX job failed because the node died. Jenkins auto-retriggered it and the second build succeeded: http://ci.ros2.org/job/ci_osx/2965/. I think this can be merged. |
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.
Taken from #140 / #127. It adds a utility for converting timeouts from seconds to nanoseconds for rcl_wait. Additionally executor timeouts now block if None or negative and are only non-blocking if the timeout is zero.
CI