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

[23604] trunk/launchd/src/launchd_core_logic.c
by source_changes＠macosforge.org 21 Apr '08

21 Apr '08

Revision: 23604 http://trac.macosforge.org/projects/launchd/changeset/23604 Author: zarzycki(a)apple.com Date: 2008-04-21 15:01:21 -0700 (Mon, 21 Apr 2008) Log Message: ----------- Fix a typo. Modified Paths: -------------- trunk/launchd/src/launchd_core_logic.c Modified: trunk/launchd/src/launchd_core_logic.c =================================================================== --- trunk/launchd/src/launchd_core_logic.c 2008-04-21 21:44:10 UTC (rev 23603) +++ trunk/launchd/src/launchd_core_logic.c 2008-04-21 22:01:21 UTC (rev 23604) @@ -702,7 +702,7 @@ } if (j->kill_via_shmem && (tmp = launch_data_new_bool(true))) { - uint32_t tmp_cnt = -1; + int32_t tmp_cnt = -1; launch_data_dict_insert(r, tmp, LAUNCH_JOBKEY_ENABLETRANSACTIONS);

1 0

[23603] trunk/launchd/src/libvproc.c
by source_changes＠macosforge.org 21 Apr '08

21 Apr '08

Revision: 23603 http://trac.macosforge.org/projects/launchd/changeset/23603 Author: zarzycki(a)apple.com Date: 2008-04-21 14:44:10 -0700 (Mon, 21 Apr 2008) Log Message: ----------- <rdar://problem/5858877> Make vproc_transaction_{begin,end} available to command-line tools Modified Paths: -------------- trunk/launchd/src/libvproc.c Modified: trunk/launchd/src/libvproc.c =================================================================== --- trunk/launchd/src/libvproc.c 2008-04-21 21:41:09 UTC (rev 23602) +++ trunk/launchd/src/libvproc.c 2008-04-21 21:44:10 UTC (rev 23603) @@ -66,12 +66,14 @@ kr = vproc_mig_setup_shmem(bootstrap_port, &shmem_port); - assert(kr == 0); + //assert(kr == 0); + if (kr) return; kr = vm_map(mach_task_self(), &vm_addr, getpagesize(), 0, true, shmem_port, 0, false, VM_PROT_READ|VM_PROT_WRITE, VM_PROT_READ|VM_PROT_WRITE, VM_INHERIT_NONE); - assert(kr == 0); + //assert(kr == 0); + if (kr) return; vproc_shmem = (struct vproc_shmem_s *)vm_addr; }

1 0

[23602] trunk/launchd/src
by source_changes＠macosforge.org 21 Apr '08

21 Apr '08

