760d03569
Miroslav Lichvar
2014-10-05
Subject
ntpd: calculate offset to jitter ratio before updating jitter
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
networking/ntpd.c+8 -4
| @@ -1488,12 +1488,19 @@ update_local_clock(peer_t *p) | |
| } else { /* abs_offset <= STEP_THRESHOLD */ | |
| + | /* The ratio is calculated before jitter is updated to make |
| + | * poll adjust code more sensitive to large offsets. |
| + | */ |
| + | G.offset_to_jitter_ratio = abs_offset / G.discipline_jitter; |
| + | |
| /* Compute the clock jitter as the RMS of exponentially | |
| * weighted offset differences. Used by the poll adjust code. | |
| */ | |
| etemp = SQUARE(G.discipline_jitter); | |
| dtemp = SQUARE(offset - G.last_update_offset); | |
| G.discipline_jitter = SQRT(etemp + (dtemp - etemp) / AVG); | |
| + | if (G.discipline_jitter < G_precision_sec) |
| + | G.discipline_jitter = G_precision_sec; |
| switch (G.discipline_state) { | |
| case STATE_NSET: | |
| @@ -1570,10 +1577,6 @@ update_local_clock(peer_t *p) | |
| } | |
| } | |
| - | if (G.discipline_jitter < G_precision_sec) |
| - | G.discipline_jitter = G_precision_sec; |
| - | G.offset_to_jitter_ratio = abs_offset / G.discipline_jitter; |
| - | |
| G.reftime = G.cur_time; | |
| G.ntp_status = p->lastpkt_status; | |
| G.refid = p->lastpkt_refid; | |
| @@ -2111,6 +2114,7 @@ static NOINLINE void ntp_init(char **argv) | |
| bb_error_msg_and_die(bb_msg_you_must_be_root); | |
| /* Set some globals */ | |
| + | G.discipline_jitter = G_precision_sec; |
| G.stratum = MAXSTRAT; | |
| if (BURSTPOLL != 0) | |
| G.poll_exp = BURSTPOLL; /* speeds up initial sync */ | |