timesyncd: log drift value as signed

[elogind.git] / src / timesync / timesyncd.c

diff --git a/src/timesync/timesyncd.c b/src/timesync/timesyncd.c
index 7b7ec7ae9f5b15e11eb1afae5c7483beef354f78..19b58bb70a9b2cdbef48dc00021ce0f40cda6995 100644 (file)
--- a/src/timesync/timesyncd.c
+++ b/src/timesync/timesyncd.c
@@ -136,6 +136,7 @@ struct Manager {
 
         /* last change */
         bool jumped;
+        int drift_ppm;
 
         /* watch for time changes */
         sd_event_source *event_clock_watch;
@@ -154,23 +155,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) {
@@ -295,7 +285,6 @@ static int sntp_clock_watch(sd_event_source *source, int fd, uint32_t revents, v
 static int sntp_clock_watch_setup(Manager *m) {
         struct itimerspec its = { .it_value.tv_sec = TIME_T_MAX };
         _cleanup_close_ int fd = -1;
-        sd_event *e;
         sd_event_source *source;
         int r;
 
@@ -313,8 +302,7 @@ static int sntp_clock_watch_setup(Manager *m) {
                 return -errno;
         }
 
-        e = sd_event_source_get_event(m->event_receive);
-        r = sd_event_add_io(e, &source, fd, EPOLLIN, sntp_clock_watch, m);
+        r = sd_event_add_io(m->event, &source, fd, EPOLLIN, sntp_clock_watch, m);
         if (r < 0) {
                 log_error("Failed to create clock watch event source: %s", strerror(-r));
                 return r;
@@ -343,19 +331,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): %+.3f 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_sec  -= 1;
+                        tmx.time.tv_usec += NSEC_PER_SEC;
+                }
 
                 m->jumped = true;
-                log_debug("  adjust (jump): %+.3f sec\n", tv_to_d(&tmx.time));
+                log_debug("  adjust (jump): %+.3f sec\n", offset);
         }
 
         switch (leap_sec) {
@@ -371,16 +368,18 @@ static int sntp_adjust_clock(Manager *m, double offset, int leap_sec) {
         if (r < 0)
                 return r;
 
+        m->drift_ppm = tmx.freq / 65536;
+
         log_debug("  status       : %04i %s\n"
                   "  time now     : %li.%03lli\n"
                   "  constant     : %li\n"
                   "  offset       : %+.3f sec\n"
-                  "  freq offset  : %+li (%+.3f ppm)\n",
+                  "  freq offset  : %+li (%i ppm)\n",
                   tmx.status, tmx.status & STA_UNSYNC ? "" : "sync",
-                  tmx.time.tv_sec, tmx.time.tv_usec / USEC_PER_MSEC,
+                  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, m->drift_ppm);
 
         return 0;
 }
@@ -600,7 +599,7 @@ static int sntp_receive_response(sd_event_source *source, int fd, uint32_t reven
                   "  version      : %u\n"
                   "  mode         : %u\n"
                   "  stratum      : %u\n"
-                  "  precision    : %.3f sec (%d)\n"
+                  "  precision    : %.6f sec (%d)\n"
                   "  reference    : %.4s\n"
                   "  origin       : %.3f\n"
                   "  receive      : %.3f\n"
@@ -626,15 +625,15 @@ 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("%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);
                 if (r < 0)
                         log_error("Failed to call clock_adjtime(): %m");
         }
 
+        log_info("%s: interval/delta/delay/jitter/drift %llus/%+.3fs/%.3fs/%.3fs/%+ippm%s",
+                 m->server, m->poll_interval_usec / USEC_PER_SEC, offset, delay, m->samples_jitter, m->drift_ppm,
+                 spike ? " (ignored)" : "");
         r = sntp_arm_timer(m, m->poll_interval_usec);
         if (r < 0)
                 return r;
@@ -772,16 +771,13 @@ int main(int argc, char *argv[]) {
 
         server = "216.239.32.15";       /* time1.google.com */
 
-        sd_notifyf(false,
-                  "READY=1\n"
-                  "STATUS=Connecting to %s", server);
+        sd_notify(false, "READY=1");
 
         r = sntp_server_connect(m, server);
         if (r < 0)
                 goto out;
 
-        sd_notifyf(false,
-                  "STATUS=Connected to %s", server);
+        sd_notifyf(false, "STATUS=Using Time Server: %s", server);
 
         r = sd_event_loop(m->event);
         if (r < 0)