X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Ftimesync%2Ftimesyncd.c;h=f6c96d3d1618e72b945c6d3188b82e061ea32977;hb=d67006fe539cb024440e06053742e8c7478ac0c1;hp=5bd61dd07c6061b1d6f9a295b2ecedd379a104ab;hpb=687ed1237b20a6db174fd0b372df20fa9a3a23c2;p=elogind.git diff --git a/src/timesync/timesyncd.c b/src/timesync/timesyncd.c index 5bd61dd07..f6c96d3d1 100644 --- a/src/timesync/timesyncd.c +++ b/src/timesync/timesyncd.c @@ -154,23 +154,12 @@ static double ntp_ts_to_d(const struct ntp_ts *ts) { return be32toh(ts->sec) + ((double)be32toh(ts->frac) / UINT_MAX); } -static double tv_to_d(const struct timeval *tv) { - return tv->tv_sec + (1.0e-6 * tv->tv_usec); -} - static double ts_to_d(const struct timespec *ts) { return ts->tv_sec + (1.0e-9 * ts->tv_nsec); } -static void d_to_tv(double d, struct timeval *tv) { - tv->tv_sec = (long)d; - tv->tv_usec = (d - tv->tv_sec) * 1000 * 1000; - - /* the kernel expects -0.3s as {-1, 7000.000} */ - if (tv->tv_usec < 0) { - tv->tv_sec -= 1; - tv->tv_usec += 1000 * 1000; - } +static double tv_to_d(const struct timeval *tv) { + return tv->tv_sec + (1.0e-6 * tv->tv_usec); } static double square(double d) { @@ -343,19 +332,28 @@ static int sntp_adjust_clock(Manager *m, double offset, int leap_sec) { * syncs the system time periodically to the hardware clock. */ if (fabs(offset) < NTP_MAX_ADJUST) { - tmx.modes = ADJ_STATUS | ADJ_OFFSET | ADJ_TIMECONST | ADJ_MAXERROR | ADJ_ESTERROR; + tmx.modes = ADJ_STATUS | ADJ_NANO | ADJ_OFFSET | ADJ_TIMECONST | ADJ_MAXERROR | ADJ_ESTERROR; tmx.status = STA_PLL; - tmx.offset = offset * USEC_PER_SEC; - tmx.constant = log2i(m->poll_interval_usec / USEC_PER_SEC) - 6; + tmx.offset = offset * NSEC_PER_SEC; + tmx.constant = log2i(m->poll_interval_usec / USEC_PER_SEC) - 4; tmx.maxerror = 0; tmx.esterror = 0; - log_debug(" adjust (slew): %+f sec\n", (double)tmx.offset / USEC_PER_SEC); + log_debug(" adjust (slew): %+.3f sec\n", offset); } else { - tmx.modes = ADJ_SETOFFSET; - d_to_tv(offset, &tmx.time); + tmx.modes = ADJ_SETOFFSET | ADJ_NANO; + + /* ADJ_NANO uses nanoseconds in the microseconds field */ + tmx.time.tv_sec = (long)offset; + tmx.time.tv_usec = (offset - tmx.time.tv_sec) * NSEC_PER_SEC; + + /* the kernel expects -0.3s as {-1, 7000.000.000} */ + if (tmx.time.tv_usec < 0) { + tmx.time.tv_usec -= 1; + tmx.time.tv_usec += NSEC_PER_SEC; + } m->jumped = true; - log_debug(" adjust (jump): %+f sec\n", tv_to_d(&tmx.time)); + log_debug(" adjust (jump): %+.3f sec\n", offset); } switch (leap_sec) { @@ -367,21 +365,20 @@ static int sntp_adjust_clock(Manager *m, double offset, int leap_sec) { break; } - //r = clock_adjtime(CLOCK_REALTIME, &tmx); - r = adjtimex(&tmx); + r = clock_adjtime(CLOCK_REALTIME, &tmx); if (r < 0) return r; log_debug(" status : %04i %s\n" - " time now : %li.%06li\n" + " time now : %li.%03lli\n" " constant : %li\n" - " offset : %+f sec\n" - " freq offset : %+li (%+.3f ppm)\n", + " offset : %+.3f sec\n" + " freq offset : %+li (%i ppm)\n", tmx.status, tmx.status & STA_UNSYNC ? "" : "sync", - tmx.time.tv_sec, tmx.time.tv_usec, + tmx.time.tv_sec, tmx.time.tv_usec / NSEC_PER_MSEC, tmx.constant, - (double)tmx.offset / USEC_PER_SEC, - tmx.freq, (double)tmx.freq / 65536); + (double)tmx.offset / NSEC_PER_SEC, + tmx.freq, abs(tmx.freq) / 65536); return 0; } @@ -601,16 +598,16 @@ static int sntp_receive_response(sd_event_source *source, int fd, uint32_t reven " version : %u\n" " mode : %u\n" " stratum : %u\n" - " precision : %f sec (%d)\n" + " precision : %.6f sec (%d)\n" " reference : %.4s\n" - " origin : %f\n" - " receive : %f\n" - " transmit : %f\n" - " dest : %f\n" - " offset : %+f sec\n" - " delay : %+f sec\n" + " origin : %.3f\n" + " receive : %.3f\n" + " transmit : %.3f\n" + " dest : %.3f\n" + " offset : %+.3f sec\n" + " delay : %+.3f sec\n" " packet count : %"PRIu64"\n" - " jitter : %f%s\n" + " jitter : %.3f%s\n" " poll interval: %llu\n", NTP_FIELD_LEAP(ntpmsg->field), NTP_FIELD_VERSION(ntpmsg->field), @@ -627,8 +624,8 @@ static int sntp_receive_response(sd_event_source *source, int fd, uint32_t reven m->samples_jitter, spike ? " spike" : "", m->poll_interval_usec / USEC_PER_SEC); - log_info("%4llu %+10f %10f %10f%s", - m->poll_interval_usec / USEC_PER_SEC, offset, delay, m->samples_jitter, spike ? " spike" : ""); + log_info("%s: interval/delta/delay/jitter %llu/%+.3f/%.3f/%.3f%s", + m->server, m->poll_interval_usec / USEC_PER_SEC, offset, delay, m->samples_jitter, spike ? " (ignored)" : ""); if (!spike) { r = sntp_adjust_clock(m, offset, leap_sec); @@ -771,18 +768,18 @@ int main(int argc, char *argv[]) { if (r < 0) goto out; - //server = "216.239.32.15"; /* time1.google.com */ - //server = "192.53.103.108"; /* ntp1.ptb.de */ - server = "27.54.95.11"; /* au.pool.ntp.org */ + server = "216.239.32.15"; /* time1.google.com */ sd_notifyf(false, - "READY=1\n" - "STATUS=Connecting to %s", server); + "READY=1"); r = sntp_server_connect(m, server); if (r < 0) goto out; + sd_notifyf(false, + "STATUS=Using time server: %s", server); + r = sd_event_loop(m->event); if (r < 0) goto out;