udevd: replace --debug-trace with --children-max

[elogind.git] / udev / udevd.c

diff --git a/udev/udevd.c b/udev/udevd.c
index ab2488530926464e0b0814c181674f329e29abc3..189ab007a491e8da5f23cdcc9a629b509f750271 100644 (file)
--- a/udev/udevd.c
+++ b/udev/udevd.c
@@ -69,7 +69,6 @@ static void log_fn(struct udev *udev, int priority,
        }
 }
 
-static bool debug_trace;
 static struct udev_rules *rules;
 static struct udev_queue_export *udev_queue_export;
 static struct udev_ctrl *udev_ctrl;
@@ -78,8 +77,8 @@ static int worker_watch[2];
 static pid_t settle_pid;
 static bool stop_exec_queue;
 static bool reload_config;
-static int max_childs;
-static int childs;
+static int children;
+static int children_max;
 static sigset_t orig_sigmask;
 static struct udev_list_node event_list;
 static struct udev_list_node worker_list;
@@ -205,7 +204,7 @@ static void worker_unref(struct worker *worker)
 
        udev_list_node_remove(&worker->node);
        udev_monitor_unref(worker->monitor);
-       childs--;
+       children--;
        info(worker->udev, "worker [%u] cleaned up\n", worker->pid);
        free(worker);
 }
@@ -355,7 +354,7 @@ static void worker_new(struct event *event)
                worker->event = event;
                event->state = EVENT_RUNNING;
                udev_list_node_append(&worker->node, &worker_list);
-               childs++;
+               children++;
                info(event->udev, "seq %llu forked new worker [%u]\n", udev_device_get_seqnum(event->dev), pid);
                break;
        }
@@ -386,8 +385,8 @@ static void event_run(struct event *event, bool force)
                return;
        }
 
