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

[23412] trunk/launchd/src/launchd_core_logic.c
by source_changes＠macosforge.org 19 Sep '07

19 Sep '07

Revision: 23412 http://trac.macosforge.org/projects/launchd/changeset/23412 Author: zarzycki(a)apple.com Date: 2007-09-19 10:38:35 -0700 (Wed, 19 Sep 2007) Log Message: ----------- More 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-09-19 16:22:39 UTC (rev 23411) +++ trunk/launchd/src/launchd_core_logic.c 2007-09-19 17:38:35 UTC (rev 23412) @@ -401,6 +401,7 @@ static void job_callback_proc(job_t j, int flags, int fflags); static void job_callback_timer(job_t j, void *ident); static void job_callback_read(job_t j, int ident); +static void job_log_stray_pg(job_t j); static job_t job_new_anonymous(jobmgr_t jm, pid_t anonpid); static job_t job_new(jobmgr_t jm, const char *label, const char *prog, const char *const *argv); static job_t job_new_via_mach_init(job_t j, const char *cmd, uid_t uid, bool ond); @@ -1961,6 +1962,39 @@ } void +job_log_stray_pg(job_t j) +{ + int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PGRP, j->p }; + size_t i, kp_cnt, len = 10*1024*1024; + struct kinfo_proc *kp; + + if (!job_assumes(j, (kp = malloc(len)) != NULL)) { + return; + } + if (!job_assumes(j, sysctl(mib, 4, kp, &len, NULL, 0) != -1)) { + goto out; + } + + kp_cnt = len / sizeof(struct kinfo_proc); + + for (i = 0; i < kp_cnt; i++) { + pid_t p_i = kp[i].kp_proc.p_pid; + pid_t pp_i = kp[i].kp_eproc.e_ppid; + const char *z = (kp[i].kp_proc.p_stat == SZOMB) ? "zombie " : ""; + const char *n = kp[i].kp_proc.p_comm; + + if (!job_assumes(j, p_i != 0 && p_i != 1)) { + continue; + } + + job_log(j, LOG_WARNING, "Stray %sprocess with PGID equal to this dead job: PID %u PPID %u %s", z, p_i, pp_i, n); + } + +out: + free(kp); +} + +void job_reap(job_t j) { struct rusage ru; @@ -1998,6 +2032,7 @@ * valid, try to kill abandoned descendant processes. */ if (!j->abandon_pg) { + job_log_stray_pg(j); job_assumes(j, runtime_killpg(j->p, SIGKILL) != -1 || errno == ESRCH); } @@ -4127,7 +4162,7 @@ pid_t p_i = kp[i].kp_proc.p_pid; pid_t pp_i = kp[i].kp_eproc.e_ppid; pid_t pg_i = kp[i].kp_eproc.e_pgid; - const char *z = kp[i].kp_proc.p_stat == SZOMB ? "zombie " : ""; + const char *z = (kp[i].kp_proc.p_stat == SZOMB) ? "zombie " : ""; const char *n = kp[i].kp_proc.p_comm; if (p_i == 0 || p_i == 1) {

1 0

[23411] trunk/launchd/src/launchd_runtime.c
by source_changes＠macosforge.org 19 Sep '07

19 Sep '07

Revision: 23411 http://trac.macosforge.org/projects/launchd/changeset/23411 Author: zarzycki(a)apple.com Date: 2007-09-19 09:22:39 -0700 (Wed, 19 Sep 2007) Log Message: ----------- This false positive bug line needs to be fixed. Modified Paths: -------------- trunk/launchd/src/launchd_runtime.c Modified: trunk/launchd/src/launchd_runtime.c =================================================================== --- trunk/launchd/src/launchd_runtime.c 2007-09-19 16:14:50 UTC (rev 23410) +++ trunk/launchd/src/launchd_runtime.c 2007-09-19 16:22:39 UTC (rev 23411) @@ -1274,7 +1274,8 @@ tmp_port = drain_reply_port; drain_reply_port = MACH_PORT_NULL; - if (!launchd_assumes((errno = job_mig_log_drain_reply(tmp_port, 0, outval, outvalCnt)) == 0)) { + if ((errno = job_mig_log_drain_reply(tmp_port, 0, outval, outvalCnt))) { + launchd_assumes(errno == MACH_SEND_INVALID_DEST); launchd_assumes(launchd_mport_deallocate(tmp_port) == KERN_SUCCESS); }

1 0

[23410] trunk/launchd/src/launchd_core_logic.c
by source_changes＠macosforge.org 19 Sep '07

