Fix SLI sleep function (fixes #973) #976
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
remove duplicity of implementation for int and double arg.
heplesser
requested review from
jougs and
hakonsbm
and removed request for
jougs
heplesser
added
ZC: Interpreter
hakonsbm
suggested changes
Jun 18, 2018
sli/slicontrol.cc
Outdated
| { | ||
| throw BadParameterValue( String::compose( | ||
| "t < %1s required.", std::numeric_limits< int >::max() ) ); |
There was a problem hiding this comment.
The limit is around 68 years (for 32-bit int), so I think it does not really matter much and avoids any potential corner cases. Therefore, I chose the simpler <.
hakonsbm
approved these changes
Jun 18, 2018
|
@espenhgn Could you check if this works for you? |
|
Hi, |
jougs
requested changes
Jul 3, 2018
sli/slicontrol.cc
Outdated
| "t < %1s required.", std::numeric_limits< int >::max() ) ); | ||
| } | ||
| else if ( t > 0 ) | ||
| { |
There was a problem hiding this comment.
I think this cascade of checks would be nicer and more readable if there were
- stand-alone
ifs for the checks, whichthrowin case of a parameter error (i.e. noelse ifs) - no
else ifblock at the end, but the code from that just behind the checks, thus rather having simpler code than treating the case oft == 0differently fromt > 0. The overhead is probably negligible.
There was a problem hiding this comment.
@jougs Thank you for your feedback! I have now tidied the code as you suggested.
jougs
reviewed
Jul 3, 2018
sli/slicontrol.cc
Outdated
|
|
||
| // on some systems, select may modify tv, therefore, it cannot be const | ||
| struct timeval tv = { t_sec, t_musec }; | ||
| select( 0, 0, 0, 0, &tv ); |
There was a problem hiding this comment.
On second thought, I find it a bit weird to use select here instead of just
#include <unistd.h>
...
usleep(microseconds);Can you please change (or at least comment on) this? Thanks!
|
@jougs I now replaced |
jougs
approved these changes
Jul 3, 2018
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.
Revise implementation of sleep to work correctly with 32-bit signed int; remove duplicity of implementation for int and double arg. This eliminates a warning about narrowing, which is an error in strict C++11.
Also, it seemed that sleep times given as doubles were not handled correctly in the past, e.g. 2.75 s.
This fixes #973.