faraphel/chrony
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't hang in our_round

Browse source 
The routine could loop infinitely when rounding a large value, replace
it with our_lround.
This commit is contained in:
Miroslav Lichvar 2010-06-07 14:14:53 +02:00
parent 597bb80d18
commit f6320e7050
1 changed files with 3 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
sys_linux.c
View file

@ -119,18 +119,9 @@ static void handle_end_of_slew(void *anything);
/* ================================================== */ /* ================================================== */
inline static int
our_round(double x) {
int y;
y = (int)(x + 0.5);
while ((double)y < x - 0.5) y++;
while ((double)y > x + 0.5) y--;
return y;
}
inline static long inline static long
our_lround(double x) { our_round(double x) {
int y; long y;
if (x > 0.0) if (x > 0.0)
y = x + 0.5; y = x + 0.5;
@ -398,7 +389,7 @@ initiate_slew(void)
if (fabs(offset_register) < MAX_ADJUST_WITH_ADJTIME) { if (fabs(offset_register) < MAX_ADJUST_WITH_ADJTIME) {
/* Use adjtime to do the shift */ /* Use adjtime to do the shift */
offset = our_lround(1.0e6 * -offset_register); offset = our_round(1.0e6 * -offset_register);
offset_register += offset * 1e-6; offset_register += offset * 1e-6;