19 Sep '07

Revision: 23410 http://trac.macosforge.org/projects/launchd/changeset/23410 Author: zarzycki(a)apple.com Date: 2007-09-19 09:14:50 -0700 (Wed, 19 Sep 2007) Log Message: ----------- More/better 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-09-19 16:05:30 UTC (rev 23409) +++ trunk/launchd/src/launchd_core_logic.c 2007-09-19 16:14:50 UTC (rev 23410) @@ -451,6 +451,7 @@ /* file local globals */ static size_t total_children; +static size_t total_anon_children; static mach_port_t the_exception_server; static bool did_first_per_user_launchd_BootCache_hack; #define JOB_BOOTCACHE_HACK_CHECK(j) (j->per_user && !did_first_per_user_launchd_BootCache_hack && (j->mach_uid >= 500) && (j->mach_uid != (uid_t)-2)) @@ -534,7 +535,7 @@ EV_ADD|EV_ONESHOT, NOTE_SECONDS, j->exit_timeout, j) != -1); } - job_log(j, LOG_DEBUG, "Sent SIGTERM signal."); + job_log(j, LOG_DEBUG, "Sent SIGTERM signal"); } launch_data_t @@ -669,7 +670,7 @@ static void still_alive_with_check(void) { - jobmgr_log(root_jobmgr, LOG_NOTICE, "Still alive with %lu children.", total_children); + jobmgr_log(root_jobmgr, LOG_NOTICE, "Still alive with %lu/%lu children", total_children, total_anon_children); jobmgr_log_active_jobs(root_jobmgr); @@ -747,7 +748,7 @@ runtime_closelog(); } else { runtime_closelog(); - jobmgr_log(jm, LOG_DEBUG, "About to exit."); + jobmgr_log(jm, LOG_DEBUG, "About to exit"); exit(EXIT_SUCCESS); } @@ -769,7 +770,7 @@ if (j->p && j->anonymous) { job_reap(j); } else if (j->p) { - job_log(j, LOG_DEBUG, "Removal pended until the job exits."); + job_log(j, LOG_DEBUG, "Removal pended until the job exits"); if (!j->removal_pending) { j->removal_pending = true; @@ -1072,7 +1073,7 @@ if (jobmgr_assumes(jm, (jr = job_new(jm, AUTO_PICK_LEGACY_LABEL, zombie ? zombie : kp.kp_proc.p_comm, NULL)) != NULL)) { u_int proc_fflags = NOTE_EXEC|NOTE_EXIT /* |NOTE_REAP */; - total_children++; + total_anon_children++; jr->anonymous = true; jr->p = anonpid; @@ -1081,7 +1082,7 @@ if (kevent_mod(jr->p, EVFILT_PROC, EV_ADD, proc_fflags, 0, root_jobmgr) == -1 && job_assumes(jr, errno == ESRCH)) { /* zombies are weird */ - job_log(jr, LOG_ERR, "Failed to add kevent for PID %u. Will unload at MIG return.", jr->p); + job_log(jr, LOG_ERR, "Failed to add kevent for PID %u. Will unload at MIG return", jr->p); jr->unload_at_mig_return = true; } @@ -1090,7 +1091,7 @@ } if (shutdown_state && jm->hopefully_first_cnt == 0) { - job_log(jr, LOG_APPLEONLY, "This process showed up to the party while all the guests were leaving. Odds are that it will have a miserable time."); + job_log(jr, LOG_APPLEONLY, "This process showed up to the party while all the guests were leaving. Odds are that it will have a miserable time"); } job_log(jr, LOG_DEBUG, "Created PID %u anonymously by PPID %u%s%s", anonpid, kp.kp_eproc.e_ppid, jp ? ": " : "", jp ? jp->label : ""); @@ -2025,10 +2026,12 @@ kevent_mod((uintptr_t)&j->exit_timeout, EVFILT_TIMER, EV_DELETE, 0, 0, NULL); } - if (!j->anonymous) { + if (j->anonymous) { + total_anon_children--; + } else { runtime_del_ref(); + total_children--; } - total_children--; LIST_REMOVE(j, pid_hash_sle); if (j->wait_reply_port) { @@ -3660,7 +3663,7 @@ job_log(j, LOG_DEBUG, "Exited while removal was pending."); return true; } else if (j->mgr->shutting_down) { - job_log(j, LOG_DEBUG, "Exited while shutdown in progress. Processes remaining: %lu", total_children); + job_log(j, LOG_DEBUG, "Exited while shutdown in progress. Processes remaining: %lu/%lu", total_children, total_anon_children); return true; } else if (j->legacy_mach_job) { if (SLIST_EMPTY(&j->machservices)) {

