chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
udevadm: move udevadm command descriptions into their files
[elogind.git]
/
udev
/
udevd.c
diff --git
a/udev/udevd.c
b/udev/udevd.c
index be4b071ebb0fcd8bce27652f61917d08c3abdb26..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;
}
}
}
}
}
}
@@
-1408,6
+1404,13
@@
int main(int argc, char *argv[])
udev_monitor_set_receive_buffer_size(monitor, 128*1024*1024);
udev_monitor_set_receive_buffer_size(monitor, 128*1024*1024);
+ /* create queue file before signalling 'ready', to make sure we block 'settle' */
+ udev_queue_export = udev_queue_export_new(udev);
+ if (udev_queue_export == NULL) {
+ err(udev, "error creating queue file\n");
+ goto exit;
+ }
+
if (daemonize) {
pid_t pid;
int fd;
if (daemonize) {
pid_t pid;
int fd;
@@
-1421,8
+1424,8
@@
int main(int argc, char *argv[])
rc = 4;
goto exit;
default:
rc = 4;
goto exit;
default:
- rc =
0
;
- goto exit;
+ rc =
EXIT_SUCCESS
;
+ goto exit
_keep_queue
;
}
setsid();
}
setsid();
@@
-1521,12
+1524,6
@@
int main(int argc, char *argv[])
goto exit;
}
goto exit;
}
- udev_queue_export = udev_queue_export_new(udev);
- if (udev_queue_export == NULL) {
- err(udev, "error creating queue file\n");
- goto exit;
- }
-
memset(&ep_ctrl, 0, sizeof(struct epoll_event));
ep_ctrl.events = EPOLLIN;
ep_ctrl.data.fd = fd_ctrl;
memset(&ep_ctrl, 0, sizeof(struct epoll_event));
ep_ctrl.events = EPOLLIN;
ep_ctrl.data.fd = fd_ctrl;
@@
-1708,9
+1705,10
@@
int main(int argc, char *argv[])
}
}
}
}
- udev_queue_export_cleanup(udev_queue_export);
- rc = 0;
+ rc = EXIT_SUCCESS;
exit:
exit:
+ udev_queue_export_cleanup(udev_queue_export);
+exit_keep_queue:
if (fd_ep >= 0)
close(fd_ep);
worker_list_cleanup(udev);
if (fd_ep >= 0)
close(fd_ep);
worker_list_cleanup(udev);