From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 3 Aug 2015 14:43:29 +0000 (+0200)
Subject: tree-wide: convert bootchart and lldp code to use clock_boottime_or_monotonic()
X-Git-Tag: v225~124^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=27ec691bfd4088b678aa18d0bad90be47d0357f4;p=thirdparty%2Fsystemd.git

tree-wide: convert bootchart and lldp code to use clock_boottime_or_monotonic()

We should avoid using CLOCK_BOOTTIME directly unless we actually can
sensible distuingish it from CLOCK_MONOTONIC. CLOCK_BOOTTIME is only
fully feature on very recent Linux kernels, hence we should stick to a
fallback logic, which is already available in the
clock_boottime_or_monotonic() call.
---

diff --git a/src/bootchart/bootchart.c b/src/bootchart/bootchart.c
index 1625d51fa80..322cec84a9e 100644
--- a/src/bootchart/bootchart.c
+++ b/src/bootchart/bootchart.c
@@ -367,7 +367,7 @@ int main(int argc, char *argv[]) {
                 struct timespec n;
                 double uptime;
 
-                clock_gettime(CLOCK_BOOTTIME, &n);
+                clock_gettime(clock_boottime_or_monotonic(), &n);
                 uptime = (n.tv_sec + (n.tv_nsec / (double) NSEC_PER_SEC));
 
                 log_start = gettime_ns();
diff --git a/src/libsystemd-network/sd-lldp.c b/src/libsystemd-network/sd-lldp.c
index 034163eb9ec..574e04b541e 100644
--- a/src/libsystemd-network/sd-lldp.c
+++ b/src/libsystemd-network/sd-lldp.c
@@ -392,7 +392,7 @@ static void lldp_mib_delete_objects(sd_lldp *lldp) {
                         break;
 
                 if (t <= 0)
-                        t = now(CLOCK_BOOTTIME);
+                        t = now(clock_boottime_or_monotonic());
 
                 if (p->until > t)
                         break;
@@ -490,7 +490,7 @@ int sd_lldp_save(sd_lldp *lldp, const char *lldp_file) {
                         free(s);
                         s = k;
 
-                        time = now(CLOCK_BOOTTIME);
+                        time = now(clock_boottime_or_monotonic());
 
                         /* Don't write expired packets */
                         if (time - p->until <= 0)
diff --git a/src/network/networkctl.c b/src/network/networkctl.c
index 9d6c453dbc9..6c36a4ecfac 100644
--- a/src/network/networkctl.c
+++ b/src/network/networkctl.c
@@ -976,7 +976,7 @@ static int link_lldp_status(int argc, char *argv[], void *userdata) {
                                                 return log_warning_errno(r < 0 ? r : ERANGE,
                                                                          "Failed to parse TTL \"%s\": %m", b);
 
-                                        time = now(CLOCK_BOOTTIME);
+                                        time = now(clock_boottime_or_monotonic());
                                         if (x < time)
                                                 continue;