From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Tue, 1 Aug 2023 16:07:12 +0000 (+0900)
Subject: udev: split out manager_set_default_children_max()
X-Git-Tag: v255-rc1~807^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ce5ddbc465ebcbb34c77edaf7923d6ee0e56c4dd;p=thirdparty%2Fsystemd.git

udev: split out manager_set_default_children_max()
---

diff --git a/src/udev/udev-manager.c b/src/udev/udev-manager.c
index b97ccab3b09..676e97a7f32 100644
--- a/src/udev/udev-manager.c
+++ b/src/udev/udev-manager.c
@@ -3,6 +3,7 @@
 #include "blockdev-util.h"
 #include "cgroup-util.h"
 #include "common-signal.h"
+#include "cpu-set-util.h"
 #include "daemon-util.h"
 #include "device-monitor-private.h"
 #include "device-private.h"
@@ -14,6 +15,7 @@
 #include "hashmap.h"
 #include "inotify-util.h"
 #include "io-util.h"
+#include "limits-util.h"
 #include "list.h"
 #include "mkdir.h"
 #include "process-util.h"
@@ -33,6 +35,8 @@
 #include "udev-watch.h"
 #include "udev-worker.h"
 
+#define WORKER_NUM_MAX UINT64_C(2048)
+
 #define EVENT_RETRY_INTERVAL_USEC (200 * USEC_PER_MSEC)
 #define EVENT_RETRY_TIMEOUT_USEC  (3 * USEC_PER_MINUTE)
 
@@ -829,6 +833,28 @@ static int on_worker(sd_event_source *s, int fd, uint32_t revents, void *userdat
         return 1;
 }
 
+static void manager_set_default_children_max(Manager *manager) {
+        uint64_t cpu_limit, mem_limit, cpu_count = 1;
+        int r;
+
+        assert(manager);
+
+        if (manager->children_max != 0)
+                return;
+
+        r = cpus_in_affinity_mask();
+        if (r < 0)
+                log_warning_errno(r, "Failed to determine number of local CPUs, ignoring: %m");
+        else
+                cpu_count = r;
+
+        cpu_limit = cpu_count * 2 + 16;
+        mem_limit = MAX(physical_memory() / (128*1024*1024), UINT64_C(10));
+
+        manager->children_max = MIN3(cpu_limit, mem_limit, WORKER_NUM_MAX);
+        log_debug("Set children_max to %u", manager->children_max);
+}
+
 /* receive the udevd message from userspace */
 static int on_ctrl_msg(UdevCtrl *uctrl, UdevCtrlMessageType type, const UdevCtrlMessageValue *value, void *userdata) {
         Manager *manager = ASSERT_PTR(userdata);
@@ -1227,6 +1253,8 @@ int manager_init(Manager *manager, int fd_ctrl, int fd_uevent) {
 int manager_main(Manager *manager) {
         int fd_worker, r;
 
+        manager_set_default_children_max(manager);
+
         /* unnamed socket from workers to the main daemon */
         r = socketpair(AF_UNIX, SOCK_DGRAM|SOCK_CLOEXEC, 0, manager->worker_watch);
         if (r < 0)
diff --git a/src/udev/udevd.c b/src/udev/udevd.c
index d0856b4a553..257336aec6f 100644
--- a/src/udev/udevd.c
+++ b/src/udev/udevd.c
@@ -6,14 +6,13 @@
  */
 
 #include <getopt.h>
+#include <unistd.h>
 
 #include "sd-daemon.h"
 
-#include "cpu-set-util.h"
 #include "env-file.h"
 #include "errno-util.h"
 #include "fd-util.h"
-#include "limits-util.h"
 #include "mkdir.h"
 #include "parse-util.h"
 #include "pretty-print.h"
@@ -27,8 +26,6 @@
 #include "udevd.h"
 #include "version.h"
 
-#define WORKER_NUM_MAX 2048U
-
 static bool arg_debug = false;
 static int arg_daemonize = false;
 
@@ -361,22 +358,6 @@ int run_udevd(int argc, char *argv[]) {
         if (r < 0)
                 return r;
 
-        if (manager->children_max == 0) {
-                unsigned long cpu_limit, mem_limit, cpu_count = 1;
-
-                r = cpus_in_affinity_mask();
-                if (r < 0)
-                        log_warning_errno(r, "Failed to determine number of local CPUs, ignoring: %m");
-                else
-                        cpu_count = r;
-
-                cpu_limit = cpu_count * 2 + 16;
-                mem_limit = MAX(physical_memory() / (128UL*1024*1024), 10U);
-
-                manager->children_max = MIN3(cpu_limit, mem_limit, WORKER_NUM_MAX);
-                log_debug("Set children_max to %u", manager->children_max);
-        }
-
         /* set umask before creating any file/directory */
         umask(022);