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: cleanup the udev cgroup when the daemon enters the idle state
[elogind.git]
/
src
/
udev
/
udevd.c
diff --git
a/src/udev/udevd.c
b/src/udev/udevd.c
index 35478c19caa51b2324032e03e025fbf53fd621c1..97b910cc2e87961d2868add5aa3a077bd432255b 100644
(file)
--- a/
src/udev/udevd.c
+++ b/
src/udev/udevd.c
@@
-46,6
+46,7
@@
#include "udev.h"
#include "sd-daemon.h"
#include "udev.h"
#include "sd-daemon.h"
+#include "cgroup-util.h"
static bool debug;
static bool debug;
@@
-72,6
+73,7
@@
static int exec_delay;
static sigset_t sigmask_orig;
static UDEV_LIST(event_list);
static UDEV_LIST(worker_list);
static sigset_t sigmask_orig;
static UDEV_LIST(event_list);
static UDEV_LIST(worker_list);
+char *udev_cgroup;
static bool udev_exit;
enum event_state {
static bool udev_exit;
enum event_state {
@@
-329,7
+331,6
@@
static void worker_new(struct event *event)
if (fdcount < 0) {
if (errno == EINTR)
continue;
if (fdcount < 0) {
if (errno == EINTR)
continue;
- err = -errno;
log_error("failed to poll: %m\n");
goto out;
}
log_error("failed to poll: %m\n");
goto out;
}
@@
-453,22
+454,13
@@
static int event_queue_insert(struct udev_device *dev)
return 0;
}
return 0;
}
-static void worker_kill(struct udev *udev
, int retain
)
+static void worker_kill(struct udev *udev)
{
struct udev_list_node *loop;
{
struct udev_list_node *loop;
- int max;
-
- if (children <= retain)
- return;
-
- max = children - retain;
udev_list_node_foreach(loop, &worker_list) {
struct worker *worker = node_to_worker(loop);
udev_list_node_foreach(loop, &worker_list) {
struct worker *worker = node_to_worker(loop);
- if (max-- <= 0)
- break;
-
if (worker->state == WORKER_KILLED)
continue;
if (worker->state == WORKER_KILLED)
continue;
@@
-636,7
+628,7
@@
static struct udev_ctrl_connection *handle_ctrl_msg(struct udev_ctrl *uctrl)
log_debug("udevd message (SET_LOG_PRIORITY) received, log_priority=%i\n", i);
log_set_max_level(i);
udev_set_log_priority(udev, i);
log_debug("udevd message (SET_LOG_PRIORITY) received, log_priority=%i\n", i);
log_set_max_level(i);
udev_set_log_priority(udev, i);
- worker_kill(udev
, 0
);
+ worker_kill(udev);
}
if (udev_ctrl_get_stop_exec_queue(ctrl_msg) > 0) {
}
if (udev_ctrl_get_stop_exec_queue(ctrl_msg) > 0) {
@@
-678,7
+670,7
@@
static struct udev_ctrl_connection *handle_ctrl_msg(struct udev_ctrl *uctrl)
}
free(key);
}
}
free(key);
}
- worker_kill(udev
, 0
);
+ worker_kill(udev);
}
i = udev_ctrl_get_set_children_max(ctrl_msg);
}
i = udev_ctrl_get_set_children_max(ctrl_msg);
@@
-880,11
+872,6
@@
static void static_dev_create_from_modules(struct udev *udev)
static void static_dev_create_links(struct udev *udev)
{
DIR *dir;
static void static_dev_create_links(struct udev *udev)
{
DIR *dir;
-
- dir = opendir(udev_get_dev_path(udev));
- if (dir == NULL)
- return;
-
struct stdlinks {
const char *link;
const char *target;
struct stdlinks {
const char *link;
const char *target;
@@
-898,6
+885,10
@@
static void static_dev_create_links(struct udev *udev)
};
unsigned int i;
};
unsigned int i;
+ dir = opendir(udev_get_dev_path(udev));
+ if (dir == NULL)
+ return;
+
for (i = 0; i < ARRAY_SIZE(stdlinks); i++) {
struct stat sb;
for (i = 0; i < ARRAY_SIZE(stdlinks); i++) {
struct stat sb;
@@
-1115,7
+1106,6
@@
int main(int argc, char *argv[])
int fd_worker = -1;
struct epoll_event ep_ctrl, ep_inotify, ep_signal, ep_netlink, ep_worker;
struct udev_ctrl_connection *ctrl_conn = NULL;
int fd_worker = -1;
struct epoll_event ep_ctrl, ep_inotify, ep_signal, ep_netlink, ep_worker;
struct udev_ctrl_connection *ctrl_conn = NULL;
- char **s;
int rc = 1;
udev = udev_new();
int rc = 1;
udev = udev_new();
@@
-1147,8
+1137,8
@@
int main(int argc, char *argv[])
break;
case 'D':
debug = true;
break;
case 'D':
debug = true;
- if (udev_get_log_priority(udev) < LOG_INFO)
-
udev_set_log_priority(udev, LOG_INFO);
+ log_set_max_level(LOG_DEBUG);
+ udev_set_log_priority(udev, LOG_INFO);
break;
case 'N':
if (strcmp (optarg, "early") == 0) {
break;
case 'N':
if (strcmp (optarg, "early") == 0) {
@@
-1266,6
+1256,10
@@
int main(int argc, char *argv[])
rc = 3;
goto exit;
}
rc = 3;
goto exit;
}
+
+ /* get our own cgroup, we regularly kill everything udev has left behind */
+ if (cg_get_by_pid(SYSTEMD_CGROUP_CONTROLLER, 0, &udev_cgroup) < 0)
+ udev_cgroup = NULL;
} else {
/* open control and netlink socket */
udev_ctrl = udev_ctrl_new(udev);
} else {
/* open control and netlink socket */
udev_ctrl = udev_ctrl_new(udev);
@@
-1483,7
+1477,7
@@
int main(int argc, char *argv[])
/* discard queued events and kill workers */
event_queue_cleanup(udev, EVENT_QUEUED);
/* discard queued events and kill workers */
event_queue_cleanup(udev, EVENT_QUEUED);
- worker_kill(udev
, 0
);
+ worker_kill(udev);
/* exit after all has cleaned up */
if (udev_list_node_is_empty(&event_list) && udev_list_node_is_empty(&worker_list))
/* exit after all has cleaned up */
if (udev_list_node_is_empty(&event_list) && udev_list_node_is_empty(&worker_list))
@@
-1491,9
+1485,13
@@
int main(int argc, char *argv[])
/* timeout at exit for workers to finish */
timeout = 30 * 1000;
/* timeout at exit for workers to finish */
timeout = 30 * 1000;
- } else if (udev_list_node_is_empty(&event_list) &&
children <= 2
) {
+ } else if (udev_list_node_is_empty(&event_list) &&
!children
) {
/* we are idle */
timeout = -1;
/* we are idle */
timeout = -1;
+
+ /* cleanup possible left-over processes in our cgroup */
+ if (udev_cgroup)
+ cg_kill(SYSTEMD_CGROUP_CONTROLLER, udev_cgroup, SIGKILL, false, true, NULL);
} else {
/* kill idle or hanging workers */
timeout = 3 * 1000;
} else {
/* kill idle or hanging workers */
timeout = 3 * 1000;
@@
-1514,7
+1512,7
@@
int main(int argc, char *argv[])
/* kill idle workers */
if (udev_list_node_is_empty(&event_list)) {
log_debug("cleanup idle workers\n");
/* kill idle workers */
if (udev_list_node_is_empty(&event_list)) {
log_debug("cleanup idle workers\n");
- worker_kill(udev
, 2
);
+ worker_kill(udev);
}
/* check for hanging events */
}
/* check for hanging events */
@@
-1525,7
+1523,7
@@
int main(int argc, char *argv[])
continue;
if ((now_usec() - worker->event_start_usec) > 30 * 1000 * 1000) {
continue;
if ((now_usec() - worker->event_start_usec) > 30 * 1000 * 1000) {
- log_error("worker [%u]
timeout,
kill it\n", worker->pid,
+ log_error("worker [%u]
%s timeout;
kill it\n", worker->pid,
worker->event ? worker->event->devpath : "<idle>");
kill(worker->pid, SIGKILL);
worker->state = WORKER_KILLED;
worker->event ? worker->event->devpath : "<idle>");
kill(worker->pid, SIGKILL);
worker->state = WORKER_KILLED;
@@
-1569,7
+1567,7
@@
int main(int argc, char *argv[])
/* reload requested, HUP signal received, rules changed, builtin changed */
if (reload) {
/* reload requested, HUP signal received, rules changed, builtin changed */
if (reload) {
- worker_kill(udev
, 0
);
+ worker_kill(udev);
rules = udev_rules_unref(rules);
udev_builtin_exit(udev);
reload = 0;
rules = udev_rules_unref(rules);
udev_builtin_exit(udev);
reload = 0;