-       if (!force && childs >= max_childs) {
-               info(event->udev, "maximum number (%i) of childs reached\n", childs);
+       if (!force && children >= children_max) {
+               info(event->udev, "maximum number (%i) of children reached\n", children);
                return;
        }
 
@@ -431,10 +430,10 @@ static void worker_kill(struct udev *udev, int retain)
        struct udev_list_node *loop;
        int max;
 
-       if (childs <= retain)
+       if (children <= retain)
                return;
 
-       max = childs - retain;
+       max = children - retain;
 
        udev_list_node_foreach(loop, &worker_list) {
                struct worker *worker = node_to_worker(loop);
@@ -536,7 +535,7 @@ static void events_start(struct udev *udev)
 
 static void worker_returned(void)
 {
-       while (1) {
+       for (;;) {
                struct worker_message msg;
                ssize_t size;
                struct udev_list_node *loop;
@@ -625,10 +624,10 @@ static void handle_ctrl_msg(struct udev_ctrl *uctrl)
                worker_kill(udev, 0);
        }
 
-       i = udev_ctrl_get_set_max_childs(ctrl_msg);
+       i = udev_ctrl_get_set_children_max(ctrl_msg);
        if (i >= 0) {
-               info(udev, "udevd message (SET_MAX_CHILDS) received, max_childs=%i\n", i);
-               max_childs = i;
+               info(udev, "udevd message (SET_MAX_CHILDREN) received, children_max=%i\n", i);
+               children_max = i;
        }
 
        settle_pid = udev_ctrl_get_settle(ctrl_msg);
@@ -709,7 +708,7 @@ static void handle_signal(struct udev *udev, int signo)
                udev_exit = true;
                break;
        case SIGCHLD:
-               while (1) {
+               for (;;) {
                        pid_t pid;
                        int status;
                        struct udev_list_node *loop, *tmp;
@@ -883,7 +882,7 @@ static void static_dev_create_links(struct udev *udev, DIR *dir)
        };
        static const struct stdlinks stdlinks[] = {
                { "core", "/proc/kcore" },
-               { "fd", "/proc/fd" },
+               { "fd", "/proc/self/fd" },
                { "stdin", "/proc/self/fd/0" },
                { "stdout", "/proc/self/fd/1" },
                { "stderr", "/proc/self/fd/2" },
@@ -952,16 +951,15 @@ int main(int argc, char *argv[])
        int fd;
        FILE *f;
        sigset_t mask;
-       const char *value;
        int daemonize = false;
        int resolve_names = 1;
        static const struct option options[] = {
                { "daemon", no_argument, NULL, 'd' },
-               { "debug-trace", no_argument, NULL, 't' },
                { "debug", no_argument, NULL, 'D' },
+               { "children-max", required_argument, NULL, 'c' },
+               { "resolve-names", required_argument, NULL, 'N' },
                { "help", no_argument, NULL, 'h' },
                { "version", no_argument, NULL, 'V' },
-               { "resolve-names", required_argument, NULL, 'N' },
                {}
        };
        int rc = 1;
@@ -975,7 +973,7 @@ int main(int argc, char *argv[])
        info(udev, "version %s\n", VERSION);
        udev_selinux_init(udev);
 
-       while (1) {
+       for (;;) {
                int option;
 
                option = getopt_long(argc, argv, "dDthV", options, NULL);
@@ -986,8 +984,8 @@ int main(int argc, char *argv[])
                case 'd':
                        daemonize = true;
                        break;
-               case 't':
-                       debug_trace = true;
+               case 'c':
+                       children_max = strtoul(optarg, NULL, 10);
                        break;
                case 'D':
                        debug = true;
@@ -1008,7 +1006,7 @@ int main(int argc, char *argv[])
                        }
                        break;
                case 'h':
-                       printf("Usage: udevd [--help] [--daemon] [--debug-trace] [--debug] "
+                       printf("Usage: udevd [--help] [--daemon] [--children-max] [--debug] "
                               "[--resolve-names=early|late|never] [--version]\n");
                        goto exit;
                case 'V':
@@ -1151,7 +1149,7 @@ int main(int argc, char *argv[])
        }
 
        /* redirect std{out,err} */
-       if (!debug && !debug_trace) {
+       if (!debug) {
                dup2(fd, STDIN_FILENO);
                dup2(fd, STDOUT_FILENO);
                dup2(fd, STDERR_FILENO);
@@ -1175,23 +1173,22 @@ int main(int argc, char *argv[])
                close(fd);
        }
 
-       /* in trace mode run one event after the other */
-       if (debug_trace) {
-               max_childs = 1;
-       } else {
-               int memsize = mem_size_mb();
+       if (children_max <= 0) {
+               const char *value = getenv("UDEVD_CHILDREN_MAX");
 
-               if (memsize > 0)
-                       max_childs = 128 + (memsize / 8);
-               else
-                       max_childs = 128;
-       }
+               if (value) {
+                       children_max = strtoul(value, NULL, 10);
+               } else {
+                       int memsize = mem_size_mb();
 
-       /* possibly overwrite maximum limit of executed events */
-       value = getenv("UDEVD_MAX_CHILDS");
-       if (value)
-               max_childs = strtoul(value, NULL, 10);
-       info(udev, "initialize max_childs to %u\n", max_childs);
+                       /* set value depending on the amount of RAM */
+                       if (memsize > 0)
+                               children_max = 128 + (memsize / 8);
+                       else
+                               children_max = 128;
+               }
+       }
+       info(udev, "set children_max to %u\n", children_max);
 
        static_dev_create(udev);
        static_dev_create_from_modules(udev);
@@ -1205,7 +1202,7 @@ int main(int argc, char *argv[])
                int timeout;
 
                /* set timeout to kill idle workers */
-               if (udev_list_is_empty(&event_list) && childs > 2)
+               if (udev_list_is_empty(&event_list) && children > 2)
                        timeout = 3 * 1000;
                else
                        timeout = -1;