<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre, #msg p { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[23512] branches/SULeopard/launchd/src/launchd_core_logic.c</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.macosforge.org/projects/launchd/changeset/23512">23512</a></dd>
<dt>Author</dt> <dd>zarzycki@apple.com</dd>
<dt>Date</dt> <dd>2008-02-06 18:15:19 -0800 (Wed, 06 Feb 2008)</dd>
</dl>
<h3>Log Message</h3>
<pre><rdar://problem/5725563> Device hung on "slide to unlock" screen</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchesSULeopardlaunchdsrclaunchd_core_logicc">branches/SULeopard/launchd/src/launchd_core_logic.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchesSULeopardlaunchdsrclaunchd_core_logicc"></a>
<div class="modfile"><h4>Modified: branches/SULeopard/launchd/src/launchd_core_logic.c (23511 => 23512)</h4>
<pre class="diff"><span>
<span class="info">--- branches/SULeopard/launchd/src/launchd_core_logic.c 2008-02-06 17:34:55 UTC (rev 23511)
+++ branches/SULeopard/launchd/src/launchd_core_logic.c 2008-02-07 02:15:19 UTC (rev 23512)
</span><span class="lines">@@ -462,9 +462,11 @@
</span><span class="cx"> static size_t our_strhash(const char *s) __attribute__((pure));
</span><span class="cx"> static void extract_rcsid_substr(const char *i, char *o, size_t osz);
</span><span class="cx"> static void do_first_per_user_launchd_hack(void);
</span><ins>+static size_t get_kern_max_proc(void);
</ins><span class="cx"> static void do_file_init(void) __attribute__((constructor));
</span><span class="cx">
</span><span class="cx"> /* file local globals */
</span><ins>+static bool do_apple_internal_magic;
</ins><span class="cx"> static size_t total_children;
</span><span class="cx"> static size_t total_anon_children;
</span><span class="cx"> static mach_port_t the_exception_server;
</span><span class="lines">@@ -2046,9 +2048,15 @@
</span><span class="cx"> job_log_stray_pg(job_t j)
</span><span class="cx"> {
</span><span class="cx"> int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PGRP, j->p };
</span><del>- size_t i, kp_cnt, len = 10*1024*1024;
</del><ins>+ size_t i, kp_cnt, len = sizeof(struct kinfo_proc) * get_kern_max_proc();
</ins><span class="cx"> struct kinfo_proc *kp;
</span><span class="cx">
</span><ins>+#if TARGET_OS_EMBEDDED
+ if (!do_apple_internal_magic) {
+ return;
+ }
+#endif
+
</ins><span class="cx"> if (!job_assumes(j, (kp = malloc(len)) != NULL)) {
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -2821,10 +2829,17 @@
</span><span class="cx"> job_find_and_blame_pids_with_weird_uids(job_t j)
</span><span class="cx"> {
</span><span class="cx"> int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_ALL };
</span><del>- size_t i, kp_cnt, len = 10*1024*1024;
- struct kinfo_proc *kp = malloc(len);
</del><ins>+ size_t i, kp_cnt, len = sizeof(struct kinfo_proc) * get_kern_max_proc();
+ struct kinfo_proc *kp;
</ins><span class="cx"> uid_t u = j->mach_uid;
</span><span class="cx">
</span><ins>+#if TARGET_OS_EMBEDDED
+ if (!do_apple_internal_magic) {
+ return;
+ }
+#endif
+ kp = malloc(len);
+
</ins><span class="cx"> if (!job_assumes(j, kp != NULL)) {
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -4302,9 +4317,14 @@
</span><span class="cx"> jobmgr_log_stray_children(jobmgr_t jm)
</span><span class="cx"> {
</span><span class="cx"> int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_ALL };
</span><del>- size_t i, kp_cnt, len = 10*1024*1024;
</del><ins>+ size_t i, kp_cnt, len = sizeof(struct kinfo_proc) * get_kern_max_proc();
</ins><span class="cx"> struct kinfo_proc *kp;
</span><span class="cx">
</span><ins>+#if TARGET_OS_EMBEDDED
+ if (!do_apple_internal_magic) {
+ return;
+ }
+#endif
</ins><span class="cx"> if (jm->parentmgr || getpid() != 1) {
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -6778,9 +6798,26 @@
</span><span class="cx"> free(w4r);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+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;
+}
+
</ins><span class="cx"> void
</span><span class="cx"> do_file_init(void)
</span><span class="cx"> {
</span><ins>+ struct stat sb;
+
</ins><span class="cx"> launchd_assert(mach_timebase_info(&tbi) == 0);
</span><span class="cx">
</span><ins>+ if (stat("/AppleInternal", &sb) == 0) {
+ do_apple_internal_magic = true;
+ }
</ins><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>