April 2009 - launchd-changes - lists.macosforge.org

[23915] trunk/launchd/src
by source_changes＠macosforge.org 30 Apr '09

30 Apr '09

Revision: 23915 http://trac.macosforge.org/projects/launchd/changeset/23915 Author: dsorresso(a)apple.com Date: 2009-04-30 16:34:49 -0700 (Thu, 30 Apr 2009) Log Message: ----------- Using sysctl(2) instead of IOKit to get boot args. Modified Paths: -------------- trunk/launchd/src/launchctl.c trunk/launchd/src/launchd.c trunk/launchd/src/launchd_core_logic.c trunk/launchd/src/launchd_runtime.c Modified: trunk/launchd/src/launchctl.c =================================================================== --- trunk/launchd/src/launchctl.c 2009-04-30 19:33:32 UTC (rev 23914) +++ trunk/launchd/src/launchctl.c 2009-04-30 23:34:49 UTC (rev 23915) @@ -178,7 +178,6 @@ static void fix_bogus_file_metadata(void); static void do_file_init(void) __attribute__((constructor)); static void setup_system_context(void); -static void tell_launchd_about_boot_args(void); static void handle_system_bootstrapper_crashes_separately(void); static void fatal_signal_handler(int sig, siginfo_t *si, void *uap); @@ -265,8 +264,7 @@ static bool rootuser_context; static bool bootstrapping_system; static bool bootstrapping_peruser; -static bool g_shutdown_debugging = false; -static bool g_booting_verbose = false; +static bool g_verbose_boot = false; static bool g_job_overrides_db_has_changed = false; static CFMutableDictionaryRef g_job_overrides_db = NULL; @@ -1889,7 +1887,7 @@ void handle_system_bootstrapper_crashes_separately(void) { - if( !g_booting_verbose ) { + if( !g_verbose_boot ) { return; } @@ -1971,7 +1969,6 @@ assumes(fwexec(rcserver_tool, NULL) != -1); } - tell_launchd_about_boot_args(); read_launchd_conf(); handle_system_bootstrapper_crashes_separately(); @@ -3080,44 +3077,6 @@ bootstrap_port = rootbs; } -static void -tell_launchd_about_boot_args(void) -{ - CFTypeRef value = NULL; - do { - io_registry_entry_t entry = IORegistryEntryFromPath(kIOMasterPortDefault, "IODeviceTree:/options"); - if( !assumes(entry != IO_OBJECT_NULL) ) { - break; - } - - value = IORegistryEntryCreateCFProperty(entry, CFSTR("boot-args"), kCFAllocatorDefault, 0); - if( !assumes(value != NULL) ) { - break; - } - - IOObjectRelease(entry); - } while( 0 ); - - if( value ) { - /* Normally I'd just use CFStringFind(), but the compiler whines about it returning a - * struct with -Wall. - */ - CFRange range = { 0, CFStringGetLength(value) }; - CFRange found_range = { 0, 0 }; - - g_booting_verbose = CFStringFindWithOptions(value, CFSTR("-v"), range, 0, &found_range); - CFRelease(value); - - if( g_booting_verbose ) { - assumes(vproc_swap_integer(NULL, VPROC_GSK_VERBOSE_BOOT, (int64_t *)&g_booting_verbose, NULL) == KERN_SUCCESS); - - if( g_shutdown_debugging ) { - assumes(vproc_swap_integer(NULL, VPROC_GSK_SHUTDOWN_DEBUGGING, (int64_t *)&g_booting_verbose, NULL) == KERN_SUCCESS); - } - } - } -} - int submit_cmd(int argc, char *const argv[]) { @@ -4093,8 +4052,11 @@ if (stat("/AppleInternal", &sb) == 0 && stat("/var/db/disableAppleInternal", &sb) == -1) { do_apple_internal_magic = true; } - - if( stat("/var/db/.launchd_shutdown_debugging", &sb) == 0 ) { - g_shutdown_debugging = true; + + char bootargs[128]; + size_t len = 0; + int r = sysctlbyname("kern.bootargs", bootargs, &len, NULL, 0); + if( r == 0 && strnstr(bootargs, "-v", len) != NULL ) { + g_verbose_boot = true; } } Modified: trunk/launchd/src/launchd.c =================================================================== --- trunk/launchd/src/launchd.c 2009-04-30 19:33:32 UTC (rev 23914) +++ trunk/launchd/src/launchd.c 2009-04-30 23:34:49 UTC (rev 23915) @@ -210,6 +210,14 @@ runtime_syslog(LOG_NOTICE | LOG_CONSOLE_FORCE, "*** Using libgmalloc ***"); } + if( g_verbose_boot ) { + runtime_syslog(LOG_NOTICE | LOG_CONSOLE, "*** Verbose boot, will log to /dev/console. ***"); + } + + if( g_shutdown_debugging ) { + runtime_syslog(LOG_NOTICE | LOG_CONSOLE_FORCE, "*** Shutdown debugging is enabled. ***"); + } + /* PID 1 doesn't have a flat namespace. */ g_flat_mach_namespace = false; } Modified: trunk/launchd/src/launchd_core_logic.c =================================================================== --- trunk/launchd/src/launchd_core_logic.c 2009-04-30 19:33:32 UTC (rev 23914) +++ trunk/launchd/src/launchd_core_logic.c 2009-04-30 23:34:49 UTC (rev 23915) @@ -3008,7 +3008,7 @@ return NULL; } #endif - + /* * The whole job removal logic needs to be consolidated. The fact that * a job can be removed from just about anywhere makes it easy to have @@ -7168,18 +7168,6 @@ case VPROC_GSK_WAITFORDEBUGGER: j->wait4debugger_oneshot = inval; break; - case VPROC_GSK_SHUTDOWN_DEBUGGING: - if( pid1_magic && j->is_bootstrapper && inval ) { - runtime_syslog(LOG_NOTICE | LOG_CONSOLE_FORCE, "*** Shutdown debugging is enabled. ***"); - g_shutdown_debugging = inval; - } - break; - case VPROC_GSK_VERBOSE_BOOT: - if( pid1_magic && j->is_bootstrapper && inval ) { - g_verbose_boot = inval; - runtime_syslog(LOG_NOTICE | LOG_CONSOLE, "*** Verbose boot, will log to /dev/console. ***"); - } - break; case VPROC_GSK_PERUSER_SUSPEND: if( job_assumes(j, pid1_magic && ldc->euid == 0) ) { mach_port_t junk = MACH_PORT_NULL; Modified: trunk/launchd/src/launchd_runtime.c =================================================================== --- trunk/launchd/src/launchd_runtime.c 2009-04-30 19:33:32 UTC (rev 23914) +++ trunk/launchd/src/launchd_runtime.c 2009-04-30 23:34:49 UTC (rev 23915) @@ -1829,6 +1829,17 @@ g_log_pid1_shutdown = true; } + char bootargs[128]; + size_t len = sizeof(bootargs); + int r = pid1_magic ? sysctlbyname("kern.bootargs", bootargs, &len, NULL, 0) : -1; + if( r == 0 && strnstr(bootargs, "-v", len) != NULL ) { + g_verbose_boot = true; + } + + if( pid1_magic && g_verbose_boot && stat("/var/db/.launchd_shutdown_debugging", &sb) == 0 ) { + g_shutdown_debugging = true; + } + if( stat("/var/db/.launchd_log_strict_usage", &sb) == 0 ) { g_log_strict_usage = true; }