1 0

[23409] trunk/launchd/src
by source_changes＠macosforge.org 19 Sep '07

19 Sep '07

Revision: 23409 http://trac.macosforge.org/projects/launchd/changeset/23409 Author: zarzycki(a)apple.com Date: 2007-09-19 09:05:30 -0700 (Wed, 19 Sep 2007) Log Message: ----------- More shutdown debug logging. Modified Paths: -------------- trunk/launchd/src/launchd_core_logic.c trunk/launchd/src/launchd_core_logic.h trunk/launchd/src/launchd_runtime.c Modified: trunk/launchd/src/launchd_core_logic.c =================================================================== --- trunk/launchd/src/launchd_core_logic.c 2007-09-19 01:00:28 UTC (rev 23408) +++ trunk/launchd/src/launchd_core_logic.c 2007-09-19 16:05:30 UTC (rev 23409) @@ -381,6 +381,7 @@ static void job_import_array(job_t j, const char *key, launch_data_t value); static void job_import_opaque(job_t j, const char *key, launch_data_t value); static bool job_set_global_on_demand(job_t j, bool val); +static const char *job_active(job_t j); static void job_watch(job_t j); static void job_ignore(job_t j); static void job_reap(job_t j); @@ -532,6 +533,8 @@ job_assumes(j, kevent_mod((uintptr_t)&j->exit_timeout, EVFILT_TIMER, EV_ADD|EV_ONESHOT, NOTE_SECONDS, j->exit_timeout, j) != -1); } + + job_log(j, LOG_DEBUG, "Sent SIGTERM signal."); } launch_data_t @@ -645,10 +648,31 @@ } static void +jobmgr_log_active_jobs(jobmgr_t jm) +{ + const char *why_active; + jobmgr_t jmi; + job_t ji; + + SLIST_FOREACH(jmi, &jm->submgrs, sle) { + jobmgr_log_active_jobs(jmi); + } + + LIST_FOREACH(ji, &jm->jobs, sle) { + why_active = job_active(ji); + + job_log(ji, LOG_DEBUG, "%s", why_active ? why_active : "Inactive"); + } + +} + +static void still_alive_with_check(void) { jobmgr_log(root_jobmgr, LOG_NOTICE, "Still alive with %lu children.", total_children); + jobmgr_log_active_jobs(root_jobmgr); + runtime_closelog(); /* hack to flush logs */ } @@ -675,7 +699,7 @@ } if (debug_shutdown_hangs && jm->parentmgr == NULL && getpid() == 1) { - runtime_set_timeout(still_alive_with_check, 3000); + runtime_set_timeout(still_alive_with_check, 5); } return jobmgr_do_garbage_collection(jm); @@ -2187,6 +2211,8 @@ job_assumes(j, kevent_mod((uintptr_t)&j->exit_timeout, EVFILT_TIMER, EV_ADD, NOTE_SECONDS, LAUNCHD_SIGKILL_TIMER, j) != -1); + + job_log(j, LOG_DEBUG, "Sent SIGKILL signal."); } void @@ -3773,30 +3799,30 @@ } } -bool +const char * job_active(job_t j) { struct machservice *ms; if (j->wait4pipe_eof && j->log_redirect_fd) { - return true; + return "Standard out/error is still valid"; } if (j->p) { - return true; + return "PID is still valid"; } if (j->priv_port_has_senders) { - return true; + return "Privileged Port still has outstanding senders"; } SLIST_FOREACH(ms, &j->machservices, sle) { if (ms->recv && ms->isActive) { - return true; + return "Mach service is still active"; } } - return false; + return NULL; } void Modified: trunk/launchd/src/launchd_core_logic.h =================================================================== --- trunk/launchd/src/launchd_core_logic.h 2007-09-19 01:00:28 UTC (rev 23408) +++ trunk/launchd/src/launchd_core_logic.h 2007-09-19 16:05:30 UTC (rev 23409) @@ -40,7 +40,6 @@ job_t job_find(const char *label); job_t job_find_by_service_port(mach_port_t p); bool job_ack_port_destruction(mach_port_t p); -bool job_active(job_t j); bool job_is_anonymous(job_t j); launch_data_t job_export(job_t j); void job_stop(job_t j); Modified: trunk/launchd/src/launchd_runtime.c =================================================================== --- trunk/launchd/src/launchd_runtime.c 2007-09-19 01:00:28 UTC (rev 23408) +++ trunk/launchd/src/launchd_runtime.c 2007-09-19 16:05:30 UTC (rev 23409) @@ -90,8 +90,8 @@ static mach_msg_size_t max_msg_size; static mig_callback *mig_cb_table; static size_t mig_cb_table_sz; -static timeout_callback runtime_idle_callback = launchd_shutdown; -static mach_msg_timeout_t runtime_idle_timeout = RUNTIME_ADVISABLE_IDLE_TIMEOUT * 1000; +static timeout_callback runtime_idle_callback; +static mach_msg_timeout_t runtime_idle_timeout; static audit_token_t *au_tok; static size_t runtime_busy_cnt; @@ -912,11 +912,11 @@ } } - if ((tmp_options & MACH_RCV_MSG) && runtime_idle_callback && (runtime_busy_cnt == 0)) { + if ((tmp_options & MACH_RCV_MSG) && (runtime_idle_callback || (runtime_busy_cnt == 0))) { tmp_options |= MACH_RCV_TIMEOUT; if (!(tmp_options & MACH_SEND_TIMEOUT)) { - to = runtime_idle_timeout; + to = runtime_busy_cnt ? runtime_idle_timeout : (RUNTIME_ADVISABLE_IDLE_TIMEOUT * 1000); } } @@ -935,7 +935,11 @@ continue; } else if (mr == MACH_RCV_TIMED_OUT) { if (to != MACH_MSG_TIMEOUT_NONE) { - runtime_idle_callback(); + if (runtime_busy_cnt == 0) { + launchd_shutdown(); + } else if (runtime_idle_callback) { + runtime_idle_callback(); + } } continue; } else if (!launchd_assumes(mr == MACH_MSG_SUCCESS)) {

