From: Kay Sievers <kay.sievers@vrfy.org>
Date: Sun, 10 Jul 2011 23:03:14 +0000 (+0200)
Subject: udevadm: monitor - use uptime to match the kernel's timestamp
X-Git-Tag: 174~69
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2315e570706285216a130eb1a67402284344b85f;p=systemd

udevadm: monitor - use uptime to match the kernel's timestamp
---

diff --git a/TODO b/TODO
index 13a27799..01fb0e1f 100644
--- a/TODO
+++ b/TODO
@@ -2,8 +2,6 @@
 
  - test (now fixed) /dev/tape/ links
 
- - monitor: use clock MONOTONIC
-
  - remove RUN+="socket:"
 
  - libudev: return proper errno or set errno
diff --git a/udev/udevadm-monitor.c b/udev/udevadm-monitor.c
index 0852fe30..9b8bf4ec 100644
--- a/udev/udevadm-monitor.c
+++ b/udev/udevadm-monitor.c
@@ -24,6 +24,7 @@
 #include <errno.h>
 #include <signal.h>
 #include <getopt.h>
+#include <time.h>
 #include <sys/time.h>
 #include <sys/socket.h>
 #include <sys/un.h>
@@ -43,13 +44,12 @@ static void sig_handler(int signum)
 
 static void print_device(struct udev_device *device, const char *source, int prop)
 {
-	struct timeval tv;
-	struct timezone tz;
+	struct timespec ts;
 
-	gettimeofday(&tv, &tz);
+	clock_gettime(CLOCK_MONOTONIC, &ts);
 	printf("%-6s[%llu.%06u] %-8s %s (%s)\n",
 	       source,
-	       (unsigned long long) tv.tv_sec, (unsigned int) tv.tv_usec,
+	       (unsigned long long) ts.tv_sec, (unsigned int) ts.tv_nsec/1000,
 	       udev_device_get_action(device),
 	       udev_device_get_devpath(device),
 	       udev_device_get_subsystem(device));