Revision: 23602 http://trac.macosforge.org/projects/launchd/changeset/23602 Author: zarzycki(a)apple.com Date: 2008-04-21 14:41:09 -0700 (Mon, 21 Apr 2008) Log Message: ----------- <rdar://problem/5836108> Need launchd 'trykill' SPI Modified Paths: -------------- trunk/launchd/src/launchd_core_logic.c trunk/launchd/src/liblaunch_private.h trunk/launchd/src/libvproc.c trunk/launchd/src/libvproc_private.h Modified: trunk/launchd/src/launchd_core_logic.c =================================================================== --- trunk/launchd/src/launchd_core_logic.c 2008-04-21 20:33:29 UTC (rev 23601) +++ trunk/launchd/src/launchd_core_logic.c 2008-04-21 21:41:09 UTC (rev 23602) @@ -701,6 +701,24 @@ launch_data_dict_insert(r, tmp, LAUNCH_JOBKEY_PROGRAMARGUMENTS); } + if (j->kill_via_shmem && (tmp = launch_data_new_bool(true))) { + uint32_t tmp_cnt = -1; + + launch_data_dict_insert(r, tmp, LAUNCH_JOBKEY_ENABLETRANSACTIONS); + + if (j->shmem) { + tmp_cnt = j->shmem->vp_shmem_transaction_cnt; + } + + if (j->sent_kill_via_shmem) { + tmp_cnt++; + } + + if ((tmp = launch_data_new_integer(tmp_cnt))) { + launch_data_dict_insert(r, tmp, LAUNCH_JOBKEY_TRANSACTIONCOUNT); + } + } + if (j->session_create && (tmp = launch_data_new_bool(true))) { launch_data_dict_insert(r, tmp, LAUNCH_JOBKEY_SESSIONCREATE); } @@ -5708,6 +5726,25 @@ } else { return 0; } + } else if (sig == VPROC_MAGIC_TRYKILL_SIGNAL) { + if (!j->kill_via_shmem) { + return BOOTSTRAP_NOT_PRIVILEGED; + } + + if (!j->shmem) { + j->sent_kill_via_shmem = true; + job_assumes(j, runtime_kill(otherj->p, SIGKILL) != -1); + return 0; + } + + if (__sync_bool_compare_and_swap(&j->shmem->vp_shmem_transaction_cnt, 0, -1)) { + j->shmem->vp_shmem_flags |= VPROC_SHMEM_EXITING; + j->sent_kill_via_shmem = true; + job_assumes(j, runtime_kill(otherj->p, SIGKILL) != -1); + return 0; + } + + return BOOTSTRAP_NOT_PRIVILEGED; } else if (otherj->p) { job_assumes(j, runtime_kill(otherj->p, sig) != -1); } Modified: trunk/launchd/src/liblaunch_private.h =================================================================== --- trunk/launchd/src/liblaunch_private.h 2008-04-21 20:33:29 UTC (rev 23601) +++ trunk/launchd/src/liblaunch_private.h 2008-04-21 21:41:09 UTC (rev 23602) @@ -46,6 +46,7 @@ #define LAUNCH_KEY_BATCHCONTROL "BatchControl" #define LAUNCH_KEY_BATCHQUERY "BatchQuery" +#define LAUNCH_JOBKEY_TRANSACTIONCOUNT "TransactionCount" #define LAUNCH_JOBKEY_QUARANTINEDATA "QuarantineData" #define LAUNCH_JOBKEY_SANDBOXPROFILE "SandboxProfile" #define LAUNCH_JOBKEY_SANDBOXFLAGS "SandboxFlags" Modified: trunk/launchd/src/libvproc.c =================================================================== --- trunk/launchd/src/libvproc.c 2008-04-21 20:33:29 UTC (rev 23601) +++ trunk/launchd/src/libvproc.c 2008-04-21 21:41:09 UTC (rev 23602) @@ -132,17 +132,12 @@ void _vproc_transaction_try_exit(int status) { - typeof(vproc_shmem->vp_shmem_transaction_cnt) newval; - if (unlikely(vproc_shmem == NULL)) { return; } - vproc_shmem->vp_shmem_flags |= VPROC_SHMEM_EXITING; - - newval = __sync_sub_and_fetch(&vproc_shmem->vp_shmem_transaction_cnt, 1); - - if (newval < 0) { + if (__sync_bool_compare_and_swap(&vproc_shmem->vp_shmem_transaction_cnt, 0, -1)) { + vproc_shmem->vp_shmem_flags |= VPROC_SHMEM_EXITING; _exit(status); } } Modified: trunk/launchd/src/libvproc_private.h =================================================================== --- trunk/launchd/src/libvproc_private.h 2008-04-21 20:33:29 UTC (rev 23601) +++ trunk/launchd/src/libvproc_private.h 2008-04-21 21:41:09 UTC (rev 23602) @@ -31,8 +31,10 @@ #pragma GCC visibility push(default) -/* DO NOT use this. This is a hack for launchctl */ -#define VPROC_MAGIC_UNLOAD_SIGNAL 0x4141504C +/* DO NOT use this. This is a hack for 'launchctl' */ +#define VPROC_MAGIC_UNLOAD_SIGNAL 0x4141504C +/* DO NOT use this. This is a hack for 'loginwindow' */ +#define VPROC_MAGIC_TRYKILL_SIGNAL 0x6161706C typedef enum { VPROC_GSK_LAST_EXIT_STATUS = 1,

1 0

[23601] trunk/launchd/src
by source_changes＠macosforge.org 21 Apr '08

21 Apr '08

