i#1815: fix unit_test failure on macos sierra due to gettimeofday #2247
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
On MacOS before Sierra, gettimeofday returns usecs:secs and does not set the timeval struct. Sierra correctly fills the timeval struct.
derekbruening
requested changes
Feb 28, 2017
| # define MACOS_VERSION_YOSEMITE 14 | ||
| # define MACOS_VERSION_MAVERICKS 13 | ||
| # define MACOS_VERSION_MOUNTAIN_LION 12 | ||
| # define MACOS_VERSION_LION 11 |
There was a problem hiding this comment.
(Looks good static in this .c for now, but in the future we might want to consider exposing these via the dr_get_os_version() API.)
There was a problem hiding this comment.
Agree. I added in a comment to xref i#1404.
core/unix/os.c
Outdated
| /* MacOS before Sierra returns usecs:secs and does not set the timeval struct. */ | ||
| if (macos_version < MACOS_VERSION_SIERRA) { | ||
| if ((int)val < 0) | ||
| return 0; |
There was a problem hiding this comment.
style: indentation off
core/unix/os.c
Outdated
| if ((int)val > 0) { | ||
| current_time.tv_sec = (uint) val; | ||
| current_time.tv_usec = (uint)(val >> 32); | ||
| } else { |
There was a problem hiding this comment.
This else could be removed as we'll hit the else down below?
core/unix/os.c
Outdated
| if ((int)val > 0) { | ||
| current_time.tv_sec = (uint) val; | ||
| current_time.tv_usec = (uint)(val >> 32); | ||
| } else { |
There was a problem hiding this comment.
This else could also be removed?
derekbruening
approved these changes
Mar 1, 2017
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.
On MacOS before Sierra, gettimeofday returns usecs:secs and does not
set the timeval struct. Sierra correctly fills the timeval struct.