May 2007 - launchd-changes - lists.macosforge.org

[23250] trunk/launchd/src
by source_changes＠macosforge.org 10 May '07

10 May '07

Revision: 23250 http://trac.macosforge.org/projects/launchd/changeset/23250 Author: zarzycki(a)apple.com Date: 2007-05-10 14:23:35 -0700 (Thu, 10 May 2007) Log Message: ----------- Let's start using the EV_RECEIPT feature I added to the kernel kqueue logic. Modified Paths: -------------- trunk/launchd/src/launchd_core_logic.c trunk/launchd/src/launchd_runtime.c trunk/launchd/src/launchd_runtime.h Modified: trunk/launchd/src/launchd_core_logic.c =================================================================== --- trunk/launchd/src/launchd_core_logic.c 2007-05-09 17:12:03 UTC (rev 23249) +++ trunk/launchd/src/launchd_core_logic.c 2007-05-10 21:23:35 UTC (rev 23250) @@ -3068,6 +3068,7 @@ void socketgroup_watch(job_t j, struct socketgroup *sg) { + struct kevent kev[sg->fd_cnt]; char buf[10000]; unsigned int i, buf_off = 0; @@ -3081,8 +3082,16 @@ job_log(j, LOG_DEBUG, "Watching sockets:%s", buf); for (i = 0; i < sg->fd_cnt; i++) { - job_assumes(j, kevent_mod(sg->fds[i], EVFILT_READ, EV_ADD, 0, 0, j) != -1); + EV_SET(&kev[i], sg->fds[i], EVFILT_READ, EV_ADD, 0, 0, j); } + + job_assumes(j, kevent_bulk_mod(kev, sg->fd_cnt) != -1); + + for (i = 0; i < sg->fd_cnt; i++) { + job_assumes(j, kev[i].flags & EV_ERROR); + errno = kev[i].data; + job_assumes(j, kev[i].data == 0); + } } void Modified: trunk/launchd/src/launchd_runtime.c =================================================================== --- trunk/launchd/src/launchd_runtime.c 2007-05-09 17:12:03 UTC (rev 23249) +++ trunk/launchd/src/launchd_runtime.c 2007-05-10 21:23:35 UTC (rev 23250) @@ -676,6 +676,18 @@ } int +kevent_bulk_mod(struct kevent *kev, size_t kev_cnt) +{ + size_t i; + + for (i = 0; i < kev_cnt; i++) { + kev[i].flags |= EV_CLEAR|EV_RECEIPT; + } + + return kevent(mainkq, kev, kev_cnt, kev, kev_cnt, NULL); +} + +int kevent_mod(uintptr_t ident, short filter, u_short flags, u_int fflags, intptr_t data, void *udata) { struct kevent kev; Modified: trunk/launchd/src/launchd_runtime.h =================================================================== --- trunk/launchd/src/launchd_runtime.h 2007-05-09 17:12:03 UTC (rev 23249) +++ trunk/launchd/src/launchd_runtime.h 2007-05-10 21:23:35 UTC (rev 23250) @@ -71,6 +71,7 @@ const char *reboot_flags_to_C_names(unsigned int flags); +int kevent_bulk_mod(struct kevent *kev, size_t kev_cnt); int kevent_mod(uintptr_t ident, short filter, u_short flags, u_int fflags, intptr_t data, void *udata); pid_t runtime_fork(mach_port_t bsport);

1 0

[23249] trunk/launchd/src/libvproc.c
by source_changes＠macosforge.org 09 May '07

09 May '07

Revision: 23249 http://trac.macosforge.org/projects/launchd/changeset/23249 Author: zarzycki(a)apple.com Date: 2007-05-09 10:12:03 -0700 (Wed, 09 May 2007) Log Message: ----------- <rdar://problem/5063713> _vprocmgr_move_subset_to_user should set mach exception port Modified Paths: -------------- trunk/launchd/src/libvproc.c Modified: trunk/launchd/src/libvproc.c =================================================================== --- trunk/launchd/src/libvproc.c 2007-05-08 20:43:52 UTC (rev 23248) +++ trunk/launchd/src/libvproc.c 2007-05-09 17:12:03 UTC (rev 23249) @@ -103,7 +103,7 @@ } } - return NULL; + return _vproc_post_fork_ping(); }

1 0

[23248] tags/launchd-215/
by source_changes＠macosforge.org 08 May '07

08 May '07

Revision: 23248 http://trac.macosforge.org/projects/launchd/changeset/23248 Author: zarzycki(a)apple.com Date: 2007-05-08 13:43:52 -0700 (Tue, 08 May 2007) Log Message: ----------- "Tagging launchd-215 from https://svn.macosforge.org/repository/launchd/trunk" Added Paths: ----------- tags/launchd-215/ Copied: tags/launchd-215 (from rev 23247, trunk)

1 0

[23247] trunk/launchd/src/launchd_core_logic.c
by source_changes＠macosforge.org 08 May '07

08 May '07