1 0

[23408] trunk/launchd/src
by source_changes＠macosforge.org 19 Sep '07

19 Sep '07

Revision: 23408 http://trac.macosforge.org/projects/launchd/changeset/23408 Author: zarzycki(a)apple.com Date: 2007-09-18 18:00:28 -0700 (Tue, 18 Sep 2007) Log Message: ----------- We need to wrap kill()/killpg() to get ESRCH returned instead of EPERM. EPERM is still returned when appropriate. Modified Paths: -------------- trunk/launchd/src/Makefile.am trunk/launchd/src/Makefile.in trunk/launchd/src/launchd.c trunk/launchd/src/launchd_core_logic.c trunk/launchd/src/launchd_runtime.h Added Paths: ----------- trunk/launchd/src/launchd_runtime_kill.c trunk/launchd/src/launchd_runtime_kill.h Modified: trunk/launchd/src/Makefile.am =================================================================== --- trunk/launchd/src/Makefile.am 2007-09-18 19:59:38 UTC (rev 23407) +++ trunk/launchd/src/Makefile.am 2007-09-19 01:00:28 UTC (rev 23408) @@ -48,7 +48,7 @@ launchd_CFLAGS = -mdynamic-no-pic $(AM_CFLAGS) -Wno-unused-parameter launchd_LDFLAGS = -lbsm -launchd_SOURCES = launchd.c launchd_core_logic.c launchd_unix_ipc.c protocol_vprocServer.c notifyServer.c launchd_internalUser.c launchd_internalServer.c job_replyUser.c launchd_runtime.c +launchd_SOURCES = launchd.c launchd_core_logic.c launchd_unix_ipc.c protocol_vprocServer.c notifyServer.c launchd_internalUser.c launchd_internalServer.c job_replyUser.c launchd_runtime.c launchd_runtime_kill.c launchd_runtime.c:: notifyServer.h launchd_internal.h launchd_core_logic.c:: protocol_vproc.h job_reply.h protocol_vprocServer.h Modified: trunk/launchd/src/Makefile.in =================================================================== --- trunk/launchd/src/Makefile.in 2007-09-18 19:59:38 UTC (rev 23407) +++ trunk/launchd/src/Makefile.in 2007-09-19 01:00:28 UTC (rev 23408) @@ -96,7 +96,7 @@ am__launchd_SOURCES_DIST = launchd.c launchd_core_logic.c \ launchd_unix_ipc.c protocol_vprocServer.c notifyServer.c \ launchd_internalUser.c launchd_internalServer.c \ - job_replyUser.c launchd_runtime.c + job_replyUser.c launchd_runtime.c launchd_runtime_kill.c @LIBS_ONLY_FALSE@am_launchd_OBJECTS = launchd-launchd.$(OBJEXT) \ @LIBS_ONLY_FALSE@ launchd-launchd_core_logic.$(OBJEXT) \ @LIBS_ONLY_FALSE@ launchd-launchd_unix_ipc.$(OBJEXT) \ @@ -105,7 +105,8 @@ @LIBS_ONLY_FALSE@ launchd-launchd_internalUser.$(OBJEXT) \ @LIBS_ONLY_FALSE@ launchd-launchd_internalServer.$(OBJEXT) \ @LIBS_ONLY_FALSE@ launchd-job_replyUser.$(OBJEXT) \ -@LIBS_ONLY_FALSE@ launchd-launchd_runtime.$(OBJEXT) +@LIBS_ONLY_FALSE@ launchd-launchd_runtime.$(OBJEXT) \ +@LIBS_ONLY_FALSE@ launchd-launchd_runtime_kill.$(OBJEXT) launchd_OBJECTS = $(am_launchd_OBJECTS) launchd_LDADD = $(LDADD) launchd_LINK = $(CCLD) $(launchd_CFLAGS) $(CFLAGS) $(launchd_LDFLAGS) \ @@ -252,7 +253,7 @@ @LIBS_ONLY_FALSE@SystemStarter_SOURCES = StartupItems.c IPC.c SystemStarter.c @LIBS_ONLY_FALSE@launchd_CFLAGS = -mdynamic-no-pic $(AM_CFLAGS) -Wno-unused-parameter @LIBS_ONLY_FALSE@launchd_LDFLAGS = -lbsm -@LIBS_ONLY_FALSE@launchd_SOURCES = launchd.c launchd_core_logic.c launchd_unix_ipc.c protocol_vprocServer.c notifyServer.c launchd_internalUser.c launchd_internalServer.c job_replyUser.c launchd_runtime.c +@LIBS_ONLY_FALSE@launchd_SOURCES = launchd.c launchd_core_logic.c launchd_unix_ipc.c protocol_vprocServer.c notifyServer.c launchd_internalUser.c launchd_internalServer.c job_replyUser.c launchd_runtime.c launchd_runtime_kill.c @LIBS_ONLY_FALSE@launchproxy_LDFLAGS = -weak_framework Security @LIBS_ONLY_FALSE@man1_MANS = wait4path.1 launchctl.1 @LIBS_ONLY_FALSE@man5_MANS = launchd.plist.5 launchd.conf.5 @@ -420,6 +421,7 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/launchd-launchd_internalServer.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/launchd-launchd_internalUser.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/launchd-launchd_runtime.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/launchd-launchd_runtime_kill.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/launchd-launchd_unix_ipc.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/launchd-notifyServer.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/launchd-protocol_vprocServer.Po@am__quote@ @@ -771,6 +773,20 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='launchd_runtime.c' object='launchd-launchd_runtime.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(launchd_CFLAGS) $(CFLAGS) -c -o launchd-launchd_runtime.obj `if test -f 'launchd_runtime.c'; then $(CYGPATH_W) 'launchd_runtime.c'; else $(CYGPATH_W) '$(srcdir)/launchd_runtime.c'; fi` + +launchd-launchd_runtime_kill.o: launchd_runtime_kill.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(launchd_CFLAGS) $(CFLAGS) -MT launchd-launchd_runtime_kill.o -MD -MP -MF $(DEPDIR)/launchd-launchd_runtime_kill.Tpo -c -o launchd-launchd_runtime_kill.o `test -f 'launchd_runtime_kill.c' || echo '$(srcdir)/'`launchd_runtime_kill.c +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/launchd-launchd_runtime_kill.Tpo $(DEPDIR)/launchd-launchd_runtime_kill.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='launchd_runtime_kill.c' object='launchd-launchd_runtime_kill.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(launchd_CFLAGS) $(CFLAGS) -c -o launchd-launchd_runtime_kill.o `test -f 'launchd_runtime_kill.c' || echo '$(srcdir)/'`launchd_runtime_kill.c + +launchd-launchd_runtime_kill.obj: launchd_runtime_kill.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(launchd_CFLAGS) $(CFLAGS) -MT launchd-launchd_runtime_kill.obj -MD -MP -MF $(DEPDIR)/launchd-launchd_runtime_kill.Tpo -c -o launchd-launchd_runtime_kill.obj `if test -f 'launchd_runtime_kill.c'; then $(CYGPATH_W) 'launchd_runtime_kill.c'; else $(CYGPATH_W) '$(srcdir)/launchd_runtime_kill.c'; fi` +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/launchd-launchd_runtime_kill.Tpo $(DEPDIR)/launchd-launchd_runtime_kill.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='launchd_runtime_kill.c' object='launchd-launchd_runtime_kill.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(launchd_CFLAGS) $(CFLAGS) -c -o launchd-launchd_runtime_kill.obj `if test -f 'launchd_runtime_kill.c'; then $(CYGPATH_W) 'launchd_runtime_kill.c'; else $(CYGPATH_W) '$(srcdir)/launchd_runtime_kill.c'; fi` install-man1: $(man1_MANS) $(man_MANS) @$(NORMAL_INSTALL) test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)" Modified: trunk/launchd/src/launchd.c =================================================================== --- trunk/launchd/src/launchd.c 2007-09-18 19:59:38 UTC (rev 23407) +++ trunk/launchd/src/launchd.c 2007-09-19 01:00:28 UTC (rev 23408) @@ -277,7 +277,7 @@ sleep(3); - kill(-1, SIGKILL); + runtime_kill(-1, SIGKILL); } void Modified: trunk/launchd/src/launchd_core_logic.c =================================================================== --- trunk/launchd/src/launchd_core_logic.c 2007-09-18 19:59:38 UTC (rev 23407) +++ trunk/launchd/src/launchd_core_logic.c 2007-09-19 01:00:28 UTC (rev 23408) @@ -525,7 +525,7 @@ return; } - job_assumes(j, kill(j->p, SIGTERM) != -1); + job_assumes(j, runtime_kill(j->p, SIGTERM) != -1); j->sent_sigterm_time = mach_absolute_time(); if (j->exit_timeout) { @@ -1971,14 +1971,9 @@ /* * The job is dead. While the PID/PGID is still known to be * valid, try to kill abandoned descendant processes. - * - * We'd use job_assumes(), but POSIX defines consistency over - * correctness, and consequently kill/killpg now returns EPERM - * instead of ESRCH. As luck would have it, ESRCH is the only - * error we can ignore. */ if (!j->abandon_pg) { - killpg(j->p, SIGKILL); + job_assumes(j, runtime_killpg(j->p, SIGKILL) != -1 || errno == ESRCH); } /* @@ -2186,7 +2181,7 @@ return; } - job_assumes(j, kill(j->p, SIGKILL) != -1); + job_assumes(j, runtime_kill(j->p, SIGKILL) != -1); j->sent_sigkill = true; @@ -2690,7 +2685,7 @@ /* Temporarily disabled due to 5423935 and 4946119. */ #if 0 /* Ask the accountless process to exit. */ - job_assumes(j, kill(i_pid, SIGTERM) != -1); + job_assumes(j, runtime_kill(i_pid, SIGTERM) != -1); #endif } @@ -4114,7 +4109,7 @@ /* * The kernel team requested that launchd not do this for Leopard. - * jobmgr_assumes(jm, kill(p_i, SIGKILL) != -1); + * jobmgr_assumes(jm, runtime_kill(p_i, SIGKILL) != -1); */ } @@ -5026,7 +5021,7 @@ return 0; } } else if (otherj->p) { - job_assumes(j, kill(otherj->p, sig) != -1); + job_assumes(j, runtime_kill(otherj->p, sig) != -1); } return 0; Modified: trunk/launchd/src/launchd_runtime.h =================================================================== --- trunk/launchd/src/launchd_runtime.h 2007-09-18 19:59:38 UTC (rev 23407) +++ trunk/launchd/src/launchd_runtime.h 2007-09-19 01:00:28 UTC (rev 23408) @@ -26,6 +26,8 @@ #include <stdbool.h> #include <syslog.h> +#include "launchd_runtime_kill.h" + struct ldcred { uid_t euid; uid_t uid; Added: trunk/launchd/src/launchd_runtime_kill.c =================================================================== --- trunk/launchd/src/launchd_runtime_kill.c (rev 0) +++ trunk/launchd/src/launchd_runtime_kill.c 2007-09-19 01:00:28 UTC (rev 23408) @@ -0,0 +1,44 @@ +/* + * Copyright (c) 2007 Apple Inc. All rights reserved. + * + * @APPLE_APACHE_LICENSE_HEADER_START@ + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * @APPLE_APACHE_LICENSE_HEADER_END@ + */ + +#define _NONSTD_SOURCE 1 +#include <signal.h> + +#include "launchd_runtime_kill.h" + +/* + * POSIX defines consistency over correctness, and consequently kill/killpg now + * returns EPERM instead of ESRCH. + * + * I've filed 5487498 to get a non-portable kill() variant, but for now, + * defining _NONSTD_SOURCE gets us the old behavior. + */ + +int +runtime_kill(pid_t pid, int sig) +{ + return kill(pid, sig); +} + +int +runtime_killpg(pid_t pgrp, int sig) +{ + return killpg(pgrp, sig); +} Added: trunk/launchd/src/launchd_runtime_kill.h =================================================================== --- trunk/launchd/src/launchd_runtime_kill.h (rev 0) +++ trunk/launchd/src/launchd_runtime_kill.h 2007-09-19 01:00:28 UTC (rev 23408) @@ -0,0 +1,28 @@ +/* + * Copyright (c) 2007 Apple Inc. All rights reserved. + * + * @APPLE_APACHE_LICENSE_HEADER_START@ + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * @APPLE_APACHE_LICENSE_HEADER_END@ + */ +#ifndef __LAUNCHD_RUNTIME_KILL_H__ +#define __LAUNCHD_RUNTIME_KILL_H__ + +#include <sys/types.h> + +int runtime_kill(pid_t pid, int sig); +int runtime_killpg(pid_t pgrp, int sig); + +#endif