1 0

[23914] trunk/launchd/src/launchd_core_logic.c
by source_changes＠macosforge.org 30 Apr '09

30 Apr '09

Revision: 23914 http://trac.macosforge.org/projects/launchd/changeset/23914 Author: dsorresso(a)apple.com Date: 2009-04-30 12:33:32 -0700 (Thu, 30 Apr 2009) Log Message: ----------- <rdar://problem/6839998> Finish allowing a session to be bootstrapped in on-demand mode Modified Paths: -------------- trunk/launchd/src/launchd_core_logic.c Modified: trunk/launchd/src/launchd_core_logic.c =================================================================== --- trunk/launchd/src/launchd_core_logic.c 2009-04-27 23:27:10 UTC (rev 23913) +++ trunk/launchd/src/launchd_core_logic.c 2009-04-30 19:33:32 UTC (rev 23914) @@ -8149,6 +8149,7 @@ LIST_INSERT_HEAD(&jmr->jobs, j, sle); LIST_INSERT_HEAD(&jmr->active_jobs[ACTIVE_JOB_HASH(j->p)], j, pid_hash_sle); + j->mgr = jmr; job_set_global_on_demand(j, true); }

1 0

[23913] tags/launchd-322/
by source_changes＠macosforge.org 27 Apr '09

27 Apr '09

Revision: 23913 http://trac.macosforge.org/projects/launchd/changeset/23913 Author: dsorresso(a)apple.com Date: 2009-04-27 16:27:10 -0700 (Mon, 27 Apr 2009) Log Message: ----------- "Tagging launchd-322 from https://svn.macosforge.org/repository/launchd/trunk" Added Paths: ----------- tags/launchd-322/ Property changes on: tags/launchd-322 ___________________________________________________________________ Added: svn:ignore + build Added: svn:mergeinfo + /branches/PR-5092682:23731-23742 /branches/PR-5898404:23681-23700 /branches/PR-5978442:23651-23701 /branches/PR-6132016:23719-23738 /branches/PR-6271234:23818-23822 /branches/PR-6562592:23812-23822 /branches/PR-6564965:23832-23851 /branches/PR-6589133:23810-23822 /branches/PR-6609410:23828

1 0

[23912] trunk/launchd/src/launchctl.c
by source_changes＠macosforge.org 27 Apr '09

27 Apr '09

