diff options
| author | Kay Sievers <kay@vrfy.org> | 2012-11-11 20:45:05 +0100 |
|---|---|---|
| committer | Kay Sievers <kay@vrfy.org> | 2012-11-12 01:03:14 +0100 |
| commit | 40fe8b11be9c1a1b38b91db097a5d6ebfa99304c (patch) | |
| tree | 41183236fc9e51fe054afe378151c045893e75f8 /src/udev/udevadm-settle.c | |
| parent | 1707b36c6da447a42b0223840cf2eb84ca3f2f34 (diff) | |
udev: use usec_t and now()
Diffstat (limited to 'src/udev/udevadm-settle.c')
| -rw-r--r-- | src/udev/udevadm-settle.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/udev/udevadm-settle.c b/src/udev/udevadm-settle.c index e70b351eb9..c4fc4ee4e5 100644 --- a/src/udev/udevadm-settle.c +++ b/src/udev/udevadm-settle.c @@ -47,9 +47,9 @@ static int adm_settle(struct udev *udev, int argc, char *argv[]) { "help", no_argument, NULL, 'h' }, {} }; - unsigned long long start_usec = now_usec(); - unsigned long long start = 0; - unsigned long long end = 0; + usec_t start_usec = now(CLOCK_MONOTONIC); + usec_t start = 0; + usec_t end = 0; int quiet = 0; const char *exists = NULL; unsigned int timeout = 120; @@ -123,7 +123,7 @@ static int adm_settle(struct udev *udev, int argc, char *argv[]) start = 0; end = 0; } - log_debug("start=%llu end=%llu current=%llu\n", start, end, kernel_seq); + log_debug("start=%llu end=%llu current=%llu\n", (unsigned long long)start, (unsigned long long)end, kernel_seq); } else { if (end > 0) { log_error("seq-end needs seq-start parameter, ignoring\n"); @@ -199,9 +199,9 @@ static int adm_settle(struct udev *udev, int argc, char *argv[]) } if (timeout > 0) { - unsigned long long age_usec; + usec_t age_usec; - age_usec = now_usec() - start_usec; + age_usec = now(CLOCK_MONOTONIC) - start_usec; if (age_usec / (1000 * 1000) >= timeout) { struct udev_list_entry *list_entry; |