1 0

[23407] tags/launchd-249/
by source_changes＠macosforge.org 18 Sep '07

18 Sep '07

Revision: 23407 http://trac.macosforge.org/projects/launchd/changeset/23407 Author: zarzycki(a)apple.com Date: 2007-09-18 12:59:38 -0700 (Tue, 18 Sep 2007) Log Message: ----------- "Tagging launchd-249 from https://svn.macosforge.org/repository/launchd/trunk" Added Paths: ----------- tags/launchd-249/ Copied: tags/launchd-249 (from rev 23406, trunk)

1 0

[23406] trunk/launchd/src
by source_changes＠macosforge.org 18 Sep '07

18 Sep '07

Revision: 23406 http://trac.macosforge.org/projects/launchd/changeset/23406 Author: zarzycki(a)apple.com Date: 2007-09-18 12:26:53 -0700 (Tue, 18 Sep 2007) Log Message: ----------- A new job attribute: AbandonProcessGroup Modified Paths: -------------- trunk/launchd/src/launchd.plist.5 trunk/launchd/src/launchd_core_logic.c trunk/launchd/src/liblaunch_public.h Modified: trunk/launchd/src/launchd.plist.5 =================================================================== --- trunk/launchd/src/launchd.plist.5 2007-09-18 18:28:04 UTC (rev 23405) +++ trunk/launchd/src/launchd.plist.5 2007-09-18 19:26:53 UTC (rev 23406) @@ -278,6 +278,11 @@ This optional key specifies what .Xr nice 3 value should be applied to the daemon. +.It Sy AbandonProcessGroup <boolean> +When a job dies, +.Nm launchd +kills any remaining processes with the same process group ID as the job. +Setting this key to true disables that behavior. .It Sy HopefullyExitsFirst <boolean> This optional key causes programs to exit earlier during system shutdown. This key exists because some jobs do more than flush buffers and exit like Modified: trunk/launchd/src/launchd_core_logic.c =================================================================== --- trunk/launchd/src/launchd_core_logic.c 2007-09-18 18:28:04 UTC (rev 23405) +++ trunk/launchd/src/launchd_core_logic.c 2007-09-18 19:26:53 UTC (rev 23406) @@ -359,7 +359,7 @@ unsigned int globargv:1, wait4debugger:1, unload_at_exit: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, wait4pipe_eof: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; + per_user:1, hopefully_exits_first:1, deny_unknown_mslookups:1, unload_at_mig_return:1, abandon_pg:1; const char label[0]; }; @@ -1223,6 +1223,13 @@ bool found_key = false; switch (key[0]) { + case 'a': + case 'A': + if (strcasecmp(key, LAUNCH_JOBKEY_ABANDONPROCESSGROUP) == 0) { + j->abandon_pg = value; + found_key = true; + } + break; case 'k': case 'K': if (strcasecmp(key, LAUNCH_JOBKEY_KEEPALIVE) == 0) { @@ -1970,7 +1977,9 @@ * instead of ESRCH. As luck would have it, ESRCH is the only * error we can ignore. */ - killpg(j->p, SIGKILL); + if (!j->abandon_pg) { + killpg(j->p, SIGKILL); + } /* * 5020256 Modified: trunk/launchd/src/liblaunch_public.h =================================================================== --- trunk/launchd/src/liblaunch_public.h 2007-09-18 18:28:04 UTC (rev 23405) +++ trunk/launchd/src/liblaunch_public.h 2007-09-18 19:26:53 UTC (rev 23406) @@ -98,6 +98,7 @@ #define LAUNCH_JOBKEY_PID "PID" #define LAUNCH_JOBKEY_THROTTLEINTERVAL "ThrottleInterval" #define LAUNCH_JOBKEY_LAUNCHONLYONCE "LaunchOnlyOnce" +#define LAUNCH_JOBKEY_ABANDONPROCESSGROUP "AbandonProcessGroup" #define LAUNCH_JOBINETDCOMPATIBILITY_WAIT "Wait"