Revision: 23912 http://trac.macosforge.org/projects/launchd/changeset/23912 Author: dsorresso(a)apple.com Date: 2009-04-27 16:25:54 -0700 (Mon, 27 Apr 2009) Log Message: ----------- Last commit: <rdar://problem/6828026> launchctl should open /dev/console so diagnostic messages are visible This commit: <rdar://problem/6827830> launchd should pass -1 to listen(2)'s backlog argument to respect Server's increased backlog Modified Paths: -------------- trunk/launchd/src/launchctl.c Modified: trunk/launchd/src/launchctl.c =================================================================== --- trunk/launchd/src/launchctl.c 2009-04-27 22:58:27 UTC (rev 23911) +++ trunk/launchd/src/launchctl.c 2009-04-27 23:25:54 UTC (rev 23912) @@ -1193,7 +1193,7 @@ if (setm) { chmod(sun.sun_path, sun_mode); } - if ((st == SOCK_STREAM || st == SOCK_SEQPACKET) && listen(sfd, SOMAXCONN) == -1) { + if ((st == SOCK_STREAM || st == SOCK_SEQPACKET) && listen(sfd, -1) == -1) { close(sfd); return; }

1 0

[23910] tags/launchd-321/
by source_changes＠macosforge.org 27 Apr '09

27 Apr '09

Revision: 23910 http://trac.macosforge.org/projects/launchd/changeset/23910 Author: dsorresso(a)apple.com Date: 2009-04-27 12:43:26 -0700 (Mon, 27 Apr 2009) Log Message: ----------- "Tagging launchd-321 from https://svn.macosforge.org/repository/launchd/trunk" Added Paths: ----------- tags/launchd-321/ Property changes on: tags/launchd-321 ___________________________________________________________________ Added: svn:ignore + build Added: svn:mergeinfo + /branches/PR-5092682:23731-23742 /branches/PR-5898404:23681-23700 /branches/PR-5978442:23651-23701 /branches/PR-6132016:23719-23738 /branches/PR-6271234:23818-23822 /branches/PR-6562592:23812-23822 /branches/PR-6564965:23832-23851 /branches/PR-6589133:23810-23822 /branches/PR-6609410:23828

1 0

[23909] trunk/launchd/src
by source_changes＠macosforge.org 27 Apr '09

27 Apr '09

Revision: 23909 http://trac.macosforge.org/projects/launchd/changeset/23909 Author: dsorresso(a)apple.com Date: 2009-04-27 10:02:41 -0700 (Mon, 27 Apr 2009) Log Message: ----------- <rdar://problem/6826450> Modified Paths: -------------- trunk/launchd/src/launch_priv.h trunk/launchd/src/launchd_core_logic.c Modified: trunk/launchd/src/launch_priv.h =================================================================== --- trunk/launchd/src/launch_priv.h 2009-04-24 22:51:09 UTC (rev 23908) +++ trunk/launchd/src/launch_priv.h 2009-04-27 17:02:41 UTC (rev 23909) @@ -61,8 +61,8 @@ #define LAUNCH_JOBKEY_JETSAMPRIORITY "JetsamPriority" #define LAUNCH_JOBKEY_SECURITYSESSIONUUID "SecuritySessionUUID" -#define LAUNCH_JOBKEY_EMBEDDEDSHUTDOWNAUTHORITY "EmbeddedShutdownAuthority" #define LAUNCH_JOBKEY_EMBEDDEDPRIVILEGEDISPENSATION "EmbeddedPrivilegeDispensation" +#define LAUNCH_JOBKEY_EMBEDDEDMAINTHREADPRIORITY "EmbeddedMainThreadPriority" #define LAUNCH_JOBKEY_ENTERKERNELDEBUGGERBEFOREKILL "EnterKernelDebuggerBeforeKill" #define LAUNCH_JOBKEY_PERJOBMACHSERVICES "PerJobMachServices" Modified: trunk/launchd/src/launchd_core_logic.c =================================================================== --- trunk/launchd/src/launchd_core_logic.c 2009-04-24 22:51:09 UTC (rev 23908) +++ trunk/launchd/src/launchd_core_logic.c 2009-04-27 17:02:41 UTC (rev 23909) @@ -78,6 +78,7 @@ #include <spawn.h> #include <libproc.h> #include <malloc/malloc.h> +#include <pthread.h> #if HAVE_SANDBOX #define __APPLE_API_PRIVATE #include <sandbox.h> @@ -464,6 +465,7 @@ int nice; int stdout_err_fd; long long jetsam_priority; + long long main_thread_priority; uint32_t timeout; uint32_t exit_timeout; uint64_t sent_signal_time; @@ -1887,6 +1889,8 @@ } else { j->exit_timeout = (typeof(j->exit_timeout)) value; } + } else if( strcasecmp(key, LAUNCH_JOBKEY_EMBEDDEDMAINTHREADPRIORITY) == 0 ) { + j->main_thread_priority = value; } break; case 'j': @@ -4185,7 +4189,16 @@ job_assumes(j, proc_setpcontrol(PROC_SETPC_TERMINATE) == 0); } #endif - + +#if TARGET_OS_EMBEDDED + if( j->main_thread_priority != 0 ) { + struct sched_param params; + bzero(&params, sizeof(params)); + params.sched_priority = j->main_thread_priority; + job_assumes(j, pthread_setschedparam(pthread_self(), SCHED_OTHER, &params) != -1); + } +#endif + /* * We'd like to call setsid() unconditionally, but we have reason to * believe that prevents launchd from being able to send signals to

1 0

[23908] tags/launchd-320/
by source_changes＠macosforge.org 24 Apr '09

