std: Fix sub-second Condvar::wait_timeout_ms #27373
Merged
+14
−13
Conversation
This file contains hidden or 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
|
(rust_highfive has picked a reviewer for you, use r? to override) |
|
cc @carllerche r? @brson Also nominating for beta as this is a somewhat serious bug |
alexcrichton
added
beta-nominated
|
cc @sfackler |
| let seconds = dur.secs() as libc::time_t; | ||
| let timeout = match sys_now.tv_sec.checked_add(seconds) { | ||
|
|
||
| let timeout = match (sys_now.tv_sec + extra).checked_add(seconds) { |
There was a problem hiding this comment.
Only one checked_add here, not 2?
There was a problem hiding this comment.
I figured that gettimeofday won't return a value that is 1 away from overflowing, but we don't control seconds + sys_now.tv_sec so that still needs to be checked.
There was a problem hiding this comment.
It will if you set your system clock that way :P
There was a problem hiding this comment.
I agree with @sfackler. The bad input is possible and should be accounted for.
brson
added
the
beta-accepted
The API we're calling requires us to pass an absolute point in time as an argument (`pthread_cond_timedwait`) so we call `gettimeofday` ahead of time to then add the specified duration to. Unfortuantely the current "add the duration" logic forgot to take into account the current time's sub-second precision (e.g. the `tv_usec` field was ignored), causing sub-second duration waits to return spuriously.
alexcrichton
force-pushed
the
fix-wait-timeout-ms
branch
from
9803374 to
43b2c47
Compare
|
Updated to use |
|
@bors: r+ |
|
📌 Commit 43b2c47 has been approved by |
Manishearth
added a commit
to Manishearth/rust
that referenced
this pull request
Jul 29, 2015
…=brson The API we're calling requires us to pass an absolute point in time as an argument (`pthread_cond_timedwait`) so we call `gettimeofday` ahead of time to then add the specified duration to. Unfortuantely the current "add the duration" logic forgot to take into account the current time's sub-second precision (e.g. the `tv_usec` field was ignored), causing sub-second duration waits to return spuriously.
Merged
|
@bors: p=1 (merging to beta) |
brson
added
beta-accepted
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.
The API we're calling requires us to pass an absolute point in time as an
argument (
pthread_cond_timedwait) so we callgettimeofdayahead of time tothen add the specified duration to. Unfortuantely the current "add the duration"
logic forgot to take into account the current time's sub-second precision (e.g.
the
tv_usecfield was ignored), causing sub-second duration waits to returnspuriously.