The start time could be moved back a little bit by using kdbus timestamps, but I'm guessing that that amount of time is insignificant. --- TODO | 2 -- src/timedate/timedated.c | 7 +++++++ 2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/TODO b/TODO index 93dfa60..88055d3 100644 --- a/TODO +++ b/TODO @@ -190,8 +190,6 @@ Features: * we should try harder to collapse start jobs for swaps that end up being the same: http://lists.freedesktop.org/archives/systemd-devel/2014-November/025359.html -* timedated should compensate on SetTime for the time spent in polkit - * figure out when we can use the coarse timers * sd-resolve: drop res_query wrapping, people should call via the bus to resolved instead diff --git a/src/timedate/timedated.c b/src/timedate/timedated.c index 753c3d1..603e155 100644 --- a/src/timedate/timedated.c +++ b/src/timedate/timedated.c @@ -529,6 +529,7 @@ static int method_set_time(sd_bus *bus, sd_bus_message *m, void *userdata, sd_bu Context *c = userdata; int64_t utc; struct timespec ts; + usec_t start, ready; struct tm* tm; int r; @@ -536,6 +537,8 @@ static int method_set_time(sd_bus *bus, sd_bus_message *m, void *userdata, sd_bu assert(m); assert(c); + start = now(CLOCK_MONOTONIC); + if (c->use_ntp) return sd_bus_error_setf(error, BUS_ERROR_AUTOMATIC_TIME_SYNC_ENABLED, "Automatic time synchronization is enabled"); @@ -569,6 +572,10 @@ static int method_set_time(sd_bus *bus, sd_bus_message *m, void *userdata, sd_bu if (r == 0) return 1; + /* adjust ts for time spent in polkit */ + ready = now(CLOCK_MONOTONIC); + timespec_store(&ts, timespec_load(&ts) + (ready - start)); + /* Set system clock */ if (clock_settime(CLOCK_REALTIME, &ts) < 0) { log_error_errno(errno, "Failed to set local time: %m"); -- 2.2.1.209.g41e5f3a _______________________________________________ systemd-devel mailing list systemd-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/systemd-devel