Revision: 23247 http://trac.macosforge.org/projects/launchd/changeset/23247 Author: zarzycki(a)apple.com Date: 2007-05-08 12:23:04 -0700 (Tue, 08 May 2007) Log Message: ----------- <rdar://problem/5174670> 9A422: Finder, Dock and SystemUIServer don't launch during login Modified Paths: -------------- trunk/launchd/src/launchd_core_logic.c Modified: trunk/launchd/src/launchd_core_logic.c =================================================================== --- trunk/launchd/src/launchd_core_logic.c 2007-05-08 18:17:51 UTC (rev 23246) +++ trunk/launchd/src/launchd_core_logic.c 2007-05-08 19:23:04 UTC (rev 23247) @@ -1877,6 +1877,10 @@ jobmgr_t jmi, jmn; job_t ji, jn; + if (jm->shutting_down) { + return; + } + SLIST_FOREACH_SAFE(jmi, &jm->submgrs, sle, jmn) { jobmgr_dispatch_all(jmi, newmounthack); } @@ -3950,6 +3954,10 @@ job_assumes(j, launchd_mport_deallocate(ms->port) == KERN_SUCCESS); + if (ms->port == the_exception_server) { + the_exception_server = 0; + } + job_log(j, LOG_INFO, "Mach service deleted%s: %s", port_died ? " (port died)" : "", ms->name); SLIST_REMOVE(&j->machservices, ms, machservice, sle);

1 0

[23246] trunk/launchd/src/launchd_core_logic.c
by source_changes＠macosforge.org 08 May '07

08 May '07

Revision: 23246 http://trac.macosforge.org/projects/launchd/changeset/23246 Author: zarzycki(a)apple.com Date: 2007-05-08 11:17:51 -0700 (Tue, 08 May 2007) Log Message: ----------- Improved logging. Modified Paths: -------------- trunk/launchd/src/launchd_core_logic.c Modified: trunk/launchd/src/launchd_core_logic.c =================================================================== --- trunk/launchd/src/launchd_core_logic.c 2007-05-07 21:52:13 UTC (rev 23245) +++ trunk/launchd/src/launchd_core_logic.c 2007-05-08 18:17:51 UTC (rev 23246) @@ -1670,7 +1670,8 @@ job_t ji; if (jm->jm_port == mport) { - return jobmgr_find_by_pid(jm, upid, true); + jobmgr_assumes(jm, (ji = jobmgr_find_by_pid(jm, upid, true)) != NULL); + return ji; } SLIST_FOREACH(jmi, &jm->submgrs, sle) { @@ -1708,7 +1709,7 @@ mib[3] = ldc.pid; if (jobmgr_assumes(root_jobmgr, sysctl(mib, 4, &kp, &len, NULL, 0) != -1)) { - jobmgr_log(root_jobmgr, LOG_ERR, "%s() was confused by PID %u: %s", __func__, ldc.pid, kp.kp_proc.p_comm); + jobmgr_log(root_jobmgr, LOG_ERR, "%s() was confused by PID %u UID %u EUID %u Mach Port 0x%x: %s", __func__, ldc.pid, ldc.uid, ldc.euid, p, kp.kp_proc.p_comm); } } @@ -5226,7 +5227,8 @@ goto out; } - if (getpid() != 1 && job_mig_intran(target_subset)) { + /* We call job_mig_intran2 because job_mig_intran logs on failure */ + if (getpid() != 1 && job_mig_intran2(root_jobmgr, target_subset, getpid())) { kr = 0; goto out; }

1 0

[23245] trunk/launchd/src/launchd_core_logic.c
by source_changes＠macosforge.org 07 May '07

07 May '07

Revision: 23245 http://trac.macosforge.org/projects/launchd/changeset/23245 Author: zarzycki(a)apple.com Date: 2007-05-07 14:52:13 -0700 (Mon, 07 May 2007) Log Message: ----------- <rdar://problem/5159767> 9A423: Bugs reported by launchd Modified Paths: -------------- trunk/launchd/src/launchd_core_logic.c Modified: trunk/launchd/src/launchd_core_logic.c =================================================================== --- trunk/launchd/src/launchd_core_logic.c 2007-05-07 21:41:43 UTC (rev 23244) +++ trunk/launchd/src/launchd_core_logic.c 2007-05-07 21:52:13 UTC (rev 23245) @@ -931,7 +931,7 @@ return NULL; } - job_reparent_hack(jr, "Aqua"); + job_reparent_hack(jr, NULL); if (getpid() == 1) { struct ldcred ldc; @@ -5155,7 +5155,14 @@ { jobmgr_t jmi = NULL; - if (strcasecmp(where, "Aqua") != 0 && strcasecmp(where, "LoginWindow") != 0) { + /* NULL is only passed for our custom API for LaunchServices. If that is the case, we do magic. */ + if (where == NULL) { + if (strcasecmp(j->mgr->name, "LoginWindow") == 0) { + where = "LoginWindow"; + } else { + where = "Aqua"; + } + } else if (strcasecmp(where, "Aqua") != 0 && strcasecmp(where, "LoginWindow") != 0) { return; }

1 0

[23244] trunk/launchd/src/launchd_runtime.c
by source_changes＠macosforge.org 07 May '07