Revision: 23601 http://trac.macosforge.org/projects/launchd/changeset/23601 Author: zarzycki(a)apple.com Date: 2008-04-21 13:33:29 -0700 (Mon, 21 Apr 2008) Log Message: ----------- <rdar://problem/5856435> Make bootstrap_create_server() be per-user launchd aware Modified Paths: -------------- trunk/launchd/src/launchd_core_logic.c trunk/launchd/src/libbootstrap.c Modified: trunk/launchd/src/launchd_core_logic.c =================================================================== --- trunk/launchd/src/launchd_core_logic.c 2008-04-18 21:41:05 UTC (rev 23600) +++ trunk/launchd/src/launchd_core_logic.c 2008-04-21 20:33:29 UTC (rev 23601) @@ -5650,18 +5650,12 @@ job_log(j, LOG_DEBUG, "Server create attempt: %s", server_cmd); -#define LET_MERE_MORTALS_ADD_SERVERS_TO_PID1 - /* XXX - This code should go away once the per session launchd is integrated with the rest of the system */ -#ifdef LET_MERE_MORTALS_ADD_SERVERS_TO_PID1 if (pid1_magic) { - if (unlikely(ldc->euid && server_uid && (ldc->euid != server_uid))) { - job_log(j, LOG_WARNING, "Server create: \"%s\": Will run as UID %d, not UID %d as they told us to", - server_cmd, ldc->euid, server_uid); - server_uid = ldc->euid; + if (ldc->euid || ldc->uid) { + job_log(j, LOG_WARNING, "Server create attempt moved to per-user launchd: %s", server_cmd); + return VPROC_ERR_TRY_PER_USER; } - } else -#endif - if (getuid()) { + } else { if (unlikely(server_uid != getuid())) { job_log(j, LOG_WARNING, "Server create: \"%s\": As UID %d, we will not be able to switch to UID %d", server_cmd, getuid(), server_uid); Modified: trunk/launchd/src/libbootstrap.c =================================================================== --- trunk/launchd/src/libbootstrap.c 2008-04-18 21:41:05 UTC (rev 23600) +++ trunk/launchd/src/libbootstrap.c 2008-04-21 20:33:29 UTC (rev 23601) @@ -37,7 +37,20 @@ kern_return_t bootstrap_create_server(mach_port_t bp, cmd_t server_cmd, uid_t server_uid, boolean_t on_demand, mach_port_t *server_port) { - return vproc_mig_create_server(bp, server_cmd, server_uid, on_demand, server_port); + kern_return_t kr; + + kr = vproc_mig_create_server(bp, server_cmd, server_uid, on_demand, server_port); + + if (kr == VPROC_ERR_TRY_PER_USER) { + mach_port_t puc; + + if (vproc_mig_lookup_per_user_context(bp, 0, &puc) == 0) { + kr = vproc_mig_create_server(puc, server_cmd, server_uid, on_demand, server_port); + mach_port_deallocate(mach_task_self(), puc); + } + } + + return kr; } kern_return_t

1 0

[23600] trunk/launchd/src/launchd_core_logic.c
by source_changes＠macosforge.org 18 Apr '08

18 Apr '08

