chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
udev: handle network controllers in nonstandard domains
[elogind.git]
/
src
/
udev
/
udevadm-settle.c
diff --git
a/src/udev/udevadm-settle.c
b/src/udev/udevadm-settle.c
index e70b351eb90690d43aa971c00b7d4e42660ca718..c4fc4ee4e50fea063dc45fb1ee5aa96bca40d28e 100644
(file)
--- 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' },
{}
};
{ "help", no_argument, NULL, 'h' },
{}
};
- u
nsigned long long start_usec = now_usec(
);
- u
nsigned long long
start = 0;
- u
nsigned long long
end = 0;
+ u
sec_t start_usec = now(CLOCK_MONOTONIC
);
+ u
sec_t
start = 0;
+ u
sec_t
end = 0;
int quiet = 0;
const char *exists = NULL;
unsigned int timeout = 120;
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;
}
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");
} 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) {
}
if (timeout > 0) {
- u
nsigned long long
age_usec;
+ u
sec_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;
if (age_usec / (1000 * 1000) >= timeout) {
struct udev_list_entry *list_entry;