07 May '07

Revision: 23244 http://trac.macosforge.org/projects/launchd/changeset/23244 Author: zarzycki(a)apple.com Date: 2007-05-07 14:41:43 -0700 (Mon, 07 May 2007) Log Message: ----------- Logging updates. Modified Paths: -------------- trunk/launchd/src/launchd_runtime.c Modified: trunk/launchd/src/launchd_runtime.c =================================================================== --- trunk/launchd/src/launchd_runtime.c 2007-05-07 21:20:33 UTC (rev 23243) +++ trunk/launchd/src/launchd_runtime.c 2007-05-07 21:41:43 UTC (rev 23244) @@ -261,6 +261,7 @@ } FLAGIF(EV_ADD) + else FLAGIF(EV_RECEIPT) else FLAGIF(EV_DELETE) else FLAGIF(EV_ENABLE) else FLAGIF(EV_DISABLE) @@ -325,8 +326,10 @@ } FFLAGIF(NOTE_EXIT) + else FFLAGIF(NOTE_REAP) else FFLAGIF(NOTE_FORK) else FFLAGIF(NOTE_EXEC) + else FFLAGIF(NOTE_SIGNAL) else FFLAGIF(NOTE_TRACK) else FFLAGIF(NOTE_TRACKERR) else FFLAGIF(NOTE_CHILD)

1 0

[23243] trunk/launchd/src/launchd_core_logic.c
by source_changes＠macosforge.org 07 May '07

07 May '07

Revision: 23243 http://trac.macosforge.org/projects/launchd/changeset/23243 Author: zarzycki(a)apple.com Date: 2007-05-07 14:20:33 -0700 (Mon, 07 May 2007) Log Message: ----------- <rdar://problem/5173988> 9A430: launchd complains about ProgramArguments key Modified Paths: -------------- trunk/launchd/src/launchd_core_logic.c Modified: trunk/launchd/src/launchd_core_logic.c =================================================================== --- trunk/launchd/src/launchd_core_logic.c 2007-05-07 21:15:05 UTC (rev 23242) +++ trunk/launchd/src/launchd_core_logic.c 2007-05-07 21:20:33 UTC (rev 23243) @@ -1460,6 +1460,12 @@ const char *str; switch (key[0]) { + case 'p': + case 'P': + if (strcasecmp(key, LAUNCH_JOBKEY_PROGRAMARGUMENTS) == 0) { + return; + } + break; case 'l': case 'L': if (strcasecmp(key, LAUNCH_JOBKEY_LIMITLOADTOHOSTS) == 0) {

1 0

[23242] trunk/launchd/src/launchd_core_logic.c
by source_changes＠macosforge.org 07 May '07

07 May '07

Revision: 23242 http://trac.macosforge.org/projects/launchd/changeset/23242 Author: zarzycki(a)apple.com Date: 2007-05-07 14:15:05 -0700 (Mon, 07 May 2007) Log Message: ----------- <rdar://problem/5179313> Log: launchd_core_logic.c:1986 (23240):2: (flags & EV_ONESHOT) Modified Paths: -------------- trunk/launchd/src/launchd_core_logic.c Modified: trunk/launchd/src/launchd_core_logic.c =================================================================== --- trunk/launchd/src/launchd_core_logic.c 2007-04-27 20:29:41 UTC (rev 23241) +++ trunk/launchd/src/launchd_core_logic.c 2007-05-07 21:15:05 UTC (rev 23242) @@ -997,12 +997,8 @@ } if (jobmgr_assumes(jm, (jr = job_new(jm, AUTO_PICK_LEGACY_LABEL, kp.kp_proc.p_comm, NULL)) != NULL)) { - u_int proc_fflags = NOTE_EXEC|NOTE_EXIT; + u_int proc_fflags = NOTE_EXEC|NOTE_EXIT|NOTE_REAP; -#ifdef NOTE_REAP - proc_fflags |= NOTE_REAP; -#endif - total_children++; jr->anonymous = true; jr->p = anonpid; @@ -1983,22 +1979,22 @@ } if (fflags & NOTE_EXIT) { - job_assumes(j, (flags & EV_ONESHOT)); - job_assumes(j, (flags & EV_EOF)); job_reap(j); if (j->anonymous) { job_remove(j); + j = NULL; } else { j = job_dispatch(j, false); } } -#ifdef NOTE_REAP if (j && (fflags & NOTE_REAP)) { + job_assumes(j, flags & EV_ONESHOT); + job_assumes(j, flags & EV_EOF); + job_assumes(j, j->p == 0); } -#endif } void @@ -2121,12 +2117,8 @@ pid_t c; bool sipc = false; time_t td; - u_int proc_fflags = /* NOTE_EXEC|NOTE_FORK| */ NOTE_EXIT; + u_int proc_fflags = /* NOTE_EXEC|NOTE_FORK| */ NOTE_EXIT|NOTE_REAP; -#ifdef NOTE_REAP - proc_fflags |= NOTE_REAP; -#endif - if (!job_assumes(j, j->mgr != NULL)) { return; }

1 0