Revision: 23600 http://trac.macosforge.org/projects/launchd/changeset/23600 Author: zarzycki(a)apple.com Date: 2008-04-18 14:41:05 -0700 (Fri, 18 Apr 2008) Log Message: ----------- Better documentation. Modified Paths: -------------- trunk/launchd/src/launchd_core_logic.c Modified: trunk/launchd/src/launchd_core_logic.c =================================================================== --- trunk/launchd/src/launchd_core_logic.c 2008-04-15 21:55:50 UTC (rev 23599) +++ trunk/launchd/src/launchd_core_logic.c 2008-04-18 21:41:05 UTC (rev 23600) @@ -387,14 +387,54 @@ uint64_t start_time; uint32_t min_run_time; uint32_t start_interval; - bool checkedin:1, anonymous:1, debug:1, inetcompat:1, inetcompat_wait:1, - ondemand:1, session_create:1, low_pri_io:1, no_init_groups:1, priv_port_has_senders:1, - importing_global_env:1, importing_hard_limits:1, setmask:1, legacy_mach_job:1, start_pending:1, - globargv:1, wait4debugger:1, internal_exc_handler:1, stall_before_exec:1, only_once:1, - currently_ignored:1, forced_peers_to_demand_mode:1, setnice:1, hopefully_exits_last:1, removal_pending:1, - legacy_LS_job:1, sent_sigkill:1, debug_before_kill:1, weird_bootstrap:1, start_on_mount:1, - per_user:1, hopefully_exits_first:1, deny_unknown_mslookups:1, unload_at_mig_return:1, abandon_pg:1, - poll_for_vfs_changes:1, deny_job_creation:1, kill_via_shmem:1, sent_kill_via_shmem:1; +#if 0 + /* someday ... */ + enum { + J_TYPE_ANONYMOUS = 1, + J_TYPE_LANCHSERVICES, + J_TYPE_MACHINIT, + J_TYPE_INETD, + } j_type; +#endif + bool debug:1, /* man launchd.plist --> Debug */ + ondemand:1, /* man launchd.plist --> KeepAlive == false */ + session_create:1, /* man launchd.plist --> SessionCreate */ + low_pri_io:1, /* man launchd.plist --> LowPriorityIO */ + no_init_groups:1, /* man launchd.plist --> InitGroups */ + priv_port_has_senders:1, /* a legacy mach_init concept to make bootstrap_create_server/service() work */ + importing_global_env:1, /* a hack during job importing */ + importing_hard_limits:1, /* a hack during job importing */ + setmask:1, /* man launchd.plist --> Umask */ + anonymous:1, /* a process that launchd knows about, but isn't managed by launchd */ + checkedin:1, /* a legacy mach_init concept to detect sick jobs */ + legacy_mach_job:1, /* a job created via bootstrap_create_server() */ + legacy_LS_job:1, /* a job created via spawn_via_launchd() */ + inetcompat:1, /* a legacy job that wants inetd compatible semantics */ + inetcompat_wait:1, /* a twist on inetd compatibility */ + start_pending:1, /* an event fired and the job should start, but not necessarily right away */ + globargv:1, /* man launchd.plist --> EnableGlobbing */ + wait4debugger:1, /* man launchd.plist --> WaitForDebugger */ + internal_exc_handler:1, /* MachExceptionHandler == true */ + stall_before_exec:1, /* a hack to support an option of spawn_via_launchd() */ + only_once:1, /* man launchd.plist --> LaunchOnlyOnce. Note: 5465184 Rename this to "HopefullyNeverExits" */ + currently_ignored:1, /* Make job_ignore() / job_watch() work. If these calls were balanced, then this wouldn't be necessarily. */ + forced_peers_to_demand_mode:1, /* A job that forced all other jobs to be temporarily launch-on-demand */ + setnice:1, /* man launchd.plist --> Nice */ + hopefully_exits_last:1, /* man launchd.plist --> HopefullyExitsLast */ + removal_pending:1, /* a job was asked to be unloaded/removed while running, we'll remove it after it exits */ + sent_sigkill:1, /* job_kill() was called */ + debug_before_kill:1, /* enter the kernel debugger before killing a job */ + weird_bootstrap:1, /* a hack that launchd+launchctl use during jobmgr_t creation */ + start_on_mount:1, /* man launchd.plist --> StartOnMount */ + per_user:1, /* This job is a per-user launchd managed by the PID 1 launchd */ + hopefully_exits_first:1, /* man launchd.plist --> HopefullyExitsFirst */ + deny_unknown_mslookups:1, /* A flag for changing the behavior of bootstrap_look_up() */ + unload_at_mig_return:1, /* A job thoroughly confused launchd. We need to unload it ASAP */ + abandon_pg:1, /* man launchd.plist --> AbandonProcessGroup */ + poll_for_vfs_changes:1, /* a hack to work around the fact that kqueues don't work on all filesystems */ + deny_job_creation:1, /* Don't let this job create new 'job_t' objects in launchd */ + kill_via_shmem:1, /* man launchd.plist --> EnableTransactions */ + sent_kill_via_shmem:1; /* We need to 'kill_via_shmem' once-and-only-once */ mode_t mask; const char label[0]; };

1 0

[23599] trunk/launchd/src/launchd_runtime.c
by source_changes＠macosforge.org 15 Apr '08

15 Apr '08

