shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-03-24 14:50:17 +03:00
Code

udev: move udev_ctrl_cleanup() into manager_free()

Browse Source
This commit is contained in:
Yu Watanabe 2019-04-01 04:11:02 +09:00 committed by Lennart Poettering
parent 245d386a03
commit 76e62a4d22
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/udev/udevd.c
View File

@ -296,6 +296,9 @@ static void manager_free(Manager *manager) {
udev_builtin_exit();
if (manager->pid == getpid_cached())
udev_ctrl_cleanup(manager->ctrl);
manager_clear_for_worker(manager);
sd_netlink_unref(manager->rtnl);
@ -590,9 +593,6 @@ static int event_queue_insert(Manager *manager, sd_device *dev) {
assert(dev);
/* only one process can add events to the queue */
if (manager->pid == 0)
manager->pid = getpid_cached();
assert(manager->pid == getpid_cached());
/* We only accepts devices received by device monitor. */
@ -1596,6 +1596,8 @@ static int manager_new(Manager **ret, int fd_ctrl, int fd_uevent, const char *cg
static int main_loop(Manager *manager) {
int fd_worker, r;
manager->pid = getpid_cached();
/* unnamed socket from workers to the main daemon */
r = socketpair(AF_LOCAL, SOCK_DGRAM|SOCK_CLOEXEC, 0, manager->worker_watch);
if (r < 0)
@ -1813,10 +1815,7 @@ static int run(int argc, char *argv[]) {
log_debug_errno(r, "Failed to adjust OOM score, ignoring: %m");
}
r = main_loop(manager);
/* FIXME: move this into manager_free() */
udev_ctrl_cleanup(manager->ctrl);
return r;
return main_loop(manager);
}
DEFINE_MAIN_FUNCTION(run);