777be10eb
Denys Vlasenko
2013-12-07
Subject
ntpd: do not invalidate datapoints after step
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
networking/ntpd.c+14 -2
| @@ -678,6 +678,18 @@ reset_peer_stats(peer_t *p, double offset) | |
| int i; | |
| bool small_ofs = fabs(offset) < 16 * STEP_THRESHOLD; | |
| + | /* Used to set p->filter_datapoint[i].d_dispersion = MAXDISP |
| + | * and clear reachable bits, but this proved to be too agressive: |
| + | * after step (tested with suspinding laptop for ~30 secs), |
| + | * this caused all previous data to be considered invalid, |
| + | * making us needing to collect full ~8 datapoins per peer |
| + | * after step in order to start trusting them. |
| + | * In turn, this was making poll interval decrease even after |
| + | * step was done. (Poll interval decreases already before step |
| + | * in this scenario, because we see large offsets and end up with |
| + | * no good peer to select). |
| + | */ |
| + | |
| for (i = 0; i < NUM_DATAPOINTS; i++) { | |
| if (small_ofs) { | |
| p->filter_datapoint[i].d_recv_time += offset; | |
| @@ -691,13 +703,13 @@ reset_peer_stats(peer_t *p, double offset) | |
| } else { | |
| p->filter_datapoint[i].d_recv_time = G.cur_time; | |
| p->filter_datapoint[i].d_offset = 0; | |
| - | p->filter_datapoint[i].d_dispersion = MAXDISP; |
| + | /*p->filter_datapoint[i].d_dispersion = MAXDISP;*/ |
| } | |
| } | |
| if (small_ofs) { | |
| p->lastpkt_recv_time += offset; | |
| } else { | |
| - | p->reachable_bits = 0; |
| + | /*p->reachable_bits = 0;*/ |
| p->lastpkt_recv_time = G.cur_time; | |
| } | |
| filter_datapoints(p); /* recalc p->filter_xxx */ | |