Changeset 23525

Timestamp:

2008-02-26 13:39:33 (8 months ago)

Author:

zarzycki@…

Message:

<rdar://problem/5741980> 10A14 vs. 10A12: 3-4 sec boot time regression (launchd)

Location:

trunk/launchd/src

Files:

• launchctl.c (modified) (5 diffs)
• launchd_core_logic.c (modified) (2 diffs)

trunk/launchd/src/launchctl.c

@@ -153 +153 @@
 static bool job_disabled_logic(launch_data_t obj);
 static void fix_bogus_file_metadata(void);
+static void do_file_init(void) __attribute__((constructor));
 
 typedef enum {
@@ -221 +222 @@
 static bool verbose;
 static bool is_managed;
+static bool do_apple_internal_magic;
 
 int
@@ -1482 +1484 @@
         assumes(load_and_unload_cmd(4, load_launchd_items) == 0);
 
-#ifdef __ppc__
         /*
          * 5066316
@@ -1525 +1526 @@
          *
          */
-        mach_timespec_t w = { 5, 0 };
-        IOKitWaitQuiet(kIOMasterPortDefault, &w);
-#endif
+        if (!do_apple_internal_magic) {
+                mach_timespec_t w = { 5, 0 };
+                IOKitWaitQuiet(kIOMasterPortDefault, &w);
+        }
 
         do_BootCache_magic(BOOTCACHE_TAG);
@@ -3183 +3185 @@
         }
 }
+
+void
+do_file_init(void)
+{
+        struct stat sb;
+
+        if (stat("/AppleInternal", &sb) == 0) {
+                do_apple_internal_magic = true;
+        }
+}

trunk/launchd/src/launchd_core_logic.c

@@ -4029 +4029 @@
         struct stat sb;
         bool good_exit = (WIFEXITED(j->last_exit_status) && WEXITSTATUS(j->last_exit_status) == 0);
-
-#ifdef __ppc__
+        bool is_not_kextd = (do_apple_internal_logging || (strcmp(j->label, "com.apple.kextd") != 0));
+
         /*
          * 5066316
@@ -4037 +4037 @@
          * launchctl.c for the other half of this hack.
          */
-        if (unlikely(j->mgr->global_on_demand_cnt > 0 && strcmp(j->label, "com.apple.kextd") != 0)) {
+        if (unlikely(j->mgr->global_on_demand_cnt > 0 && is_not_kextd)) {
                 return false;
         }
-#else
-        if (unlikely(j->mgr->global_on_demand_cnt > 0)) {
-                return false;
-        }
-#endif
 
         if (j->start_pending) {