Changeset 23513

Timestamp:

02/06/08 18:24:32 (10 months ago)

Author:

zarzycki@…

Message:

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

Files:

• trunk/launchd/src/launchd_core_logic.c (modified) (6 diffs)

trunk/launchd/src/launchd_core_logic.c

@@ -462 +462 @@
 
 /* miscellaneous file local functions */
+static size_t get_kern_max_proc(void);
 static void ensure_root_bkgd_setup(void);
 static int dir_has_files(job_t j, const char *path);
@@ -2105 +2106 @@
 {
         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_logging) {
+                return;
+        }
+#endif
 
         runtime_ktrace(RTKT_LAUNCHD_FINDING_STRAY_PG, j->p, 0, 0);
@@ -2418 +2425 @@
 #endif
         int mib_sz = sizeof(mib) / sizeof(mib[0]);
-        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;
 
@@ -2959 +2966 @@
 {
         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_logging) {
+                return;
+        }
+#endif
+        kp = malloc(len);
 
         if (!job_assumes(j, kp != NULL)) {
@@ -4465 +4479 @@
 {
         int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_ALL };
-        size_t i, kp_cnt = 0, kp_skipped = 0, len = 10*1024*1024;
+        size_t i, kp_cnt = 0, kp_skipped = 0, len = sizeof(struct kinfo_proc) * get_kern_max_proc();
         struct kinfo_proc *kp;
+
+#if TARGET_OS_EMBEDDED
+        if (!do_apple_internal_logging) {
+                return;
+        }
+#endif
 
         if (likely(jm->parentmgr || !pid1_magic)) {
@@ -6966 +6986 @@
         } while ((returned == (sizeof(buf) / sizeof(buf[0]))) && (found > 0));
 }
+
+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;
+}