[launchd-changes] [23530] trunk/launchd/src

[source_changes at macosforge.org]

Revision: 23530
          http://trac.macosforge.org/projects/launchd/changeset/23530
Author:   zarzycki at apple.com
Date:     2008-03-04 09:53:17 -0800 (Tue, 04 Mar 2008)

Log Message:
-----------
<rdar://problem/5770964> More flexible is_apple_internal() check [10A14 vs. 10A12: 3-4 sec boot time regression (launchd)]

Modified Paths:
--------------
    trunk/launchd/src/launchctl.c
    trunk/launchd/src/launchd_runtime.c

Modified: trunk/launchd/src/launchctl.c
===================================================================
--- trunk/launchd/src/launchctl.c	2008-03-04 17:48:58 UTC (rev 23529)
+++ trunk/launchd/src/launchctl.c	2008-03-04 17:53:17 UTC (rev 23530)
@@ -3190,7 +3190,7 @@
 {
 	struct stat sb;
 
-	if (stat("/AppleInternal", &sb) == 0) {
+	if (stat("/AppleInternal", &sb) == 0 && stat("/var/db/disableAppleInternal", &sb) == -1) {
 		do_apple_internal_magic = true;
 	}
 }

Modified: trunk/launchd/src/launchd_runtime.c
===================================================================
--- trunk/launchd/src/launchd_runtime.c	2008-03-04 17:48:58 UTC (rev 23529)
+++ trunk/launchd/src/launchd_runtime.c	2008-03-04 17:53:17 UTC (rev 23530)
@@ -1647,7 +1647,7 @@
 		pid1_magic = true;
 	}
 
-	if (stat("/AppleInternal", &sb) != -1) {
+	if (stat("/AppleInternal", &sb) == 0 && stat("/var/db/disableAppleInternal", &sb) == -1) {
 		do_apple_internal_logging = true;
 	}
 }

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/launchd-changes/attachments/20080304/8d7be035/attachment.html