Changeset 23526

Timestamp:

03/03/08 16:46:00 (9 months ago)

Author:

zarzycki@…

Message:

Misc.

Files:

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

trunk/launchd/src/launchd_core_logic.c

@@ -6012 +6012 @@
         struct ldcred *ldc = runtime_get_caller_creds();
         kern_return_t kr;
+        bool per_pid_lookup = flags & BOOTSTRAP_PER_PID_SERVICE;
 
         if (!launchd_assumes(j != NULL)) {
@@ -6024 +6025 @@
 #endif
 
-        if (unlikely(!mspolicy_check(j, servicename, flags & BOOTSTRAP_PER_PID_SERVICE))) {
+        if (unlikely(!mspolicy_check(j, servicename, per_pid_lookup))) {
                 job_log(j, LOG_NOTICE, "Policy denied Mach service lookup: %s", servicename);
                 return BOOTSTRAP_NOT_PRIVILEGED;
         }
 
-        if (flags & BOOTSTRAP_PER_PID_SERVICE) {
+        if (per_pid_lookup) {
                 ms = jobmgr_lookup_service(j->mgr, servicename, false, target_pid);
         } else {
@@ -6045 +6046 @@
         if (likely(ms)) {
                 job_assumes(j, machservice_port(ms) != MACH_PORT_NULL);
-                job_log(j, LOG_DEBUG, "%sMach service lookup: %s", flags & BOOTSTRAP_PER_PID_SERVICE ? "Per PID " : "", servicename);
-
-                if (unlikely(j->lastlookup == ms && j->lastlookup_gennum == ms->gen_num && !j->per_user)) {
+                job_log(j, LOG_DEBUG, "%sMach service lookup: %s", per_pid_lookup ? "Per PID " : "", servicename);
+
+                if (unlikely(!per_pid_lookup && j->lastlookup == ms && j->lastlookup_gennum == ms->gen_num && !j->per_user)) {
+                        /* we need to think more about the per_pid_lookup logic before logging about repeated lookups */
                         job_log(j, LOG_APPLEONLY, "Performance: Please fix the framework that talks to \"%s\" to cache the Mach port for service: %s", ms->job->label, servicename);
                 }
@@ -6057 +6059 @@
 
                 kr = BOOTSTRAP_SUCCESS;
-        } else if (!(flags & BOOTSTRAP_PER_PID_SERVICE) && (inherited_bootstrap_port != MACH_PORT_NULL)) {
+        } else if (!per_pid_lookup && (inherited_bootstrap_port != MACH_PORT_NULL)) {
                 job_log(j, LOG_DEBUG, "Mach service lookup forwarded: %s", servicename);
                 job_assumes(j, vproc_mig_look_up2_forward(inherited_bootstrap_port, srp, servicename, 0, 0) == 0);
@@ -6071 +6073 @@
                 return VPROC_ERR_TRY_PER_USER;
         } else {
-                job_log(j, LOG_DEBUG, "%sMach service lookup failed: %s", flags & BOOTSTRAP_PER_PID_SERVICE ? "Per PID " : "", servicename);
+                job_log(j, LOG_DEBUG, "%sMach service lookup failed: %s", per_pid_lookup ? "Per PID " : "", servicename);
                 kr = BOOTSTRAP_UNKNOWN_SERVICE;
         }