Changeset 23512

Timestamp:

02/06/08 18:15:19 (10 months ago)

Author:

zarzycki@…

Message:

<rdar://problem/5725563> Device hung on "slide to unlock" screen

Files:

• branches/SULeopard/launchd/src/launchd_core_logic.c (modified) (5 diffs)

branches/SULeopard/launchd/src/launchd_core_logic.c

@@ -463 +463 @@
 static void extract_rcsid_substr(const char *i, char *o, size_t osz);
 static void do_first_per_user_launchd_hack(void);
+static size_t get_kern_max_proc(void);
 static void do_file_init(void) __attribute__((constructor));
 
 /* file local globals */
+static bool do_apple_internal_magic;
 static size_t total_children;
 static size_t total_anon_children;
@@ -2047 +2049 @@
 {
         int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PGRP, j->p };
-        size_t i, kp_cnt, len = 10*1024*1024;
+        size_t i, kp_cnt, len = sizeof(struct kinfo_proc) * get_kern_max_proc();
         struct kinfo_proc *kp;
+
+#if TARGET_OS_EMBEDDED
+        if (!do_apple_internal_magic) {
+                return;
+        }
+#endif
 
         if (!job_assumes(j, (kp = malloc(len)) != NULL)) {
@@ -2822 +2830 @@
 {
         int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_ALL };
-        size_t i, kp_cnt, len = 10*1024*1024;
-        struct kinfo_proc *kp = malloc(len);
+        size_t i, kp_cnt, len = sizeof(struct kinfo_proc) * get_kern_max_proc();
+        struct kinfo_proc *kp;
         uid_t u = j->mach_uid;
+
+#if TARGET_OS_EMBEDDED
+        if (!do_apple_internal_magic) {
+                return;
+        }
+#endif
+        kp = malloc(len);
 
         if (!job_assumes(j, kp != NULL)) {
@@ -4303 +4318 @@
 {
         int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_ALL };
-        size_t i, kp_cnt, len = 10*1024*1024;
+        size_t i, kp_cnt, len = sizeof(struct kinfo_proc) * get_kern_max_proc();
         struct kinfo_proc *kp;
 
+#if TARGET_OS_EMBEDDED
+        if (!do_apple_internal_magic) {
+                return;
+        }
+#endif
         if (jm->parentmgr || getpid() != 1) {
                 return;
@@ -6779 +6799 @@
 }
 
+size_t
+get_kern_max_proc(void)
+{
+        int mib[] = { CTL_KERN, KERN_MAXPROC };
+        int max = 100;
+        size_t max_sz = sizeof(max);
+
+        launchd_assumes(sysctl(mib, 2, &max, &max_sz, NULL, 0) != -1);
+
+        return max;
+}
+
 void
 do_file_init(void)
 {
+        struct stat sb;
+
         launchd_assert(mach_timebase_info(&tbi) == 0);
 
-}
+        if (stat("/AppleInternal", &sb) == 0) {
+                do_apple_internal_magic = true;
+        }
+}