24 Apr '09

Revision: 23908 http://trac.macosforge.org/projects/launchd/changeset/23908 Author: dsorresso(a)apple.com Date: 2009-04-24 15:51:09 -0700 (Fri, 24 Apr 2009) Log Message: ----------- "Tagging launchd-320 from https://svn.macosforge.org/repository/launchd/trunk" Added Paths: ----------- tags/launchd-320/ Property changes on: tags/launchd-320 ___________________________________________________________________ Added: svn:ignore + build Added: svn:mergeinfo + /branches/PR-5092682:23731-23742 /branches/PR-5898404:23681-23700 /branches/PR-5978442:23651-23701 /branches/PR-6132016:23719-23738 /branches/PR-6271234:23818-23822 /branches/PR-6562592:23812-23822 /branches/PR-6564965:23832-23851 /branches/PR-6589133:23810-23822 /branches/PR-6609410:23828

1 0

[23907] trunk/launchd/src/launchd_core_logic.c
by source_changes＠macosforge.org 24 Apr '09

24 Apr '09

Revision: 23907 http://trac.macosforge.org/projects/launchd/changeset/23907 Author: dsorresso(a)apple.com Date: 2009-04-23 18:21:21 -0700 (Thu, 23 Apr 2009) Log Message: ----------- More complete fix for <rdar://problem/6803005>. Modified Paths: -------------- trunk/launchd/src/launchd_core_logic.c Modified: trunk/launchd/src/launchd_core_logic.c =================================================================== --- trunk/launchd/src/launchd_core_logic.c 2009-04-23 20:28:24 UTC (rev 23906) +++ trunk/launchd/src/launchd_core_logic.c 2009-04-24 01:21:21 UTC (rev 23907) @@ -372,7 +372,7 @@ #define jobmgr_assumes(jm, e) \ (unlikely(!(e)) ? jobmgr_log_bug(jm, __LINE__), false : true) -static jobmgr_t jobmgr_new(jobmgr_t jm, mach_port_t requestorport, mach_port_t transfer_port, bool sflag, const char *name, mach_port_t session_port); +static jobmgr_t jobmgr_new(jobmgr_t jm, mach_port_t requestorport, mach_port_t transfer_port, bool sflag, const char *name, bool no_init, mach_port_t session_port); static job_t jobmgr_import2(jobmgr_t jm, launch_data_t pload); static jobmgr_t jobmgr_parent(jobmgr_t jm); static jobmgr_t jobmgr_do_garbage_collection(jobmgr_t jm); @@ -5521,14 +5521,14 @@ jobmgr_t jobmgr_do_garbage_collection(jobmgr_t jm) { - if( !jm->shutting_down ) { - return jm; - } - jobmgr_t jmi = NULL, jmn = NULL; SLIST_FOREACH_SAFE(jmi, &jm->submgrs, sle, jmn) { jobmgr_do_garbage_collection(jmi); } + + if( !jm->shutting_down ) { + return jm; + } if( SLIST_EMPTY(&jm->submgrs) ) { jobmgr_log(jm, LOG_DEBUG, "No submanagers left."); @@ -5800,7 +5800,7 @@ } jobmgr_t -jobmgr_new(jobmgr_t jm, mach_port_t requestorport, mach_port_t transfer_port, bool sflag, const char *name, mach_port_t session_port) +jobmgr_new(jobmgr_t jm, mach_port_t requestorport, mach_port_t transfer_port, bool sflag, const char *name, bool no_init, mach_port_t session_port) { mach_msg_size_t mxmsgsz; job_t bootstrapper = NULL; @@ -5813,7 +5813,7 @@ return NULL; } - jmr = calloc(1, sizeof(struct jobmgr_s) + (name ? (strlen(name) + 1) : 128)); + jmr = calloc(1, sizeof(struct jobmgr_s) + (name ? (strlen(name) + 1) : NAME_MAX + 1)); if (!jobmgr_assumes(jm, jmr != NULL)) { return NULL; @@ -5884,7 +5884,7 @@ jobmgr_assumes(jmr, kevent_mod(0, EVFILT_FS, EV_ADD, VQ_MOUNT|VQ_UNMOUNT|VQ_UPDATE, 0, jmr) != -1); } - if (name) { + if (name && !no_init) { bootstrapper = jobmgr_init_session(jmr, name, sflag); } @@ -5994,7 +5994,7 @@ } if (jm->req_port == port) { - jobmgr_log(jm, LOG_INFO, "Request port died: 0x%x", port); + jobmgr_log(jm, LOG_DEBUG, "Request port died: %i", MACH_PORT_INDEX(port)); return jobmgr_shutdown(jm); } @@ -8117,7 +8117,7 @@ launchd_assert(launch_data_array_get_count(out_obj_array) == l2l_port_cnt); - if (!job_assumes(j, (jmr = jobmgr_new(j->mgr, reqport, rcvright, false, session_type, audit_session)) != NULL)) { + if (!job_assumes(j, (jmr = jobmgr_new(j->mgr, reqport, rcvright, false, session_type, false, audit_session)) != NULL)) { kr = BOOTSTRAP_NO_MEMORY; goto out; } @@ -8166,6 +8166,7 @@ } if (likely(ms = machservice_new(j_for_service, serv_name, &l2l_ports[l2l_i], serv_perpid))) { + job_log(j, LOG_DEBUG, "Importing %s into new bootstrap.", serv_name); machservice_request_notifications(ms); } } @@ -8228,7 +8229,7 @@ } } - jobmgr_log(j->mgr, LOG_DEBUG, "Initializing: %s", session_type); + jobmgr_log(j->mgr, LOG_DEBUG, "Initializing as %s", session_type); strcpy(j->mgr->name_init, session_type); if (job_assumes(j, (j2 = jobmgr_init_session(j->mgr, session_type, false)))) { @@ -8263,7 +8264,7 @@ } if( !target_jm ) { - target_jm = jobmgr_new(j->mgr, requestor_port, MACH_PORT_NULL, false, session_name, audit_session); + target_jm = jobmgr_new(j->mgr, requestor_port, MACH_PORT_NULL, false, session_name, false, audit_session); if( !target_jm ) { mach_port_deallocate(mach_task_self(), audit_session); } else { @@ -8485,7 +8486,7 @@ char name[NAME_MAX]; snprintf(name, sizeof(name), "%s[%i].subset.%i", j->anonymous ? j->prog : j->label, j->p, MACH_PORT_INDEX(requestorport)); - if (!job_assumes(j, (jmr = jobmgr_new(j->mgr, requestorport, MACH_PORT_NULL, false, name, j->audit_session)) != NULL)) { + if (!job_assumes(j, (jmr = jobmgr_new(j->mgr, requestorport, MACH_PORT_NULL, false, name, true, j->audit_session)) != NULL)) { if (unlikely(requestorport == MACH_PORT_NULL)) { return BOOTSTRAP_NOT_PRIVILEGED; } @@ -8729,7 +8730,7 @@ SLIST_INIT(&s_curious_jobs); LIST_INIT(&s_needing_sessions); - launchd_assert((root_jobmgr = jobmgr_new(NULL, MACH_PORT_NULL, MACH_PORT_NULL, sflag, root_session_type, MACH_PORT_NULL)) != NULL); + launchd_assert((root_jobmgr = jobmgr_new(NULL, MACH_PORT_NULL, MACH_PORT_NULL, sflag, root_session_type, false, MACH_PORT_NULL)) != NULL); uint32_t fflags = NOTE_ATTRIB | NOTE_LINK | NOTE_REVOKE | NOTE_EXTEND | NOTE_WRITE; s_no_hang_fd = open("/dev/autofs_nowait", O_EVTONLY | O_NONBLOCK);

