chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
udevd: use 'uptime' in debug timestamp
[elogind.git]
/
udev
/
udevd.c
diff --git
a/udev/udevd.c
b/udev/udevd.c
index 258d7870ebf84f11cf89105296b21f2479fe928e..968b41667e356b2a81b6b8cff467506e83feb2e3 100644
(file)
--- a/
udev/udevd.c
+++ b/
udev/udevd.c
@@
-55,13
+55,12
@@
static void log_fn(struct udev *udev, int priority,
{
if (debug) {
char buf[1024];
{
if (debug) {
char buf[1024];
- struct timeval tv;
- struct timezone tz;
+ struct timespec ts;
vsnprintf(buf, sizeof(buf), format, args);
vsnprintf(buf, sizeof(buf), format, args);
-
gettimeofday(&tv, &tz
);
+
clock_gettime(CLOCK_MONOTONIC, &ts
);
fprintf(stderr, "%llu.%06u [%u] %s: %s",
fprintf(stderr, "%llu.%06u [%u] %s: %s",
- (unsigned long long) t
v.tv_sec, (unsigned int) tv.tv_usec
,
+ (unsigned long long) t
s.tv_sec, (unsigned int) ts.tv_nsec/1000
,
(int) getpid(), fn, buf);
} else {
vsyslog(priority, format, args);
(int) getpid(), fn, buf);
} else {
vsyslog(priority, format, args);
@@
-365,9
+364,6
@@
static void worker_new(struct event *event)
switch (fdsi.ssi_signo) {
case SIGTERM:
goto out;
switch (fdsi.ssi_signo) {
case SIGTERM:
goto out;
- case SIGALRM:
- rc = EXIT_FAILURE;
- goto out;
}
}
}
}
}
}