1 0

[23405] trunk/launchd/src/launchproxy.c
by source_changes＠macosforge.org 18 Sep '07

18 Sep '07

Revision: 23405 http://trac.macosforge.org/projects/launchd/changeset/23405 Author: zarzycki(a)apple.com Date: 2007-09-18 11:28:04 -0700 (Tue, 18 Sep 2007) Log Message: ----------- <rdar://problem/5487989> Regression due to 5475980 Modified Paths: -------------- trunk/launchd/src/launchproxy.c Modified: trunk/launchd/src/launchproxy.c =================================================================== --- trunk/launchd/src/launchproxy.c 2007-09-18 16:37:12 UTC (rev 23404) +++ trunk/launchd/src/launchproxy.c 2007-09-18 18:28:04 UTC (rev 23405) @@ -182,6 +182,8 @@ continue; } + setpgid(0, 0); + if ((tmp = launch_data_dict_lookup(resp, LAUNCH_JOBKEY_SESSIONCREATE)) && launch_data_get_bool(tmp)) { if (SessionCreate) { OSStatus scr = SessionCreate(0, 0);

1 0

[23404] trunk/launchd/src/launchd_core_logic.c
by source_changes＠macosforge.org 18 Sep '07

18 Sep '07

Revision: 23404 http://trac.macosforge.org/projects/launchd/changeset/23404 Author: zarzycki(a)apple.com Date: 2007-09-18 09:37:12 -0700 (Tue, 18 Sep 2007) Log Message: ----------- Slightly better 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-09-18 15:01:54 UTC (rev 23403) +++ trunk/launchd/src/launchd_core_logic.c 2007-09-18 16:37:12 UTC (rev 23404) @@ -4093,6 +4093,7 @@ for (i = 0; i < kp_cnt; i++) { pid_t p_i = kp[i].kp_proc.p_pid; pid_t pp_i = kp[i].kp_eproc.e_ppid; + pid_t pg_i = kp[i].kp_eproc.e_pgid; const char *z = kp[i].kp_proc.p_stat == SZOMB ? "zombie " : ""; const char *n = kp[i].kp_proc.p_comm; @@ -4100,7 +4101,7 @@ continue; } - jobmgr_log(jm, LOG_WARNING, "Stray %sprocess at shutdown: PID %u PPID %u %s", z, p_i, pp_i, n); + jobmgr_log(jm, LOG_WARNING, "Stray %sprocess at shutdown: PID %u PPID %u PGID %u %s", z, p_i, pp_i, pg_i, n); /* * The kernel team requested that launchd not do this for Leopard.

1 0

[23403] trunk/launchd/src/StartupItems.c
by source_changes＠macosforge.org 18 Sep '07

18 Sep '07

Revision: 23403 http://trac.macosforge.org/projects/launchd/changeset/23403 Author: zarzycki(a)apple.com Date: 2007-09-18 08:01:54 -0700 (Tue, 18 Sep 2007) Log Message: ----------- <rdar://problem/5485016> Leopard 9A527: "Startup Items folder does not have proper security settings" Modified Paths: -------------- trunk/launchd/src/StartupItems.c Modified: trunk/launchd/src/StartupItems.c =================================================================== --- trunk/launchd/src/StartupItems.c 2007-09-18 14:54:49 UTC (rev 23402) +++ trunk/launchd/src/StartupItems.c 2007-09-18 15:01:54 UTC (rev 23403) @@ -285,6 +285,12 @@ strcpy(aPath + strlen(aPath), kStartupItemsPath); ++aDomainIndex; + /* 5485016 + * + * Just in case... + */ + mkdir(aPath, S_IRWXU|S_IRWXG|S_IROTH|S_IXOTH); + if (!StartupItemSecurityCheck(aPath)) continue;

1 0