1 0

[23906] trunk/launchd/src
by source_changes＠macosforge.org 23 Apr '09

23 Apr '09

Revision: 23906 http://trac.macosforge.org/projects/launchd/changeset/23906 Author: dsorresso(a)apple.com Date: 2009-04-23 13:28:24 -0700 (Thu, 23 Apr 2009) Log Message: ----------- <rdar://problem/6803005> LEAK: 10A333: Finder leaking memory and hangs after running FinderOpsPlus tool Fixes for bstree subcommand. Modified Paths: -------------- trunk/launchd/src/bootstrap_priv.h trunk/launchd/src/launchctl.c trunk/launchd/src/launchd_core_logic.c trunk/launchd/src/launchd_runtime.c trunk/launchd/src/libbootstrap.c trunk/launchd/src/protocol_vproc.defs trunk/launchd/src/vproc_internal.h Modified: trunk/launchd/src/bootstrap_priv.h =================================================================== --- trunk/launchd/src/bootstrap_priv.h 2009-04-22 20:18:51 UTC (rev 23905) +++ trunk/launchd/src/bootstrap_priv.h 2009-04-23 20:28:24 UTC (rev 23906) @@ -27,13 +27,16 @@ #pragma GCC visibility push(default) -#define BOOTSTRAP_PER_PID_SERVICE 1 << 0 -#define BOOTSTRAP_ALLOW_LOOKUP 1 << 1 -#define BOOTSTRAP_DENY_JOB_CREATION 1 << 2 -#define BOOTSTRAP_PRIVILEGED_SERVER 1 << 3 +#define BOOTSTRAP_PER_PID_SERVICE 1 << 0 +#define BOOTSTRAP_ALLOW_LOOKUP 1 << 1 +#define BOOTSTRAP_DENY_JOB_CREATION 1 << 2 +#define BOOTSTRAP_PRIVILEGED_SERVER 1 << 3 +#define BOOTSTRAP_FORCE_LOCAL 1 << 4 -#define BOOTSTRAP_PROPERTY_SUBSET 1 << 0 -#define BOOTSTRAP_PROPERTY_PERUSER 1 << 1 +#define BOOTSTRAP_PROPERTY_EXPLICITSUBSET 1 << 0 /* Created via bootstrap_subset(). */ +#define BOOTSTRAP_PROPERTY_IMPLICITSUBSET 1 << 1 /* Created via _vprocmgr_switch_to_session(). */ +#define BOOTSTRAP_PROPERTY_MOVEDSUBSET 1 << 2 /* Created via _vprocmgr_move_subset_to_user(). */ +#define BOOTSTRAP_PROPERTY_PERUSER 1 << 3 /* A per-user launchd's root bootstrap. */ kern_return_t bootstrap_register2(mach_port_t bp, name_t service_name, mach_port_t sp, uint64_t flags); Modified: trunk/launchd/src/launchctl.c =================================================================== --- trunk/launchd/src/launchctl.c 2009-04-22 20:18:51 UTC (rev 23905) +++ trunk/launchd/src/launchctl.c 2009-04-23 20:28:24 UTC (rev 23906) @@ -209,7 +209,7 @@ static int umask_cmd(int argc, char *const argv[]); static int getrusage_cmd(int argc, char *const argv[]); static int bsexec_cmd(int argc, char *const argv[]); -static int _bslist_cmd(mach_port_t bport, unsigned int depth, bool show_job); +static int _bslist_cmd(mach_port_t bport, unsigned int depth, bool show_job, bool local_only); static int bslist_cmd(int argc, char *const argv[]); static int _bstree_cmd(mach_port_t bsport, unsigned int depth, bool show_jobs); static int bstree_cmd(int argc __attribute__((unused)), char * const argv[] __attribute__((unused))); @@ -3325,7 +3325,7 @@ } int -_bslist_cmd(mach_port_t bport, unsigned int depth, bool show_job) +_bslist_cmd(mach_port_t bport, unsigned int depth, bool show_job, bool local_only) { kern_return_t result; name_array_t service_names; @@ -3339,7 +3339,9 @@ return 1; } - result = bootstrap_info(bport, &service_names, &service_cnt, &service_jobs, &service_jobs_cnt, &service_actives, &service_active_cnt); + uint64_t flags = 0; + flags |= local_only ? BOOTSTRAP_FORCE_LOCAL : 0; + result = bootstrap_info(bport, &service_names, &service_cnt, &service_jobs, &service_jobs_cnt, &service_actives, &service_active_cnt, flags); if (result != BOOTSTRAP_SUCCESS) { fprintf(stderr, "bootstrap_info(): %d\n", result); return 1; @@ -3380,7 +3382,7 @@ return 1; } - return _bslist_cmd(bport, 0, show_jobs); + return _bslist_cmd(bport, 0, show_jobs, false); } int @@ -3408,10 +3410,20 @@ } unsigned int i = 0; - _bslist_cmd(bsport, depth, show_jobs); + _bslist_cmd(bsport, depth, show_jobs, true); for( i = 0; i < cnt; i++ ) { - char *type = ( child_props[i] & BOOTSTRAP_PROPERTY_PERUSER ) ? "Per-user" : "Subset"; + char *type = NULL; + if( child_props[i] & BOOTSTRAP_PROPERTY_PERUSER ) { + type = "Per-user"; + } else if( child_props[i] & BOOTSTRAP_PROPERTY_EXPLICITSUBSET ) { + type = "Explicit Subset"; + } else if( child_props[i] & BOOTSTRAP_PROPERTY_IMPLICITSUBSET ) { + type = "Implicit Subset"; + } else if( child_props[i] & BOOTSTRAP_PROPERTY_MOVEDSUBSET ) { + type = "Moved Subset"; + } + fprintf(stdout, "%*s%s (%s)/\n", depth, "", child_names[i], type); if( child_ports[i] != MACH_PORT_NULL ) { _bstree_cmd(child_ports[i], depth + 4, show_jobs); Modified: trunk/launchd/src/launchd_core_logic.c =================================================================== --- trunk/launchd/src/launchd_core_logic.c 2009-04-22 20:18:51 UTC (rev 23905) +++ trunk/launchd/src/launchd_core_logic.c 2009-04-23 20:28:24 UTC (rev 23906) @@ -360,9 +360,9 @@ killed_hopefully_first_jobs :1, killed_normal_jobs :1, killed_hopefully_last_jobs :1, - killed_stray_jobs :1, - created_via_subset :1; + killed_stray_jobs :1; char sample_log_file[PATH_MAX]; + uint32_t properties; union { const char name[0]; char name_init[0]; @@ -5344,13 +5344,13 @@ jobmgr_t jm_to_insert = j->mgr; if( g_flat_mach_namespace ) { - jm_to_insert = j->mgr->created_via_subset ? j->mgr : root_jobmgr; + jm_to_insert = (j->mgr->properties & BOOTSTRAP_PROPERTY_EXPLICITSUBSET) ? j->mgr : root_jobmgr; } LIST_INSERT_HEAD(&jm_to_insert->ms_hash[hash_ms(ms->name)], ms, name_hash_sle); LIST_INSERT_HEAD(&port_hash[HASH_PORT(ms->port)], ms, port_hash_sle); - job_log(j, LOG_DEBUG, "Mach service added%s: %s", j->mgr->created_via_subset ? " to private namespace" : "", name); + job_log(j, LOG_DEBUG, "Mach service added%s: %s", (j->mgr->properties & BOOTSTRAP_PROPERTY_EXPLICITSUBSET) ? " to private namespace" : "", name); return ms; out_bad2: @@ -5900,6 +5900,10 @@ if (bootstrapper) { bootstrapper->audit_session = session_port; + if( session_port != MACH_PORT_NULL ) { + mach_port_mod_refs(mach_task_self(), session_port, MACH_PORT_RIGHT_SEND, 1); + } + jobmgr_log(jmr, LOG_DEBUG, "Bootstrapping new job manager with audit session %u", session_port); jobmgr_assumes(jmr, job_dispatch(bootstrapper, true) != NULL); } @@ -6029,7 +6033,7 @@ return NULL; } - jobmgr_t jm_to_search = ( g_flat_mach_namespace && !jm->created_via_subset ) ? root_jobmgr : jm; + jobmgr_t jm_to_search = ( g_flat_mach_namespace && !(jm->properties & BOOTSTRAP_PROPERTY_EXPLICITSUBSET) ) ? root_jobmgr : jm; LIST_FOREACH(ms, &jm_to_search->ms_hash[hash_ms(name)], name_hash_sle) { if (!ms->per_pid && strcmp(name, ms->name) == 0) { return ms; @@ -7706,7 +7710,8 @@ kern_return_t job_mig_info(job_t j, name_array_t *servicenamesp, unsigned int *servicenames_cnt, name_array_t *servicejobsp, unsigned int *servicejobs_cnt, - bootstrap_status_array_t *serviceactivesp, unsigned int *serviceactives_cnt) + bootstrap_status_array_t *serviceactivesp, unsigned int *serviceactives_cnt, + uint64_t flags) { name_array_t service_names = NULL; name_array_t service_jobs = NULL; @@ -7718,7 +7723,15 @@ return BOOTSTRAP_NO_MEMORY; } - jm = (g_flat_mach_namespace && !j->mgr->created_via_subset) ? root_jobmgr : j->mgr; + if( g_flat_mach_namespace ) { + if( (j->mgr->properties & BOOTSTRAP_PROPERTY_EXPLICITSUBSET) || (flags & BOOTSTRAP_FORCE_LOCAL) ) { + jm = j->mgr; + } else { + jm = root_jobmgr; + } + } else { + jm = j->mgr; + } unsigned int i = 0; struct machservice *msi = NULL; @@ -7808,7 +7821,7 @@ jobmgr_t jmr = j->mgr; jobmgr_t jmi = NULL; SLIST_FOREACH( jmi, &jmr->submgrs, sle ) { - cnt += g_flat_mach_namespace ? ( jmi->created_via_subset ? 1 : 0 ) : 1; + cnt++; } /* Find our per-user launchds if we're PID 1. */ @@ -7846,40 +7859,36 @@ unsigned int cnt2 = 0; SLIST_FOREACH( jmi, &jmr->submgrs, sle ) { - if( (g_flat_mach_namespace && jmi->created_via_subset) || !g_flat_mach_namespace ) { - if( jobmgr_assumes(jmi, launchd_mport_make_send(jmi->jm_port)) == KERN_SUCCESS ) { - _child_ports[cnt2] = jmi->jm_port; - } else { - _child_ports[cnt2] = MACH_PORT_NULL; - } - - strlcpy(_child_names[cnt2], jmi->name, sizeof(_child_names[0])); - _child_properties[cnt2] |= BOOTSTRAP_PROPERTY_SUBSET; - - cnt2++; + if( jobmgr_assumes(jmi, launchd_mport_make_send(jmi->jm_port) == KERN_SUCCESS) ) { + _child_ports[cnt2] = jmi->jm_port; + } else { + _child_ports[cnt2] = MACH_PORT_NULL; } + + strlcpy(_child_names[cnt2], jmi->name, sizeof(_child_names[0])); + _child_properties[cnt2] = jmi->properties; + + cnt2++; } - if( pid1_magic ) { - LIST_FOREACH( ji, &jmr->jobs, sle ) { - if( ji->per_user ) { - if( job_assumes(ji, SLIST_FIRST(&ji->machservices)->per_user_hack == true) ) { - mach_port_t port = machservice_port(SLIST_FIRST(&ji->machservices)); - - if( job_assumes(ji, launchd_mport_copy_send(port)) == KERN_SUCCESS ) { - _child_ports[cnt2] = port; - } else { - _child_ports[cnt2] = MACH_PORT_NULL; - } + if( pid1_magic ) LIST_FOREACH( ji, &jmr->jobs, sle ) { + if( ji->per_user ) { + if( job_assumes(ji, SLIST_FIRST(&ji->machservices)->per_user_hack == true) ) { + mach_port_t port = machservice_port(SLIST_FIRST(&ji->machservices)); + + if( job_assumes(ji, launchd_mport_copy_send(port) == KERN_SUCCESS) ) { + _child_ports[cnt2] = port; } else { _child_ports[cnt2] = MACH_PORT_NULL; } - - strlcpy(_child_names[cnt2], ji->label, sizeof(_child_names[0])); - _child_properties[cnt2] |= BOOTSTRAP_PROPERTY_PERUSER; - - cnt2++; + } else { + _child_ports[cnt2] = MACH_PORT_NULL; } + + strlcpy(_child_names[cnt2], ji->label, sizeof(_child_names[0])); + _child_properties[cnt2] |= BOOTSTRAP_PROPERTY_PERUSER; + + cnt2++; } } @@ -8113,6 +8122,8 @@ goto out; } + jmr->properties |= BOOTSTRAP_PROPERTY_MOVEDSUBSET; + /* This is a hack. We should be doing this in jobmgr_new(), but since we're in the middle of * processing an IPC request, we'll do this action before the new job manager can get any IPC * requests. This serialization is guaranteed since we are single-threaded in that respect. @@ -8255,6 +8266,8 @@ target_jm = jobmgr_new(j->mgr, requestor_port, MACH_PORT_NULL, false, session_name, audit_session); if( !target_jm ) { mach_port_deallocate(mach_task_self(), audit_session); + } else { + target_jm->properties |= BOOTSTRAP_PROPERTY_IMPLICITSUBSET; } } @@ -8480,7 +8493,7 @@ } *subsetportp = jmr->jm_port; - jmr->created_via_subset = true; + jmr->properties |= BOOTSTRAP_PROPERTY_EXPLICITSUBSET; job_log(j, LOG_DEBUG, "Job created a subset named \"%s\"", jmr->name); return BOOTSTRAP_SUCCESS; Modified: trunk/launchd/src/launchd_runtime.c =================================================================== --- trunk/launchd/src/launchd_runtime.c 2009-04-22 20:18:51 UTC (rev 23905) +++ trunk/launchd/src/launchd_runtime.c 2009-04-23 20:28:24 UTC (rev 23906) @@ -1124,7 +1124,9 @@ } continue; default: - launchd_assumes(mr == MACH_MSG_SUCCESS); + if( !launchd_assumes(mr == MACH_MSG_SUCCESS) ) { + runtime_syslog(LOG_ERR, "mach_msg(): %u: %s", mr, mach_error_string(mr)); + } continue; } Modified: trunk/launchd/src/libbootstrap.c =================================================================== --- trunk/launchd/src/libbootstrap.c 2009-04-22 20:18:51 UTC (rev 23905) +++ trunk/launchd/src/libbootstrap.c 2009-04-23 20:28:24 UTC (rev 23906) @@ -269,9 +269,10 @@ bootstrap_info(mach_port_t bp, name_array_t *service_names, mach_msg_type_number_t *service_namesCnt, name_array_t *service_jobs, mach_msg_type_number_t *service_jobsCnt, - bootstrap_status_array_t *service_active, mach_msg_type_number_t *service_activeCnt) + bootstrap_status_array_t *service_active, mach_msg_type_number_t *service_activeCnt, + uint64_t flags) { - return vproc_mig_info(bp, service_names, service_namesCnt, service_jobs, service_jobsCnt, service_active, service_activeCnt); + return vproc_mig_info(bp, service_names, service_namesCnt, service_jobs, service_jobsCnt, service_active, service_activeCnt, flags); } const char * Modified: trunk/launchd/src/protocol_vproc.defs =================================================================== --- trunk/launchd/src/protocol_vproc.defs 2009-04-22 20:18:51 UTC (rev 23905) +++ trunk/launchd/src/protocol_vproc.defs 2009-04-23 20:28:24 UTC (rev 23906) @@ -90,7 +90,8 @@ __bs_port : job_t; out __service_names : name_array_t, dealloc; out __service_jobs : name_array_t, dealloc; -out __service_active : bootstrap_status_array_t, dealloc); +out __service_active : bootstrap_status_array_t, dealloc; + __flags : uint64_t); routine subset( __bs_port : job_t; Modified: trunk/launchd/src/vproc_internal.h =================================================================== --- trunk/launchd/src/vproc_internal.h 2009-04-22 20:18:51 UTC (rev 23905) +++ trunk/launchd/src/vproc_internal.h 2009-04-23 20:28:24 UTC (rev 23906) @@ -118,7 +118,8 @@ name_array_t *service_jobs, mach_msg_type_number_t *service_jobsCnt, bootstrap_status_array_t *service_active, - mach_msg_type_number_t *service_activeCnt); + mach_msg_type_number_t *service_activeCnt, + uint64_t flags); #pragma GCC visibility pop

1 0

[23905] tags/launchd-319/
by source_changes＠macosforge.org 22 Apr '09

22 Apr '09

Revision: 23905 http://trac.macosforge.org/projects/launchd/changeset/23905 Author: dsorresso(a)apple.com Date: 2009-04-22 13:18:51 -0700 (Wed, 22 Apr 2009) Log Message: ----------- "Tagging launchd-319 from https://svn.macosforge.org/repository/launchd/trunk" Added Paths: ----------- tags/launchd-319/ Property changes on: tags/launchd-319 ___________________________________________________________________ Added: svn:ignore + build Added: svn:mergeinfo + /branches/PR-5092682:23731-23742 /branches/PR-5898404:23681-23700 /branches/PR-5978442:23651-23701 /branches/PR-6132016:23719-23738 /branches/PR-6271234:23818-23822 /branches/PR-6562592:23812-23822 /branches/PR-6564965:23832-23851 /branches/PR-6589133:23810-23822 /branches/PR-6609410:23828

1 0