Revision: 23599 http://trac.macosforge.org/projects/launchd/changeset/23599 Author: zarzycki(a)apple.com Date: 2008-04-15 14:55:50 -0700 (Tue, 15 Apr 2008) Log Message: ----------- More documentation. Modified Paths: -------------- trunk/launchd/src/launchd_runtime.c Modified: trunk/launchd/src/launchd_runtime.c =================================================================== --- trunk/launchd/src/launchd_runtime.c 2008-04-14 21:12:18 UTC (rev 23598) +++ trunk/launchd/src/launchd_runtime.c 2008-04-15 21:55:50 UTC (rev 23599) @@ -1036,7 +1036,7 @@ tmp_options = options; - /* It looks like the compiler doesn't optimize switch(unlikely(...)) */ + /* It looks like the compiler doesn't optimize switch(unlikely(...)) See: 5691066 */ if (unlikely(mr)) switch (mr) { case MACH_SEND_INVALID_DEST: case MACH_SEND_TIMED_OUT:

1 0

[23598] tags/launchd-271/
by source_changes＠macosforge.org 14 Apr '08

14 Apr '08

Revision: 23598 http://trac.macosforge.org/projects/launchd/changeset/23598 Author: zarzycki(a)apple.com Date: 2008-04-14 14:12:18 -0700 (Mon, 14 Apr 2008) Log Message: ----------- "Tagging launchd-271 from https://svn.macosforge.org/repository/launchd/trunk" Added Paths: ----------- tags/launchd-271/ Copied: tags/launchd-271 (from rev 23597, trunk)

1 0

[23597] trunk/launchd/src/launchd_core_logic.c
by source_changes＠macosforge.org 14 Apr '08

14 Apr '08

Revision: 23597 http://trac.macosforge.org/projects/launchd/changeset/23597 Author: zarzycki(a)apple.com Date: 2008-04-14 10:36:13 -0700 (Mon, 14 Apr 2008) Log Message: ----------- <rdar://problem/5822912> Cannot turn VoiceOver off Modified Paths: -------------- trunk/launchd/src/launchd_core_logic.c Modified: trunk/launchd/src/launchd_core_logic.c =================================================================== --- trunk/launchd/src/launchd_core_logic.c 2008-04-14 17:35:42 UTC (rev 23596) +++ trunk/launchd/src/launchd_core_logic.c 2008-04-14 17:36:13 UTC (rev 23597) @@ -6253,7 +6253,7 @@ job_log(j, LOG_DEBUG, "Mach service registration failed. Already active: %s", servicename); return BOOTSTRAP_SERVICE_ACTIVE; } - if (ms->recv) { + if (ms->recv && (serviceport != MACH_PORT_NULL)) { job_log(j, LOG_ERR, "bootstrap_register() erroneous called instead of bootstrap_check_in(). Mach service: %s", servicename); return BOOTSTRAP_NOT_PRIVILEGED; }

1 0

[23596] trunk/Makefile
by source_changes＠macosforge.org 14 Apr '08

14 Apr '08

Revision: 23596 http://trac.macosforge.org/projects/launchd/changeset/23596 Author: zarzycki(a)apple.com Date: 2008-04-14 10:35:42 -0700 (Mon, 14 Apr 2008) Log Message: ----------- <rdar://problem/5818602> 64-bit SystemStarter executable Modified Paths: -------------- trunk/Makefile Modified: trunk/Makefile =================================================================== --- trunk/Makefile 2008-04-08 21:17:30 UTC (rev 23595) +++ trunk/Makefile 2008-04-14 17:35:42 UTC (rev 23596) @@ -24,8 +24,6 @@ mkdir -p $(DSTROOT)/System/Library/StartupItems chmod 755 $(DSTROOT)/System/Library/StartupItems endif - -lipo -remove ppc64 -output $(DSTROOT)/sbin/SystemStarter $(DSTROOT)/sbin/SystemStarter - -lipo -remove x86_64 -output $(DSTROOT)/sbin/SystemStarter $(DSTROOT)/sbin/SystemStarter rm -rf $(DSTROOT)/usr/local/lib/system cp $(OBJROOT)/src/launchd $(SYMROOT) cp $(OBJROOT)/src/launchctl $(SYMROOT)

1 0

[23595] tags/launchd-270/
by source_changes＠macosforge.org 08 Apr '08

08 Apr '08

Revision: 23595 http://trac.macosforge.org/projects/launchd/changeset/23595 Author: zarzycki(a)apple.com Date: 2008-04-08 14:17:30 -0700 (Tue, 08 Apr 2008) Log Message: ----------- "Tagging launchd-270 from https://svn.macosforge.org/repository/launchd/trunk" Added Paths: ----------- tags/launchd-270/ Copied: tags/launchd-270 (from rev 23594, trunk)

1 0